From 2fae3127f54444c25a09668173ea90fa35693e40 Mon Sep 17 00:00:00 2001
From: Jugwan Eom <zugwan@gmail.com>
Date: Fri, 17 Jun 2022 09:34:56 +0000
Subject: [PATCH 1/2] support multiple infra provider

---
 .github/workflows/render-cd.sh                |  9 +++--
 .../tks-cluster-aws/site-values.yaml          | 32 ---------------
 .../tks-cluster-common/kustomization.yaml     |  5 +++
 .../tks-cluster-common/site-values.yaml       | 40 +++++++++++++++++++
 4 files changed, 51 insertions(+), 35 deletions(-)
 create mode 100644 decapod-reference/tks-cluster-common/kustomization.yaml
 create mode 100644 decapod-reference/tks-cluster-common/site-values.yaml

diff --git a/.github/workflows/render-cd.sh b/.github/workflows/render-cd.sh
index 0edccea..25a1be2 100755
--- a/.github/workflows/render-cd.sh
+++ b/.github/workflows/render-cd.sh
@@ -75,10 +75,12 @@ do
   done
 
   # Post processes for the customized action
-  #   Action1. change the namespace for aws-cluster-resouces from argo to cluster-name
-  echo "Almost finished: changing namespace for aws-cluster-resouces from argo to cluster-name.."
+  #   Action1. change the namespace for cluster-resouces from argo to cluster-name
+  echo "Almost finished: changing namespace for cluster-resouces from argo to cluster-name.."
   sudo sed -i "s/ namespace: argo/ namespace: $site/g" $(pwd)/$outputdir/$site/tks-cluster-aws/cluster-api-aws/*
   sudo sed -i "s/ - argo/ - $site/g" $(pwd)/output/$site/tks-cluster-aws/cluster-api-aws/*
+  sudo sed -i "s/ namespace: argo/ namespace: $site/g" $(pwd)/$outputdir/$site/tks-cluster-byoh/cluster-api-byoh/*
+  sudo sed -i "s/ - argo/ - $site/g" $(pwd)/output/$site/tks-cluster-byoh/cluster-api-byoh/*
   # It's possible besides of two above but very tricky!!
   # sudo sed -i "s/ argo$/ $site/g" $(pwd)/output/$site/tks-cluster-aws/cluster-api-aws/*
   echo "---
@@ -91,7 +93,8 @@ metadata:
     # It bring the secret 'dacapod-argocd-config' using kubed
     decapod-argocd-config: enabled
 " > Namespace_aws_rc.yaml
-  sudo mv Namespace_aws_rc.yaml $(pwd)/output/$site/tks-cluster-aws/cluster-api-aws/
+  sudo cp Namespace_aws_rc.yaml $(pwd)/output/$site/tks-cluster-aws/cluster-api-aws/
+  sudo cp Namespace_aws_rc.yaml $(pwd)/output/$site/tks-cluster-byoh/cluster-api-byoh/
   # End of Post process
 done
 
diff --git a/decapod-reference/tks-cluster-aws/site-values.yaml b/decapod-reference/tks-cluster-aws/site-values.yaml
index 166330e..5f6becb 100644
--- a/decapod-reference/tks-cluster-aws/site-values.yaml
+++ b/decapod-reference/tks-cluster-aws/site-values.yaml
@@ -44,37 +44,5 @@ charts:
         size: 50
         type: gp2
 
-- name: kubernetes-addons
-  override:
-    cni.calico.enabled: true
-
 - name: aws-ebs-csi-driver
   override:
-
-- name: ingress-nginx
-  override:
-    controller:
-      nodeSelector:
-        taco-lma: enabled
-      resources:
-        requests:
-          cpu: 2000m
-          memory: 4Gi
-      service:
-        annotations:
-          service.beta.kubernetes.io/aws-load-balancer-type: "nlb"
-        externalTrafficPolicy: Local
-        type: LoadBalancer
-      config:
-        enable-underscores-in-headers: "true"
-        proxy-body-size: "10m"
-
-- name: cluster-autoscaler
-  override:
-    discoveryNamespace: $(clusterName)
-    discoveryClusterName: $(clusterName)
-
-- name: cluster-autoscaler-rbac
-  override:
-    deployMgmtRbacOnly:
-      targetNamespace: $(clusterName)
diff --git a/decapod-reference/tks-cluster-common/kustomization.yaml b/decapod-reference/tks-cluster-common/kustomization.yaml
new file mode 100644
index 0000000..4d8d8ae
--- /dev/null
+++ b/decapod-reference/tks-cluster-common/kustomization.yaml
@@ -0,0 +1,5 @@
+resources:
+  - ../base
+
+transformers:
+  - site-values.yaml
diff --git a/decapod-reference/tks-cluster-common/site-values.yaml b/decapod-reference/tks-cluster-common/site-values.yaml
new file mode 100644
index 0000000..20a7086
--- /dev/null
+++ b/decapod-reference/tks-cluster-common/site-values.yaml
@@ -0,0 +1,40 @@
+apiVersion: openinfradev.github.com/v1
+kind: HelmValuesTransformer
+metadata:
+  name: site
+
+global:
+  # These values are replaced on cluster creation by workflow
+  clusterName: cluster.local
+charts:
+- name: kubernetes-addons
+  override:
+    cni.calico.enabled: true
+
+- name: ingress-nginx
+  override:
+    controller:
+      nodeSelector:
+        taco-lma: enabled
+      resources:
+        requests:
+          cpu: 2000m
+          memory: 4Gi
+      service:
+        annotations:
+          service.beta.kubernetes.io/aws-load-balancer-type: "nlb"
+        externalTrafficPolicy: Local
+        type: LoadBalancer
+      config:
+        enable-underscores-in-headers: "true"
+        proxy-body-size: "10m"
+
+- name: cluster-autoscaler
+  override:
+    discoveryNamespace: $(clusterName)
+    discoveryClusterName: $(clusterName)
+
+- name: cluster-autoscaler-rbac
+  override:
+    deployMgmtRbacOnly:
+      targetNamespace: $(clusterName)

From ba5ce7f0d33f71f5c492840f2205c9c58a6573cc Mon Sep 17 00:00:00 2001
From: Jugwan Eom <zugwan@gmail.com>
Date: Tue, 21 Jun 2022 11:42:02 +0000
Subject: [PATCH 2/2] render-cd: fix hard-coded output dir

---
 .github/workflows/render-cd.sh                       | 12 ++++++------
 .../tks-cluster-common/site-values.yaml              |  4 ++++
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/render-cd.sh b/.github/workflows/render-cd.sh
index 25a1be2..0c11f5a 100755
--- a/.github/workflows/render-cd.sh
+++ b/.github/workflows/render-cd.sh
@@ -6,7 +6,7 @@ GITHUB_IMAGE_REPO="ghcr.io"
 outputdir="output"
 
 rm -rf decapod-base-yaml
-site_list=$(ls -d */ | sed 's/\///g' | grep -v 'docs' | grep -v 'output' | grep -v 'offline')
+site_list=$(ls -d */ | sed 's/\///g' | grep -v 'docs' | grep -v $outputdir | grep -v 'offline')
 
 function usage {
         echo -e "\nUsage: $0 [--site TARGET_SITE] [--base_url DECAPOD_BASE_URL] [--registry REGISTRY_URL]"
@@ -78,11 +78,11 @@ do
   #   Action1. change the namespace for cluster-resouces from argo to cluster-name
   echo "Almost finished: changing namespace for cluster-resouces from argo to cluster-name.."
   sudo sed -i "s/ namespace: argo/ namespace: $site/g" $(pwd)/$outputdir/$site/tks-cluster-aws/cluster-api-aws/*
-  sudo sed -i "s/ - argo/ - $site/g" $(pwd)/output/$site/tks-cluster-aws/cluster-api-aws/*
+  sudo sed -i "s/ - argo/ - $site/g" $(pwd)/$outputdir/$site/tks-cluster-aws/cluster-api-aws/*
   sudo sed -i "s/ namespace: argo/ namespace: $site/g" $(pwd)/$outputdir/$site/tks-cluster-byoh/cluster-api-byoh/*
-  sudo sed -i "s/ - argo/ - $site/g" $(pwd)/output/$site/tks-cluster-byoh/cluster-api-byoh/*
+  sudo sed -i "s/ - argo/ - $site/g" $(pwd)/$outputdir/$site/tks-cluster-byoh/cluster-api-byoh/*
   # It's possible besides of two above but very tricky!!
-  # sudo sed -i "s/ argo$/ $site/g" $(pwd)/output/$site/tks-cluster-aws/cluster-api-aws/*
+  # sudo sed -i "s/ argo$/ $site/g" $(pwd)/$outputdir/$site/tks-cluster-aws/cluster-api-aws/*
   echo "---
 apiVersion: v1
 kind: Namespace
@@ -93,8 +93,8 @@ metadata:
     # It bring the secret 'dacapod-argocd-config' using kubed
     decapod-argocd-config: enabled
 " > Namespace_aws_rc.yaml
-  sudo cp Namespace_aws_rc.yaml $(pwd)/output/$site/tks-cluster-aws/cluster-api-aws/
-  sudo cp Namespace_aws_rc.yaml $(pwd)/output/$site/tks-cluster-byoh/cluster-api-byoh/
+  sudo cp Namespace_aws_rc.yaml $(pwd)/$outputdir/$site/tks-cluster-aws/cluster-api-aws/
+  sudo cp Namespace_aws_rc.yaml $(pwd)/$outputdir/$site/tks-cluster-byoh/cluster-api-byoh/
   # End of Post process
 done
 
diff --git a/decapod-reference/tks-cluster-common/site-values.yaml b/decapod-reference/tks-cluster-common/site-values.yaml
index 20a7086..c0fbe02 100644
--- a/decapod-reference/tks-cluster-common/site-values.yaml
+++ b/decapod-reference/tks-cluster-common/site-values.yaml
@@ -24,6 +24,10 @@ charts:
         annotations:
           service.beta.kubernetes.io/aws-load-balancer-type: "nlb"
         externalTrafficPolicy: Local
+        annotations:
+          service.beta.kubernetes.io/aws-load-balancer-name: "taco-ingress-nlb"
+          service.beta.kubernetes.io/aws-load-balancer-type: "nlb"
+          service.beta.kubernetes.io/aws-load-balancer-proxy-protocol: "*"
         type: LoadBalancer
       config:
         enable-underscores-in-headers: "true"