From f529c0ec0e3472e3b13db769548e2f46feab445d Mon Sep 17 00:00:00 2001 From: ilanos42 <96919704+ilanos42@users.noreply.github.com> Date: Wed, 22 Jan 2025 09:09:38 +0200 Subject: [PATCH 01/11] Update my-prod-appset.yml --- argocd-apps-structure/appsets/my-prod-appset.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/argocd-apps-structure/appsets/my-prod-appset.yml b/argocd-apps-structure/appsets/my-prod-appset.yml index 4dbe20c5..827c719b 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/ilanos42/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/ilanos42/gitops-cert-level-3-examples.git targetRevision: HEAD path: '{{.path.path}}' From 3cf60b949828532299be7d0e3b5e913cacfe9907 Mon Sep 17 00:00:00 2001 From: ilanos42 <96919704+ilanos42@users.noreply.github.com> Date: Wed, 22 Jan 2025 09:09:54 +0200 Subject: [PATCH 02/11] Update my-qa-appset.yml --- argocd-apps-structure/appsets/my-qa-appset.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/argocd-apps-structure/appsets/my-qa-appset.yml b/argocd-apps-structure/appsets/my-qa-appset.yml index 69592aa9..de0f50c0 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/ilanos42/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/ilanos42/gitops-cert-level-3-examples.git targetRevision: HEAD path: '{{.path.path}}' From 5a3dcf8741a2d7ff58be86bb1c58bb7a36e3741c Mon Sep 17 00:00:00 2001 From: ilanos42 <96919704+ilanos42@users.noreply.github.com> Date: Wed, 22 Jan 2025 09:10:08 +0200 Subject: [PATCH 03/11] Update my-staging-appset.yml --- argocd-apps-structure/appsets/my-staging-appset.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/argocd-apps-structure/appsets/my-staging-appset.yml b/argocd-apps-structure/appsets/my-staging-appset.yml index 969b8f05..c1203a11 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/ilanos42/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/ilanos42/gitops-cert-level-3-examples.git targetRevision: HEAD path: '{{.path.path}}' From 3a1edfb8a9c1a66773e1cf2df8a13a7af7b9ed1c Mon Sep 17 00:00:00 2001 From: ilanos42 <96919704+ilanos42@users.noreply.github.com> Date: Wed, 22 Jan 2025 09:11:34 +0200 Subject: [PATCH 04/11] Update root-argocd-app.yml --- argocd-apps-structure/root-argocd-app.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/argocd-apps-structure/root-argocd-app.yml b/argocd-apps-structure/root-argocd-app.yml index 28574cfd..d3dd4a59 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/ilanos42/gitops-cert-level-3-examples.git targetRevision: HEAD path: argocd-apps-structure/appsets destination: @@ -17,4 +17,4 @@ spec: - CreateNamespace=true automated: prune: true - selfHeal: true \ No newline at end of file + selfHeal: true From 984cbd6f7cf673334bb3f07fb42893b43de251f7 Mon Sep 17 00:00:00 2001 From: yuris Date: Wed, 22 Jan 2025 07:31:54 +0000 Subject: [PATCH 05/11] task1 --- .../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 ---------- 5 files changed, 68 deletions(-) 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/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 b407e17d5acccd7bb95e9f7915a51e5bf1deb496 Mon Sep 17 00:00:00 2001 From: yuris Date: Wed, 22 Jan 2025 07:35:21 +0000 Subject: [PATCH 06/11] task1-fixed --- .../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 ---------- 4 files changed, 62 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 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 From ac9fc252d11d30526e8d34dcd403fd23c3d7c32d Mon Sep 17 00:00:00 2001 From: yuris Date: Fri, 24 Jan 2025 13:39:42 +0000 Subject: [PATCH 07/11] mission1 --- .../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..5d7d9683 --- /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" + 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..3af68f6e --- /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 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..88417978 --- /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" + 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..d5d934c2 --- /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" 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 b58980095cf3bb3df53ab1ab2d26ad998b8b3cda Mon Sep 17 00:00:00 2001 From: yuris Date: Fri, 24 Jan 2025 13:49:23 +0000 Subject: [PATCH 08/11] second-cluster deploy --- 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 827c719b..6096d8d2 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 14ca5531902edcc90e3b7dfa20585ef170701a33 Mon Sep 17 00:00:00 2001 From: ilanos42 <96919704+ilanos42@users.noreply.github.com> Date: Sat, 25 Jan 2025 18:52:39 +0200 Subject: [PATCH 09/11] Update pr-generator.yml --- 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..ef091e5d 100644 --- a/preview-environments/pr-generator/pr-generator.yml +++ b/preview-environments/pr-generator/pr-generator.yml @@ -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/ilanos42/gitops-cert-level-3-examples.git' targetRevision: HEAD path: preview-environments/kustomize-preview-app/ kustomize: @@ -31,4 +31,4 @@ spec: automated: prune: true syncOptions: - - CreateNamespace=true \ No newline at end of file + - CreateNamespace=true From 02cbd2359a56d96e4f272c72a5a896a34b085779 Mon Sep 17 00:00:00 2001 From: ilanos42 <96919704+ilanos42@users.noreply.github.com> Date: Sat, 25 Jan 2025 18:53:06 +0200 Subject: [PATCH 10/11] Update pr-generator.yml --- preview-environments/pr-generator/pr-generator.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/preview-environments/pr-generator/pr-generator.yml b/preview-environments/pr-generator/pr-generator.yml index ef091e5d..a534dcc4 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: ilanos42 repo: gitops-cert-level-3-examples requeueAfterSeconds: 180 template: From d6123f972bac6b37ba3345a8abc2f4efc3f3c0c9 Mon Sep 17 00:00:00 2001 From: ilanos42 <96919704+ilanos42@users.noreply.github.com> Date: Sat, 25 Jan 2025 18:58:15 +0200 Subject: [PATCH 11/11] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 82505336..97c83046 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ Codefresh GitOps Certification examples - Level 3 - GitOps Enterprise - +####### good commit ######## 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/)