Merge pull request #45 from alphagov/add-find-annotations

Add find ingress condition for Find and remove TLS
alphagov · Nov 27, 2023 · 0cadf5b · 0cadf5b
2 parents 3dbba79 + 7349047
commit 0cadf5b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/charts/app-of-apps/values-integration.yaml b/charts/app-of-apps/values-integration.yaml
@@ -86,8 +86,10 @@ datagovukHelmValues:
  alb.ingress.kubernetes.io/target-type: ip
  alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80}, {"HTTPS": 443}]'
  alb.ingress.kubernetes.io/ssl-redirect: "443"
- tls:
- enabled: true
+ alb.ingress.kubernetes.io/conditions.datagovuk-find: >
+ [{"field": "host-header", "hostHeaderConfig": { "values": [
+ "www.integration.data.gov.uk"
+ ]}}]
  opensearch:
  replicaCount: 1
  externalSecret:

diff --git a/charts/app-of-apps/values-production.yaml b/charts/app-of-apps/values-production.yaml
@@ -75,7 +75,7 @@ datagovukHelmValues:
  org:
  schedule: "*/10 * * * *"
  find:
- replicaCount: 1
+ replicaCount: 2
  args: [ "bin/rails s -b 0.0.0.0" ]
  ingress:
  host: find.eks.production.govuk.digital
@@ -85,8 +85,10 @@ datagovukHelmValues:
  alb.ingress.kubernetes.io/target-type: ip
  alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80}, {"HTTPS": 443}]'
  alb.ingress.kubernetes.io/ssl-redirect: "443"
- tls:
- enabled: true
+ alb.ingress.kubernetes.io/conditions.datagovuk-find: >
+ [{"field": "host-header", "hostHeaderConfig": { "values": [
+ "www.data.gov.uk"
+ ]}}]
  opensearch:
  replicaCount: 1
  externalSecret:

diff --git a/charts/app-of-apps/values-staging.yaml b/charts/app-of-apps/values-staging.yaml
@@ -87,8 +87,10 @@ datagovukHelmValues:
  alb.ingress.kubernetes.io/target-type: ip
  alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80}, {"HTTPS": 443}]'
  alb.ingress.kubernetes.io/ssl-redirect: "443"
- tls:
- enabled: true
+ alb.ingress.kubernetes.io/conditions.datagovuk-find: >
+ [{"field": "host-header", "hostHeaderConfig": { "values": [
+ "www.staging.data.gov.uk"
+ ]}}]
  opensearch:
  replicaCount: 1
  externalSecret:

diff --git a/charts/datagovuk/templates/find/ingress.yaml b/charts/datagovuk/templates/find/ingress.yaml
@@ -21,10 +21,5 @@ spec:
  name: {{ $.Release.Name }}-find
  port:
  number: 3000
- {{- if .tls.enabled }}
- tls:
- - hosts:
- - {{ .host }}
- {{- end }}
 {{- end }}
 {{- end }}