From e86eeec480450caff9084144cbbc2504737a50c8 Mon Sep 17 00:00:00 2001 From: Nick Ng Date: Tue, 13 May 2025 11:00:34 +0800 Subject: [PATCH 1/6] commit --- argocd-apps-structure/appsets/my-prod-appset.yml | 4 ++-- argocd-apps-structure/appsets/my-qa-appset.yml | 4 ++-- argocd-apps-structure/appsets/my-staging-appset.yml | 4 ++-- argocd-apps-structure/root-argocd-app.yml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/argocd-apps-structure/appsets/my-prod-appset.yml b/argocd-apps-structure/appsets/my-prod-appset.yml index 4dbe20c5..8a51cf17 100644 --- a/argocd-apps-structure/appsets/my-prod-appset.yml +++ b/argocd-apps-structure/appsets/my-prod-appset.yml @@ -8,7 +8,7 @@ spec: goTemplateOptions: ["missingkey=error"] generators: - git: - repoURL: https://github.com/codefresh-contrib/gitops-cert-level-3-examples.git + repoURL: https://github.com/nickngch/gitops-cert-level-3-examples.git revision: HEAD directories: - path: argocd-apps-structure/apps/*/envs/prod-us @@ -22,7 +22,7 @@ spec: # Source of the application manifests source: - repoURL: https://github.com/codefresh-contrib/gitops-cert-level-3-examples.git + repoURL: https://github.com/nickngch/gitops-cert-level-3-examples.git targetRevision: HEAD path: '{{.path.path}}' diff --git a/argocd-apps-structure/appsets/my-qa-appset.yml b/argocd-apps-structure/appsets/my-qa-appset.yml index 69592aa9..76001f69 100644 --- a/argocd-apps-structure/appsets/my-qa-appset.yml +++ b/argocd-apps-structure/appsets/my-qa-appset.yml @@ -8,7 +8,7 @@ spec: goTemplateOptions: ["missingkey=error"] generators: - git: - repoURL: https://github.com/codefresh-contrib/gitops-cert-level-3-examples.git + repoURL: https://github.com/nickngch/gitops-cert-level-3-examples.git revision: HEAD directories: - path: argocd-apps-structure/apps/*/envs/qa @@ -21,7 +21,7 @@ spec: # Source of the application manifests source: - repoURL: https://github.com/codefresh-contrib/gitops-cert-level-3-examples.git + repoURL: https://github.com/nickngch/gitops-cert-level-3-examples.git targetRevision: HEAD path: '{{.path.path}}' diff --git a/argocd-apps-structure/appsets/my-staging-appset.yml b/argocd-apps-structure/appsets/my-staging-appset.yml index 969b8f05..0682c2fa 100644 --- a/argocd-apps-structure/appsets/my-staging-appset.yml +++ b/argocd-apps-structure/appsets/my-staging-appset.yml @@ -8,7 +8,7 @@ spec: goTemplateOptions: ["missingkey=error"] generators: - git: - repoURL: https://github.com/codefresh-contrib/gitops-cert-level-3-examples.git + repoURL: https://github.com/nickngch/gitops-cert-level-3-examples.git revision: HEAD directories: - path: argocd-apps-structure/apps/*/envs/staging @@ -21,7 +21,7 @@ spec: # Source of the application manifests source: - repoURL: https://github.com/codefresh-contrib/gitops-cert-level-3-examples.git + repoURL: https://github.com/nickngch/gitops-cert-level-3-examples.git targetRevision: HEAD path: '{{.path.path}}' diff --git a/argocd-apps-structure/root-argocd-app.yml b/argocd-apps-structure/root-argocd-app.yml index 28574cfd..97496dcd 100644 --- a/argocd-apps-structure/root-argocd-app.yml +++ b/argocd-apps-structure/root-argocd-app.yml @@ -6,7 +6,7 @@ metadata: spec: project: default source: - repoURL: https://github.com/codefresh-contrib/gitops-cert-level-3-examples.git + repoURL: https://github.com/nickngch/gitops-cert-level-3-examples.git targetRevision: HEAD path: argocd-apps-structure/appsets destination: From 1597a2388573582252b592483f0d720740cab7d4 Mon Sep 17 00:00:00 2001 From: Nick Ng Date: Tue, 13 May 2025 14:37:10 +0800 Subject: [PATCH 2/6] commit --- .../apps/invoices/envs/qa/deployment.yml | 16 -------------- .../apps/invoices/envs/qa/kustomization.yml | 14 ------------- .../apps/invoices/envs/qa/settings.yml | 21 ------------------- .../apps/invoices/envs/qa/version.yml | 11 ---------- .../apps/payments/envs/prod-us/deployment.yml | 16 -------------- .../payments/envs/prod-us/kustomization.yml | 13 ------------ .../apps/payments/envs/prod-us/replicas.yml | 7 ------- .../apps/payments/envs/prod-us/settings.yml | 21 ------------------- .../apps/payments/envs/prod-us/version.yml | 11 ---------- 9 files changed, 130 deletions(-) delete mode 100644 argocd-apps-structure/apps/invoices/envs/qa/deployment.yml delete mode 100644 argocd-apps-structure/apps/invoices/envs/qa/kustomization.yml delete mode 100644 argocd-apps-structure/apps/invoices/envs/qa/settings.yml delete mode 100644 argocd-apps-structure/apps/invoices/envs/qa/version.yml delete mode 100644 argocd-apps-structure/apps/payments/envs/prod-us/deployment.yml delete mode 100644 argocd-apps-structure/apps/payments/envs/prod-us/kustomization.yml delete mode 100644 argocd-apps-structure/apps/payments/envs/prod-us/replicas.yml delete mode 100644 argocd-apps-structure/apps/payments/envs/prod-us/settings.yml delete mode 100644 argocd-apps-structure/apps/payments/envs/prod-us/version.yml diff --git a/argocd-apps-structure/apps/invoices/envs/qa/deployment.yml b/argocd-apps-structure/apps/invoices/envs/qa/deployment.yml deleted file mode 100644 index b4d29ebc..00000000 --- a/argocd-apps-structure/apps/invoices/envs/qa/deployment.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: simple-deployment -spec: - template: - spec: - containers: - - name: webserver-simple - env: - - name: ENV - value: "qa" - - name: GPU_ENABLED - value: "1" - \ No newline at end of file diff --git a/argocd-apps-structure/apps/invoices/envs/qa/kustomization.yml b/argocd-apps-structure/apps/invoices/envs/qa/kustomization.yml deleted file mode 100644 index 8d95e15a..00000000 --- a/argocd-apps-structure/apps/invoices/envs/qa/kustomization.yml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - - -resources: -- ../../base - - -patchesStrategicMerge: -- deployment.yml -- version.yml -- settings.yml - - diff --git a/argocd-apps-structure/apps/invoices/envs/qa/settings.yml b/argocd-apps-structure/apps/invoices/envs/qa/settings.yml deleted file mode 100644 index 738a5bec..00000000 --- a/argocd-apps-structure/apps/invoices/envs/qa/settings.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: simple-deployment -spec: - template: - spec: - containers: - - name: webserver-simple - env: - - name: UI_THEME - value: "light" - - name: CACHE_SIZE - value: "2048kb" - - name: PAGE_LIMIT - value: "25" - - name: SORTING - value: "ascending" - - name: N_BUCKETS - value: "42" \ No newline at end of file diff --git a/argocd-apps-structure/apps/invoices/envs/qa/version.yml b/argocd-apps-structure/apps/invoices/envs/qa/version.yml deleted file mode 100644 index 51bc5350..00000000 --- a/argocd-apps-structure/apps/invoices/envs/qa/version.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: simple-deployment -spec: - template: - spec: - containers: - - name: webserver-simple - image: docker.io/kostiscodefresh/simple-env-app:1.0 diff --git a/argocd-apps-structure/apps/payments/envs/prod-us/deployment.yml b/argocd-apps-structure/apps/payments/envs/prod-us/deployment.yml deleted file mode 100644 index 676bc417..00000000 --- a/argocd-apps-structure/apps/payments/envs/prod-us/deployment.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: simple-deployment -spec: - template: - spec: - containers: - - name: webserver-simple - env: - - name: ENV - value: "prod-us" - - name: GPU_ENABLED - value: "1" - \ No newline at end of file diff --git a/argocd-apps-structure/apps/payments/envs/prod-us/kustomization.yml b/argocd-apps-structure/apps/payments/envs/prod-us/kustomization.yml deleted file mode 100644 index 40349214..00000000 --- a/argocd-apps-structure/apps/payments/envs/prod-us/kustomization.yml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: -- ../../base - - -patchesStrategicMerge: -- deployment.yml -- version.yml -- replicas.yml -- settings.yml - diff --git a/argocd-apps-structure/apps/payments/envs/prod-us/replicas.yml b/argocd-apps-structure/apps/payments/envs/prod-us/replicas.yml deleted file mode 100644 index 92e30ec8..00000000 --- a/argocd-apps-structure/apps/payments/envs/prod-us/replicas.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: simple-deployment -spec: - replicas: 10 \ No newline at end of file diff --git a/argocd-apps-structure/apps/payments/envs/prod-us/settings.yml b/argocd-apps-structure/apps/payments/envs/prod-us/settings.yml deleted file mode 100644 index 67c3ea38..00000000 --- a/argocd-apps-structure/apps/payments/envs/prod-us/settings.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: simple-deployment -spec: - template: - spec: - containers: - - name: webserver-simple - env: - - name: UI_THEME - value: "dark" - - name: CACHE_SIZE - value: "1024kb" - - name: PAGE_LIMIT - value: "25" - - name: SORTING - value: "ascending" - - name: N_BUCKETS - value: "42" \ No newline at end of file diff --git a/argocd-apps-structure/apps/payments/envs/prod-us/version.yml b/argocd-apps-structure/apps/payments/envs/prod-us/version.yml deleted file mode 100644 index 0423d0fa..00000000 --- a/argocd-apps-structure/apps/payments/envs/prod-us/version.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: simple-deployment -spec: - template: - spec: - containers: - - name: webserver-simple - image: docker.io/kostiscodefresh/simple-env-app:2.0 From eceadaed3969db70115dc1bde7f0475f0b149946 Mon Sep 17 00:00:00 2001 From: Nick Ng Date: Tue, 13 May 2025 14:49:35 +0800 Subject: [PATCH 3/6] commit --- .../apps/billing/envs/qa/deployment.yml | 16 ++++++++++++++ .../apps/billing/envs/qa/kustomization.yml | 13 ++++++++++++ .../apps/billing/envs/qa/replicas.yml | 7 +++++++ .../apps/billing/envs/qa/settings.yml | 21 +++++++++++++++++++ .../apps/billing/envs/qa/version.yml | 11 ++++++++++ .../apps/orders/envs/prod-eu/deployment.yml | 16 ++++++++++++++ .../orders/envs/prod-eu/kustomization.yml | 13 ++++++++++++ .../apps/orders/envs/prod-eu/replicas.yml | 7 +++++++ .../apps/orders/envs/prod-eu/settings.yml | 21 +++++++++++++++++++ .../apps/orders/envs/prod-eu/version.yml | 11 ++++++++++ 10 files changed, 136 insertions(+) create mode 100644 argocd-apps-structure/apps/billing/envs/qa/deployment.yml create mode 100644 argocd-apps-structure/apps/billing/envs/qa/kustomization.yml create mode 100644 argocd-apps-structure/apps/billing/envs/qa/replicas.yml create mode 100644 argocd-apps-structure/apps/billing/envs/qa/settings.yml create mode 100644 argocd-apps-structure/apps/billing/envs/qa/version.yml create mode 100644 argocd-apps-structure/apps/orders/envs/prod-eu/deployment.yml create mode 100644 argocd-apps-structure/apps/orders/envs/prod-eu/kustomization.yml create mode 100644 argocd-apps-structure/apps/orders/envs/prod-eu/replicas.yml create mode 100644 argocd-apps-structure/apps/orders/envs/prod-eu/settings.yml create mode 100644 argocd-apps-structure/apps/orders/envs/prod-eu/version.yml diff --git a/argocd-apps-structure/apps/billing/envs/qa/deployment.yml b/argocd-apps-structure/apps/billing/envs/qa/deployment.yml new file mode 100644 index 00000000..b4d29ebc --- /dev/null +++ b/argocd-apps-structure/apps/billing/envs/qa/deployment.yml @@ -0,0 +1,16 @@ +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: simple-deployment +spec: + template: + spec: + containers: + - name: webserver-simple + env: + - name: ENV + value: "qa" + - name: GPU_ENABLED + value: "1" + \ No newline at end of file diff --git a/argocd-apps-structure/apps/billing/envs/qa/kustomization.yml b/argocd-apps-structure/apps/billing/envs/qa/kustomization.yml new file mode 100644 index 00000000..40349214 --- /dev/null +++ b/argocd-apps-structure/apps/billing/envs/qa/kustomization.yml @@ -0,0 +1,13 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: +- ../../base + + +patchesStrategicMerge: +- deployment.yml +- version.yml +- replicas.yml +- settings.yml + diff --git a/argocd-apps-structure/apps/billing/envs/qa/replicas.yml b/argocd-apps-structure/apps/billing/envs/qa/replicas.yml new file mode 100644 index 00000000..d7826456 --- /dev/null +++ b/argocd-apps-structure/apps/billing/envs/qa/replicas.yml @@ -0,0 +1,7 @@ +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: simple-deployment +spec: + replicas: 2 \ No newline at end of file diff --git a/argocd-apps-structure/apps/billing/envs/qa/settings.yml b/argocd-apps-structure/apps/billing/envs/qa/settings.yml new file mode 100644 index 00000000..67c3ea38 --- /dev/null +++ b/argocd-apps-structure/apps/billing/envs/qa/settings.yml @@ -0,0 +1,21 @@ +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: simple-deployment +spec: + template: + spec: + containers: + - name: webserver-simple + env: + - name: UI_THEME + value: "dark" + - name: CACHE_SIZE + value: "1024kb" + - name: PAGE_LIMIT + value: "25" + - name: SORTING + value: "ascending" + - name: N_BUCKETS + value: "42" \ No newline at end of file diff --git a/argocd-apps-structure/apps/billing/envs/qa/version.yml b/argocd-apps-structure/apps/billing/envs/qa/version.yml new file mode 100644 index 00000000..0423d0fa --- /dev/null +++ b/argocd-apps-structure/apps/billing/envs/qa/version.yml @@ -0,0 +1,11 @@ +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: simple-deployment +spec: + template: + spec: + containers: + - name: webserver-simple + image: docker.io/kostiscodefresh/simple-env-app:2.0 diff --git a/argocd-apps-structure/apps/orders/envs/prod-eu/deployment.yml b/argocd-apps-structure/apps/orders/envs/prod-eu/deployment.yml new file mode 100644 index 00000000..a1480d1b --- /dev/null +++ b/argocd-apps-structure/apps/orders/envs/prod-eu/deployment.yml @@ -0,0 +1,16 @@ +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: simple-deployment +spec: + template: + spec: + containers: + - name: webserver-simple + env: + - name: ENV + value: "prod-eu" + - name: GPU_ENABLED + value: "1" + \ No newline at end of file diff --git a/argocd-apps-structure/apps/orders/envs/prod-eu/kustomization.yml b/argocd-apps-structure/apps/orders/envs/prod-eu/kustomization.yml new file mode 100644 index 00000000..40349214 --- /dev/null +++ b/argocd-apps-structure/apps/orders/envs/prod-eu/kustomization.yml @@ -0,0 +1,13 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: +- ../../base + + +patchesStrategicMerge: +- deployment.yml +- version.yml +- replicas.yml +- settings.yml + diff --git a/argocd-apps-structure/apps/orders/envs/prod-eu/replicas.yml b/argocd-apps-structure/apps/orders/envs/prod-eu/replicas.yml new file mode 100644 index 00000000..92e30ec8 --- /dev/null +++ b/argocd-apps-structure/apps/orders/envs/prod-eu/replicas.yml @@ -0,0 +1,7 @@ +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: simple-deployment +spec: + replicas: 10 \ No newline at end of file diff --git a/argocd-apps-structure/apps/orders/envs/prod-eu/settings.yml b/argocd-apps-structure/apps/orders/envs/prod-eu/settings.yml new file mode 100644 index 00000000..ca8177dc --- /dev/null +++ b/argocd-apps-structure/apps/orders/envs/prod-eu/settings.yml @@ -0,0 +1,21 @@ +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: simple-deployment +spec: + template: + spec: + containers: + - name: webserver-simple + env: + - name: UI_THEME + value: "dark" + - name: CACHE_SIZE + value: "2048kb" + - name: PAGE_LIMIT + value: "25" + - name: SORTING + value: "ascending" + - name: N_BUCKETS + value: "42" \ No newline at end of file diff --git a/argocd-apps-structure/apps/orders/envs/prod-eu/version.yml b/argocd-apps-structure/apps/orders/envs/prod-eu/version.yml new file mode 100644 index 00000000..0423d0fa --- /dev/null +++ b/argocd-apps-structure/apps/orders/envs/prod-eu/version.yml @@ -0,0 +1,11 @@ +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: simple-deployment +spec: + template: + spec: + containers: + - name: webserver-simple + image: docker.io/kostiscodefresh/simple-env-app:2.0 From 90bfd575a599a401787b95b9984c8d614c42ad64 Mon Sep 17 00:00:00 2001 From: Nick Ng Date: Tue, 13 May 2025 14:53:29 +0800 Subject: [PATCH 4/6] commit --- argocd-apps-structure/appsets/my-prod-appset.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/argocd-apps-structure/appsets/my-prod-appset.yml b/argocd-apps-structure/appsets/my-prod-appset.yml index 8a51cf17..946a7a6c 100644 --- a/argocd-apps-structure/appsets/my-prod-appset.yml +++ b/argocd-apps-structure/appsets/my-prod-appset.yml @@ -28,7 +28,7 @@ spec: # Destination cluster and namespace to deploy the application destination: - server: https://kubernetes.default.svc + name: cluster-2 namespace: '{{index .path.segments 2}}-{{index .path.segments 4}}' # Sync policy From 6258a484d6f9e5bd18e78e1f6b5e708c67a567bb Mon Sep 17 00:00:00 2001 From: Nick Ng Date: Wed, 14 May 2025 17:26:33 +0800 Subject: [PATCH 5/6] commit --- preview-environments/pr-generator/pr-generator.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/preview-environments/pr-generator/pr-generator.yml b/preview-environments/pr-generator/pr-generator.yml index e1d12898..cc69bc45 100644 --- a/preview-environments/pr-generator/pr-generator.yml +++ b/preview-environments/pr-generator/pr-generator.yml @@ -9,7 +9,7 @@ spec: generators: - pullRequest: github: - owner: codefresh-contrib + owner: nickngch repo: gitops-cert-level-3-examples requeueAfterSeconds: 180 template: @@ -17,7 +17,7 @@ spec: name: 'myapp-{{.branch}}' spec: source: - repoURL: 'https://github.com/codefresh-contrib/gitops-cert-level-3-examples.git' + repoURL: 'https://github.com/nickngch/gitops-cert-level-3-examples.git' targetRevision: HEAD path: preview-environments/kustomize-preview-app/ kustomize: From fadc51f2b75d3e36a0796bbfbd3e07bedee6b2fd Mon Sep 17 00:00:00 2001 From: Nick Ng Date: Wed, 14 May 2025 17:34:29 +0800 Subject: [PATCH 6/6] commit --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 82505336..dc108e57 100644 --- a/README.md +++ b/README.md @@ -3,3 +3,4 @@ Codefresh GitOps Certification examples - Level 3 - GitOps Enterprise This repository contains examples for the ArgoCD/GitOps certification workshops (Level 3) Take the certification yourself at [https://codefresh.io/courses/get-gitops-certified/](https://learning.codefresh.io/) +bad commit \ No newline at end of file