Fix Flux, ACK and Crossplane ingress controls

Author: niallthomson

manifests/modules/automation/controlplanes/ack/.workshop/manifests/kustomization.yaml

@@ -111,21 +111,40 @@ module "eks_blueprints_addons" {
   observability_tag = null
 }
 
-resource "time_sleep" "blueprints_addons_sleep" {
-  depends_on = [
-    module.eks_blueprints_addons
-  ]
+resource "time_sleep" "wait" {
+  depends_on = [module.eks_blueprints_addons]
 
-  create_duration  = "15s"
-  destroy_duration = "15s"
+  create_duration = "10s"
 }
 
-resource "kubectl_manifest" "nlb" {
-  yaml_body = templatefile("${path.module}/templates/nlb.yaml", {
-
-  })
-
-  wait = true
-
-  depends_on = [time_sleep.blueprints_addons_sleep]
-}
+resource "kubernetes_manifest" "ui_nlb" {
+  depends_on = [time_sleep.wait]
+
+  manifest = {
+    "apiVersion" = "v1"
+    "kind"       = "Service"
+    "metadata" = {
+      "name"      = "ui-nlb"
+      "namespace" = "ui"
+      "annotations" = {
+        "service.beta.kubernetes.io/aws-load-balancer-type"            = "external"
+        "service.beta.kubernetes.io/aws-load-balancer-scheme"          = "internet-facing"
+        "service.beta.kubernetes.io/aws-load-balancer-nlb-target-type" = "instance"
+        "service.beta.kubernetes.io/load-balancer-source-ranges"       = var.inbound_cidrs
+      }
+    }
+    "spec" = {
+      "type" = "LoadBalancer"
+      "ports" = [{
+        "port"       = 80
+        "targetPort" = 8080
+        "name"       = "http"
+      }]
+      "selector" = {
+        "app.kubernetes.io/name"      = "ui"
+        "app.kubernetes.io/instance"  = "ui"
+        "app.kubernetes.io/component" = "service"
+      }
+    }
+  }
+}

manifests/modules/automation/controlplanes/ack/.workshop/manifests/nlb.yaml

@@ -154,21 +154,40 @@ module "eks_blueprints_addons" {
   observability_tag = null
 }
 
-resource "time_sleep" "blueprints_addons_sleep" {
-  depends_on = [
-    module.eks_blueprints_addons
-  ]
+resource "time_sleep" "wait" {
+  depends_on = [module.eks_blueprints_addons]
 
-  create_duration  = "15s"
-  destroy_duration = "15s"
+  create_duration = "10s"
 }
 
-resource "kubectl_manifest" "nlb" {
-  yaml_body = templatefile("${path.module}/templates/nlb.yaml", {
-
-  })
-
-  wait = true
-
-  depends_on = [time_sleep.blueprints_addons_sleep]
+resource "kubernetes_manifest" "ui_nlb" {
+  depends_on = [time_sleep.wait]
+
+  manifest = {
+    "apiVersion" = "v1"
+    "kind"       = "Service"
+    "metadata" = {
+      "name"      = "ui-nlb"
+      "namespace" = "ui"
+      "annotations" = {
+        "service.beta.kubernetes.io/aws-load-balancer-type"            = "external"
+        "service.beta.kubernetes.io/aws-load-balancer-scheme"          = "internet-facing"
+        "service.beta.kubernetes.io/aws-load-balancer-nlb-target-type" = "instance"
+        "service.beta.kubernetes.io/load-balancer-source-ranges"       = var.inbound_cidrs
+      }
+    }
+    "spec" = {
+      "type" = "LoadBalancer"
+      "ports" = [{
+        "port"       = 80
+        "targetPort" = 8080
+        "name"       = "http"
+      }]
+      "selector" = {
+        "app.kubernetes.io/name"      = "ui"
+        "app.kubernetes.io/instance"  = "ui"
+        "app.kubernetes.io/component" = "service"
+      }
+    }
+  }
 }

manifests/modules/automation/controlplanes/ack/.workshop/terraform/main.tf

@@ -8,12 +8,13 @@ We'll be using [Gitea](https://gitea.com) as a quick and easy alternative to Git
 Let's install Gitea in our EKS cluster with Helm:
 
 ```bash
+$ ESCAPED_CIDRS="${INBOUND_CIDRS//,/\\,}"
 $ helm upgrade --install gitea oci://docker.gitea.com/charts/gitea \
   --version "$GITEA_CHART_VERSION" \
   --namespace gitea --create-namespace \
   --values ~/environment/eks-workshop/modules/automation/gitops/flux/gitea/values.yaml \
-  --set "service.http.annotations.service\\.beta\\.kubernetes\\.io/load-balancer-source-ranges"="$INBOUND_CIDRS" \
-  --set "service.ssh.annotations.service\\.beta\\.kubernetes\\.io/load-balancer-source-ranges"="$INBOUND_CIDRS" \
+  --set "service.http.annotations.service\\.beta\\.kubernetes\\.io/load-balancer-source-ranges=$ESCAPED_CIDRS" \
+  --set "service.ssh.annotations.service\\.beta\\.kubernetes\\.io/load-balancer-source-ranges=$ESCAPED_CIDRS" \
   --set "gitea.admin.password=${GITEA_PASSWORD}" \
   --wait
 ```