From f6a395d86962d4e42e9d513474e01088a3d43383 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chase=20=E6=9D=8E?= Date: Mon, 26 May 2025 18:27:47 -0500 Subject: [PATCH 1/5] Adding helm management of ArgoCD using an ApplicationSet --- .../argocd/maid-cafe-stacks/appsets/argo.yml | 47 +++++++++++++++++++ .../helm_charts/argocd/values.yml | 19 ++++++++ 2 files changed, 66 insertions(+) create mode 100644 kubernetes/argocd/maid-cafe-stacks/appsets/argo.yml create mode 100644 kubernetes/argocd/maid-cafe-stacks/helm_charts/argocd/values.yml diff --git a/kubernetes/argocd/maid-cafe-stacks/appsets/argo.yml b/kubernetes/argocd/maid-cafe-stacks/appsets/argo.yml new file mode 100644 index 0000000..1eff81b --- /dev/null +++ b/kubernetes/argocd/maid-cafe-stacks/appsets/argo.yml @@ -0,0 +1,47 @@ +--- +apiVersion: argoproj.io/v1alpha1 +kind: ApplicationSet +metadata: + name: pr-preview +spec: + goTemplate: true + goTemplateOptions: ["missingkey=error"] + generators: + - pullRequest: + github: + owner: acm-uic + repo: IaC + labels: + - ':wheel_of_dharma: k8s' + - ':eyes: preview' + requeueAfterSeconds: 60 + template: + metadata: + name: '{{if ne .head_short_sha .target_branch_sha}}pr-{{.number}}-{{end}}argocd' + namespace: argocd + spec: + sources: + - repoURL: 'https://argoproj.github.io/argo-helm' + targetRevision: 8.0.10 + chart: argo-cd + helm: + valueFiles: + - $values/kubernetes/argocd/maid-cafe-stacks/helm_charts/argocd/values.yml + - path: kubernetes/argocd/maid-cafe-stacks/helm_charts/argocd + repoURL: 'git@github.com:acm-uic/IaC.git' + targetRevision: '{{.head_sha}}' + ref: values + directory: + recurse: true + include: '*.yml' + exclude: values.yml + project: default + destination: + server: https://kubernetes.default.svc + namespace: '{{if ne .head_short_sha .target_branch_sha}}pr-{{end}}{{.branch_slug}}-{{.number}}' + syncPolicy: + syncOptions: + - CreateNamespace=true + automated: + prune: true + selfHeal: true diff --git a/kubernetes/argocd/maid-cafe-stacks/helm_charts/argocd/values.yml b/kubernetes/argocd/maid-cafe-stacks/helm_charts/argocd/values.yml new file mode 100644 index 0000000..c3839e2 --- /dev/null +++ b/kubernetes/argocd/maid-cafe-stacks/helm_charts/argocd/values.yml @@ -0,0 +1,19 @@ +--- +redis-ha: + enabled: true + +controller: + replicas: 1 + +server: + autoscaling: + enabled: true + minReplicas: 2 + +repoServer: + autoscaling: + enabled: true + minReplicas: 2 + +applicationSet: + replicas: 2 From 8f05e4378414ce83cd2e18c610ed9ff1ee977145 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chase=20=E6=9D=8E?= Date: Mon, 9 Jun 2025 00:02:04 -0500 Subject: [PATCH 2/5] Fixing appset branch reference. Updating appset generator to use valid generator variables. --- kubernetes/argocd/maid-cafe-stacks/appsets/pr-preview.yml | 4 ++-- kubernetes/argocd/maid-cafe-stacks/iac.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kubernetes/argocd/maid-cafe-stacks/appsets/pr-preview.yml b/kubernetes/argocd/maid-cafe-stacks/appsets/pr-preview.yml index b3c276a..22b2078 100644 --- a/kubernetes/argocd/maid-cafe-stacks/appsets/pr-preview.yml +++ b/kubernetes/argocd/maid-cafe-stacks/appsets/pr-preview.yml @@ -17,7 +17,7 @@ spec: requeueAfterSeconds: 60 template: metadata: - name: '{{if ne .head_short_sha .target_branch_sha}}pr-{{end}}{{.branch_slug}}-{{.number}}' + name: '{{if ne .branch_slug .target_branch_slug}}pr-{{end}}{{.branch_slug}}-{{.number}}' namespace: argocd spec: source: @@ -27,7 +27,7 @@ spec: project: default destination: server: https://kubernetes.default.svc - namespace: '{{if ne .head_short_sha .target_branch_sha}}pr-{{end}}{{.branch_slug}}-{{.number}}' + namespace: '{{if ne .branch_slug .target_branch_slug}}pr-{{end}}{{.branch_slug}}-{{.number}}' syncPolicy: syncOptions: - CreateNamespace=true diff --git a/kubernetes/argocd/maid-cafe-stacks/iac.yml b/kubernetes/argocd/maid-cafe-stacks/iac.yml index 4a2046d..2f76e17 100644 --- a/kubernetes/argocd/maid-cafe-stacks/iac.yml +++ b/kubernetes/argocd/maid-cafe-stacks/iac.yml @@ -12,7 +12,7 @@ spec: source: path: kubernetes/argocd/maid-cafe-stacks/appsets repoURL: 'git@github.com:acm-uic/IaC.git' - targetRevision: 'feature/maid-cafe-argo' + targetRevision: 'feature/maid-cafe-argo-helm' syncPolicy: automated: prune: true From c40ca6c626f39cbfff09ce360cb453b35778db0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chase=20=E6=9D=8E?= Date: Mon, 9 Jun 2025 00:07:43 -0500 Subject: [PATCH 3/5] Fixing appset name reference for argocd app --- kubernetes/argocd/maid-cafe-stacks/appsets/argo.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubernetes/argocd/maid-cafe-stacks/appsets/argo.yml b/kubernetes/argocd/maid-cafe-stacks/appsets/argo.yml index 1eff81b..88e3ac3 100644 --- a/kubernetes/argocd/maid-cafe-stacks/appsets/argo.yml +++ b/kubernetes/argocd/maid-cafe-stacks/appsets/argo.yml @@ -2,7 +2,7 @@ apiVersion: argoproj.io/v1alpha1 kind: ApplicationSet metadata: - name: pr-preview + name: argocd spec: goTemplate: true goTemplateOptions: ["missingkey=error"] @@ -22,7 +22,7 @@ spec: spec: sources: - repoURL: 'https://argoproj.github.io/argo-helm' - targetRevision: 8.0.10 + targetRevision: 8.0.14 chart: argo-cd helm: valueFiles: From 8152980db10935b265f7a913ded704520b94a7a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chase=20=E6=9D=8E?= Date: Mon, 9 Jun 2025 00:11:19 -0500 Subject: [PATCH 4/5] Fixing appset variable reference for argocd appset --- kubernetes/argocd/maid-cafe-stacks/appsets/argo.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubernetes/argocd/maid-cafe-stacks/appsets/argo.yml b/kubernetes/argocd/maid-cafe-stacks/appsets/argo.yml index 88e3ac3..b7344a8 100644 --- a/kubernetes/argocd/maid-cafe-stacks/appsets/argo.yml +++ b/kubernetes/argocd/maid-cafe-stacks/appsets/argo.yml @@ -17,7 +17,7 @@ spec: requeueAfterSeconds: 60 template: metadata: - name: '{{if ne .head_short_sha .target_branch_sha}}pr-{{.number}}-{{end}}argocd' + name: '{{if ne .branch_slug .target_branch_slug}}pr-{{.number}}-{{end}}argocd' namespace: argocd spec: sources: @@ -38,7 +38,7 @@ spec: project: default destination: server: https://kubernetes.default.svc - namespace: '{{if ne .head_short_sha .target_branch_sha}}pr-{{end}}{{.branch_slug}}-{{.number}}' + namespace: '{{if ne .branch_slug .target_branch_slug}}pr-{{end}}{{.branch_slug}}-{{.number}}' syncPolicy: syncOptions: - CreateNamespace=true From ec80bb122b7186757a3e509c3818869259892307 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chase=20=E6=9D=8E?= Date: Mon, 9 Jun 2025 00:16:44 -0500 Subject: [PATCH 5/5] Switching to main branch for iac app --- kubernetes/argocd/maid-cafe-stacks/iac.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/argocd/maid-cafe-stacks/iac.yml b/kubernetes/argocd/maid-cafe-stacks/iac.yml index 2f76e17..b4f45e9 100644 --- a/kubernetes/argocd/maid-cafe-stacks/iac.yml +++ b/kubernetes/argocd/maid-cafe-stacks/iac.yml @@ -12,7 +12,7 @@ spec: source: path: kubernetes/argocd/maid-cafe-stacks/appsets repoURL: 'git@github.com:acm-uic/IaC.git' - targetRevision: 'feature/maid-cafe-argo-helm' + targetRevision: 'main' syncPolicy: automated: prune: true