update ingresses and hmi images

DARPA-ASKEM · Jun 6, 2024 · bbe180b · bbe180b
1 parent 4449a98
commit bbe180b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/kubernetes/overlays/prod/overlays/askem-production/ingress/public-web-ssl-ingress.yaml b/kubernetes/overlays/prod/overlays/askem-production/ingress/public-web-ssl-ingress.yaml
@@ -4,7 +4,7 @@ kind: Ingress
 metadata:
  name: public-web-ssl-ingress
  annotations:
- alb.ingress.kubernetes.io/actions.ssl-redirect: '443'
+ alb.ingress.kubernetes.io/actions.ssl-redirect: '{"Type": "redirect", "RedirectConfig": { "Protocol": "HTTPS", "Port": "443", "StatusCode": "HTTP_301"}}'
  alb.ingress.kubernetes.io/backend-protocol: HTTPS
  alb.ingress.kubernetes.io/listen-ports: '[{"HTTPS":443}]'
  alb.ingress.kubernetes.io/scheme: internet-facing
@@ -16,6 +16,13 @@ spec:
  - host: 'keycloak.terarium.ai'
  http:
  paths:
+ - path: /
+ pathType: Prefix
+ backend:
+ service:
+ name: ssl-redirect
+ port:
+ name: use-annotation
  - path: /
  pathType: Prefix
  backend:

diff --git a/kubernetes/overlays/prod/overlays/askem-production/kustomization.yaml b/kubernetes/overlays/prod/overlays/askem-production/kustomization.yaml
@@ -54,13 +54,13 @@ images:
  # Terarium HMI
  - name: hmi-client-image
  newName: ghcr.io/darpa-askem/hmi-client
- newTag: '2.12.1'
+ newTag: '2.12.2'
  - name: terarium-docs-image
  newName: ghcr.io/darpa-askem/terarium-docs
  newTag: 'latest'
  - name: hmi-server-image
  newName: ghcr.io/darpa-askem/hmi-server
- newTag: '2.12.1'
+ newTag: '2.12.2'
  - name: spicedb-image
  newName: ghcr.io/authzed/spicedb
  newTag: 'v1.24.0'

diff --git a/kubernetes/overlays/prod/overlays/askem-staging/ingress/public-web-ssl-ingress.yaml b/kubernetes/overlays/prod/overlays/askem-staging/ingress/public-web-ssl-ingress.yaml
@@ -4,7 +4,7 @@ kind: Ingress
 metadata:
  name: public-web-ssl-ingress
  annotations:
- alb.ingress.kubernetes.io/actions.ssl-redirect: '443'
+ alb.ingress.kubernetes.io/actions.ssl-redirect: '{"Type": "redirect", "RedirectConfig": { "Protocol": "HTTPS", "Port": "443", "StatusCode": "HTTP_301"}}'
  alb.ingress.kubernetes.io/backend-protocol: HTTPS
  alb.ingress.kubernetes.io/listen-ports: '[{"HTTPS":443}]'
  alb.ingress.kubernetes.io/scheme: internet-facing
@@ -16,6 +16,13 @@ spec:
  - host: 'keycloak.staging.terarium.ai'
  http:
  paths:
+ - path: /
+ pathType: Prefix
+ backend:
+ service:
+ name: ssl-redirect
+ port:
+ name: use-annotation
  - path: /
  pathType: Prefix
  backend: