Merge pull request #595 from alphagov/tidyup-alb

Remove unused ALB and associated DNS records and istio components.
alphagov · Oct 8, 2019 · 95c234b · 95c234b
2 parents a4b02a2 + 25cce70
commit 95c234b
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 164 deletions.
diff --git a/charts/gsp-istio/values.yaml b/charts/gsp-istio/values.yaml
@@ -82,30 +82,7 @@ istio:
     enabled: false
   gateways:
     istio-ingressgateway:
-      replicaCount: 2
-      autoscaleMin: 2
-      type: NodePort
-      sds:
-        enabled: true
-    istio-egressgateway:
-      enabled: true
-      replicaCount: 2
-      autoscaleMin: 2
-      ports:
-      - port: 80
-        name: http2
-      - port: 443
-        name: https
-        # This is the port where sni routing happens
-      - port: 15443
-        targetPort: 15443
-        name: tls
-      - port: 2223
-        name: tcp-cloudhsm-2223
-      - port: 2224
-        name: tcp-cloudhsm-2224
-      - port: 2225
-        name: tcp-cloudhsm-2225
+      enabled: false
   sidecarInjectorWebhook:
     enableNamespacesByDefault: true
     rewriteAppHTTPProbe: true

diff --git a/modules/gsp-cluster/alb.tf b/modules/gsp-cluster/alb.tf
diff --git a/modules/k8s-cluster/outputs.tf b/modules/k8s-cluster/outputs.tf
@@ -14,10 +14,6 @@ output "bootstrap_role_arns" {
   value = "${list(aws_cloudformation_stack.worker-nodes.outputs["NodeInstanceRole"], aws_cloudformation_stack.kiam-server-nodes.outputs["NodeInstanceRole"], aws_cloudformation_stack.ci-nodes.outputs["NodeInstanceRole"])}"
 }
 
-output "worker_http_target_group_arn" {
-  value = "${aws_cloudformation_stack.worker-nodes.outputs["HTTPTargetGroup"]}"
-}
-
 output "worker_tcp_target_group_arn" {
   value = "${aws_cloudformation_stack.worker-nodes.outputs["TCPTargetGroup"]}"
 }