From d1581d1272a8bbefa84063b7d0565d0ea3b9420f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chase=20=E6=9D=8E?= Date: Sun, 25 May 2025 00:57:02 -0500 Subject: [PATCH 1/8] Adding base IaC repo and testing out pr preview generator --- kubernetes/argocd/maid-cafe-stacks/IaC.yml | 21 +++++++++++++ .../maid-cafe-stacks/appsets/pr-preview.yml | 31 +++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 kubernetes/argocd/maid-cafe-stacks/IaC.yml create mode 100644 kubernetes/argocd/maid-cafe-stacks/appsets/pr-preview.yml diff --git a/kubernetes/argocd/maid-cafe-stacks/IaC.yml b/kubernetes/argocd/maid-cafe-stacks/IaC.yml new file mode 100644 index 0000000..f379a11 --- /dev/null +++ b/kubernetes/argocd/maid-cafe-stacks/IaC.yml @@ -0,0 +1,21 @@ +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: IaC + namespace: argocd +spec: + destination: + namespace: argocd + server: https://kubernetes.default.svc + project: default + source: + path: kubernetes/argocd/maid-cafe-stacks/appsets + repoURL: 'git@github.com:acm-uic/IaC.git' + targetRevision: 'feature/maid-cafe-argo' + syncPolicy: + automated: + prune: true + selfHeal: true + syncOptions: + - CreateNamespace=true diff --git a/kubernetes/argocd/maid-cafe-stacks/appsets/pr-preview.yml b/kubernetes/argocd/maid-cafe-stacks/appsets/pr-preview.yml new file mode 100644 index 0000000..d20ab7e --- /dev/null +++ b/kubernetes/argocd/maid-cafe-stacks/appsets/pr-preview.yml @@ -0,0 +1,31 @@ +--- +apiVersion: argoproj.io/v1alpha1 +kind: ApplicationSet +metadata: + name: pr-preview +spec: + goTemplate: true + goTemplateOptions: ["missingkey=error"] + generators: + - pullRequest: + owner: acm-uic + repo: IaC + labels: + - preview + requeueAfterSeconds: 500 + template: + metadata: + name: 'pr-{{branch}}-{{number}}' + namespace: argocd + spec: + source: + repoUrl: 'git@github.com:acm-uic/IaC.git' + targetRevision: '{{head_sha}}' + path: kubernetes/argocd/maid-cafe-stacks/appsets + project: default + destination: + server: https://kubernetes.default.svc + namespace: 'pr-{{branch}}-{{number}}' + syncPolicy: + syncOptions: + - CreateNamespace=true From 12d44eb7bac84f102b87c65bdbf1888fc5b84762 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chase=20=E6=9D=8E?= Date: Sun, 25 May 2025 01:00:00 -0500 Subject: [PATCH 2/8] Renaming project to be lowercase to conform to naming requirements --- kubernetes/argocd/maid-cafe-stacks/{IaC.yml => iac.yml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename kubernetes/argocd/maid-cafe-stacks/{IaC.yml => iac.yml} (97%) diff --git a/kubernetes/argocd/maid-cafe-stacks/IaC.yml b/kubernetes/argocd/maid-cafe-stacks/iac.yml similarity index 97% rename from kubernetes/argocd/maid-cafe-stacks/IaC.yml rename to kubernetes/argocd/maid-cafe-stacks/iac.yml index f379a11..4a2046d 100644 --- a/kubernetes/argocd/maid-cafe-stacks/IaC.yml +++ b/kubernetes/argocd/maid-cafe-stacks/iac.yml @@ -2,7 +2,7 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: - name: IaC + name: iac namespace: argocd spec: destination: From 6433dd84f1004f399e0619dbce29fcc079207923 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chase=20=E6=9D=8E?= Date: Sun, 25 May 2025 01:02:50 -0500 Subject: [PATCH 3/8] Fixing indentation on pr-preview appset --- .../maid-cafe-stacks/appsets/pr-preview.yml | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/kubernetes/argocd/maid-cafe-stacks/appsets/pr-preview.yml b/kubernetes/argocd/maid-cafe-stacks/appsets/pr-preview.yml index d20ab7e..212bd17 100644 --- a/kubernetes/argocd/maid-cafe-stacks/appsets/pr-preview.yml +++ b/kubernetes/argocd/maid-cafe-stacks/appsets/pr-preview.yml @@ -13,19 +13,19 @@ spec: labels: - preview requeueAfterSeconds: 500 - template: - metadata: - name: 'pr-{{branch}}-{{number}}' - namespace: argocd - spec: - source: - repoUrl: 'git@github.com:acm-uic/IaC.git' - targetRevision: '{{head_sha}}' - path: kubernetes/argocd/maid-cafe-stacks/appsets - project: default - destination: - server: https://kubernetes.default.svc - namespace: 'pr-{{branch}}-{{number}}' - syncPolicy: - syncOptions: - - CreateNamespace=true + template: + metadata: + name: 'pr-{{branch}}-{{number}}' + namespace: argocd + spec: + source: + repoUrl: 'git@github.com:acm-uic/IaC.git' + targetRevision: '{{head_sha}}' + path: kubernetes/argocd/maid-cafe-stacks/appsets + project: default + destination: + server: https://kubernetes.default.svc + namespace: 'pr-{{branch}}-{{number}}' + syncPolicy: + syncOptions: + - CreateNamespace=true From 767681f2825b20ea294be647dfe900cdad80aa91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chase=20=E6=9D=8E?= Date: Sun, 25 May 2025 01:04:00 -0500 Subject: [PATCH 4/8] Fixing more indentation --- kubernetes/argocd/maid-cafe-stacks/appsets/pr-preview.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/argocd/maid-cafe-stacks/appsets/pr-preview.yml b/kubernetes/argocd/maid-cafe-stacks/appsets/pr-preview.yml index 212bd17..b8bfdc0 100644 --- a/kubernetes/argocd/maid-cafe-stacks/appsets/pr-preview.yml +++ b/kubernetes/argocd/maid-cafe-stacks/appsets/pr-preview.yml @@ -22,7 +22,7 @@ spec: repoUrl: 'git@github.com:acm-uic/IaC.git' targetRevision: '{{head_sha}}' path: kubernetes/argocd/maid-cafe-stacks/appsets - project: default + project: default destination: server: https://kubernetes.default.svc namespace: 'pr-{{branch}}-{{number}}' From a6abeb8de1a7d94dd19dd2b88d52bf0483254a5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chase=20=E6=9D=8E?= Date: Sun, 25 May 2025 01:09:58 -0500 Subject: [PATCH 5/8] Fixing attribute name for template. Updating variable reference. --- kubernetes/argocd/maid-cafe-stacks/appsets/pr-preview.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kubernetes/argocd/maid-cafe-stacks/appsets/pr-preview.yml b/kubernetes/argocd/maid-cafe-stacks/appsets/pr-preview.yml index b8bfdc0..4215b48 100644 --- a/kubernetes/argocd/maid-cafe-stacks/appsets/pr-preview.yml +++ b/kubernetes/argocd/maid-cafe-stacks/appsets/pr-preview.yml @@ -15,17 +15,17 @@ spec: requeueAfterSeconds: 500 template: metadata: - name: 'pr-{{branch}}-{{number}}' + name: 'pr-{{.branch}}-{{.number}}' namespace: argocd spec: source: - repoUrl: 'git@github.com:acm-uic/IaC.git' - targetRevision: '{{head_sha}}' + repoURL: 'git@github.com:acm-uic/IaC.git' + targetRevision: '{{.head_sha}}' path: kubernetes/argocd/maid-cafe-stacks/appsets project: default destination: server: https://kubernetes.default.svc - namespace: 'pr-{{branch}}-{{number}}' + namespace: 'pr-{{.branch}}-{{.number}}' syncPolicy: syncOptions: - CreateNamespace=true From eb0c34b6b24917075ea71be349c2bbe7c8350226 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chase=20=E6=9D=8E?= Date: Sun, 25 May 2025 01:16:07 -0500 Subject: [PATCH 6/8] Fixing indenting. Configuration PR provider. Updating label with existing k8s label. --- .../argocd/maid-cafe-stacks/appsets/pr-preview.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/kubernetes/argocd/maid-cafe-stacks/appsets/pr-preview.yml b/kubernetes/argocd/maid-cafe-stacks/appsets/pr-preview.yml index 4215b48..4cff9a4 100644 --- a/kubernetes/argocd/maid-cafe-stacks/appsets/pr-preview.yml +++ b/kubernetes/argocd/maid-cafe-stacks/appsets/pr-preview.yml @@ -8,11 +8,12 @@ spec: goTemplateOptions: ["missingkey=error"] generators: - pullRequest: - owner: acm-uic - repo: IaC - labels: - - preview - requeueAfterSeconds: 500 + github: + owner: acm-uic + repo: IaC + labels: + - ':wheel_of_dharma: k8s' + requeueAfterSeconds: 60 template: metadata: name: 'pr-{{.branch}}-{{.number}}' From a00c8b86cb2cd1224c2ead54bcfc9ff5c19eaf69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chase=20=E6=9D=8E?= Date: Sun, 25 May 2025 18:15:35 -0500 Subject: [PATCH 7/8] Adding an additional label to match for PR preview projects --- kubernetes/argocd/maid-cafe-stacks/appsets/pr-preview.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/kubernetes/argocd/maid-cafe-stacks/appsets/pr-preview.yml b/kubernetes/argocd/maid-cafe-stacks/appsets/pr-preview.yml index 4cff9a4..be1d3ea 100644 --- a/kubernetes/argocd/maid-cafe-stacks/appsets/pr-preview.yml +++ b/kubernetes/argocd/maid-cafe-stacks/appsets/pr-preview.yml @@ -13,6 +13,7 @@ spec: repo: IaC labels: - ':wheel_of_dharma: k8s' + - ':eyes: preview' requeueAfterSeconds: 60 template: metadata: From b64e2866b88692e47080c5c675e92c6d914062a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chase=20=E6=9D=8E?= Date: Mon, 26 May 2025 17:42:40 -0500 Subject: [PATCH 8/8] Updating naming of application based on state of PR --- kubernetes/argocd/maid-cafe-stacks/appsets/pr-preview.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubernetes/argocd/maid-cafe-stacks/appsets/pr-preview.yml b/kubernetes/argocd/maid-cafe-stacks/appsets/pr-preview.yml index be1d3ea..b3c276a 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: 'pr-{{.branch}}-{{.number}}' + name: '{{if ne .head_short_sha .target_branch_sha}}pr-{{end}}{{.branch_slug}}-{{.number}}' namespace: argocd spec: source: @@ -27,7 +27,7 @@ spec: project: default destination: server: https://kubernetes.default.svc - namespace: 'pr-{{.branch}}-{{.number}}' + namespace: '{{if ne .head_short_sha .target_branch_sha}}pr-{{end}}{{.branch_slug}}-{{.number}}' syncPolicy: syncOptions: - CreateNamespace=true