remove non-ssl ingress and force beaker to ssl mode

DARPA-ASKEM · Jun 6, 2024 · 37a0a54 · 37a0a54
1 parent bbe180b
commit 37a0a54
Show file tree

Hide file tree

Showing 9 changed files with 76 additions and 54 deletions.
diff --git a/kubernetes/overlays/prod/overlays/askem-dev/services/beaker/beaker-deployment.yaml b/kubernetes/overlays/prod/overlays/askem-dev/services/beaker/beaker-deployment.yaml
@@ -6,6 +6,22 @@ metadata:
 spec:
  template:
  spec:
+ containers:
+ - name: beaker
+ env:
+ - name: APP_URL
+ value: https://beaker.dev.terarium.ai
+ - name: JUPYTER_BASE_URL
+ value: https://beaker.dev.terarium.ai
+ - name: JUPYTER_WS_URL
+ value: wss://beaker.dev.terarium.ai
+ resources:
+ requests:
+ memory: '1Gi'
+ cpu: '2000m'
+ limits:
+ memory: '28Gi'
+ cpu: '7000m'
  tolerations:
  - key: 'workload'
  operator: 'Equal'

diff --git a/kubernetes/overlays/prod/overlays/askem-production/ingress/private-web-ingress.yaml b/kubernetes/overlays/prod/overlays/askem-production/ingress/private-web-ingress.yaml
@@ -29,7 +29,25 @@ spec:
  name: hmi-server
  port:
  number: 3000
+ - host: 'beaker.terarium.ai'
+ http:
+ paths:
+ - path: /
+ pathType: Prefix
+ backend:
+ service:
+ name: ssl-redirect
+ port:
+ name: use-annotation
+ - path: /
+ pathType: Prefix
+ backend:
+ service:
+ name: beaker
+ port:
+ number: 3050
 
  tls:
  - hosts:
  - 'server.terarium.ai'
+ - 'beaker.terarium.ai'
diff --git a/kubernetes/overlays/prod/overlays/askem-production/ingress/private-web-non-ssl-ingress.yaml b/kubernetes/overlays/prod/overlays/askem-production/ingress/private-web-non-ssl-ingress.yaml
diff --git a/kubernetes/overlays/prod/overlays/askem-production/kustomization.yaml b/kubernetes/overlays/prod/overlays/askem-production/kustomization.yaml
@@ -5,7 +5,6 @@ namespace: terarium
 resources:
  - ../../base
  - ingress/private-web-ingress.yaml
- - ingress/private-web-non-ssl-ingress.yaml
  - ingress/public-web-ingress.yaml
  - ingress/public-web-ssl-ingress.yaml
  - secrets/secrets-adobe-api-key.yaml

diff --git a/kubernetes/overlays/prod/overlays/askem-production/services/beaker/beaker-deployment.yaml b/kubernetes/overlays/prod/overlays/askem-production/services/beaker/beaker-deployment.yaml
@@ -9,6 +9,13 @@ spec:
  nodeName: ip-172-16-40-52.ec2.internal
  containers:
  - name: beaker
+ env:
+ - name: APP_URL
+ value: https://beaker.terarium.ai
+ - name: JUPYTER_BASE_URL
+ value: https://beaker.terarium.ai
+ - name: JUPYTER_WS_URL
+ value: wss://beaker.terarium.ai
  resources:
  requests:
  memory: '1Gi'

diff --git a/kubernetes/overlays/prod/overlays/askem-staging/ingress/private-web-ingress.yaml b/kubernetes/overlays/prod/overlays/askem-staging/ingress/private-web-ingress.yaml
@@ -192,8 +192,27 @@ spec:
  port:
  number: 8000
 
+ - host: 'beaker.staging.terarium.ai'
+ http:
+ paths:
+ - path: /
+ pathType: Prefix
+ backend:
+ service:
+ name: ssl-redirect
+ port:
+ name: use-annotation
+ - path: /
+ pathType: Prefix
+ backend:
+ service:
+ name: beaker
+ port:
+ number: 3050
+
  tls:
  - hosts:
+ - 'beaker.staging.terarium.ai'
  - 'climate-data.staging.terarium.ai'
  - 'funman.staging.terarium.ai'
  - 'graphdb.staging.terarium.ai'

diff --git a/kubernetes/overlays/prod/overlays/askem-staging/ingress/private-web-non-ssl-ingress.yaml b/kubernetes/overlays/prod/overlays/askem-staging/ingress/private-web-non-ssl-ingress.yaml
diff --git a/kubernetes/overlays/prod/overlays/askem-staging/kustomization.yaml b/kubernetes/overlays/prod/overlays/askem-staging/kustomization.yaml
@@ -7,7 +7,6 @@ resources:
  - check-latest
  - ingress/private-web-grpc-ingress.yaml
  - ingress/private-web-ingress.yaml
- - ingress/private-web-non-ssl-ingress.yaml
  - ingress/public-web-ingress.yaml
  - ingress/public-web-ssl-ingress.yaml
  - secrets/secrets-adobe-api-key.yaml

diff --git a/kubernetes/overlays/prod/overlays/askem-staging/services/beaker/beaker-deployment.yaml b/kubernetes/overlays/prod/overlays/askem-staging/services/beaker/beaker-deployment.yaml
@@ -6,6 +6,22 @@ metadata:
 spec:
  template:
  spec:
+ containers:
+ - name: beaker
+ env:
+ - name: APP_URL
+ value: https://beaker.staging.terarium.ai
+ - name: JUPYTER_BASE_URL
+ value: https://beaker.staging.terarium.ai
+ - name: JUPYTER_WS_URL
+ value: wss://beaker.staging.terarium.ai
+ resources:
+ requests:
+ memory: '1Gi'
+ cpu: '2000m'
+ limits:
+ memory: '28Gi'
+ cpu: '7000m'
  tolerations:
  - key: 'workload'
  operator: 'Equal'