From 2080cf4615594f4e4bf7f5f1354ec2f0cd3cb4fc Mon Sep 17 00:00:00 2001 From: talku43 Date: Thu, 16 Jul 2026 10:25:15 +0300 Subject: [PATCH 01/33] Change repoURL to user-specific placeholder Updated repository URL placeholder in application YAML. --- app-of-apps/root-app/my-application.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-of-apps/root-app/my-application.yml b/app-of-apps/root-app/my-application.yml index a5bc9b98c3..c88e95e74a 100644 --- a/app-of-apps/root-app/my-application.yml +++ b/app-of-apps/root-app/my-application.yml @@ -13,7 +13,7 @@ spec: # Source of the application manifests source: - repoURL: https://github.com/codefresh-contrib/gitops-cert-level-2-examples.git + repoURL: https://github.com//gitops-cert-level-2-examples.git targetRevision: HEAD path: ./app-of-apps/my-app-list @@ -31,4 +31,4 @@ spec: prune: true # Specifies if resources should be pruned during auto-syncing ( false by default ). selfHeal: true # Specifies if partial app sync should be executed when resources are changed only in target Kubernetes cluster and no git change detected ( false by default ). allowEmpty: false # Allows deleting all application resources during automatic syncing ( false by default ). - \ No newline at end of file + From e198b9187f532446614ebf7686341b3b67418b73 Mon Sep 17 00:00:00 2001 From: talku43 Date: Thu, 16 Jul 2026 12:01:56 +0300 Subject: [PATCH 02/33] Create kubeview.yaml --- app-of-apps/my-app-list/kubeview.yaml | 32 +++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 app-of-apps/my-app-list/kubeview.yaml diff --git a/app-of-apps/my-app-list/kubeview.yaml b/app-of-apps/my-app-list/kubeview.yaml new file mode 100644 index 0000000000..91cb797c23 --- /dev/null +++ b/app-of-apps/my-app-list/kubeview.yaml @@ -0,0 +1,32 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: kubeview + # You'll usually want to add your resources to the argocd namespace. + namespace: argocd + # Add a this finalizer ONLY if you want these to cascade delete. + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + # The project the application belongs to. + project: default + + # Source of the application manifests + source: + repoURL: https://github.com/codefresh-contrib/gitops-cert-level-2-examples.git + targetRevision: HEAD + path: ./app-of-apps/manifests + + # Destination cluster and namespace to deploy the application + destination: + server: https://kubernetes.default.svc + namespace: kubeview + + # Sync policy + syncPolicy: + syncOptions: + - CreateNamespace=true + automated: # automated sync by default retries failed attempts 5 times with following delays between attempts ( 5s, 10s, 20s, 40s, 80s ); retry controlled using `retry` field. + prune: true # Specifies if resources should be pruned during auto-syncing ( false by default ). + selfHeal: true # Specifies if partial app sync should be executed when resources are changed only in target Kubernetes cluster and no git change detected ( false by default ). + From 4240ac56ffed31e93b21933c928917b25af89c87 Mon Sep 17 00:00:00 2001 From: talku43 Date: Thu, 16 Jul 2026 12:02:35 +0300 Subject: [PATCH 03/33] Add Argo Workflows application manifest --- app-of-apps/my-app-list/argo-workflows.yml | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 app-of-apps/my-app-list/argo-workflows.yml diff --git a/app-of-apps/my-app-list/argo-workflows.yml b/app-of-apps/my-app-list/argo-workflows.yml new file mode 100644 index 0000000000..bd43d9c93d --- /dev/null +++ b/app-of-apps/my-app-list/argo-workflows.yml @@ -0,0 +1,32 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: argo-workflows + # You'll usually want to add your resources to the argocd namespace. + namespace: argocd + # Add a this finalizer ONLY if you want these to cascade delete. + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + # The project the application belongs to. + project: default + + # Source of the application manifests + source: + repoURL: https://github.com/codefresh-contrib/gitops-cert-level-2-examples.git + targetRevision: HEAD + path: ./app-of-apps/manifests + + # Destination cluster and namespace to deploy the application + destination: + server: https://kubernetes.default.svc + namespace: argo-workflows + + # Sync policy + syncPolicy: + syncOptions: + - CreateNamespace=true + automated: # automated sync by default retries failed attempts 5 times with following delays between attempts ( 5s, 10s, 20s, 40s, 80s ); retry controlled using `retry` field. + prune: true # Specifies if resources should be pruned during auto-syncing ( false by default ). + selfHeal: true # Specifies if partial app sync should be executed when resources are changed only in target Kubernetes cluster and no git change detected ( false by default ). + From ef299bcd12f1cdd4cbc3190f327ec2432f8443d5 Mon Sep 17 00:00:00 2001 From: talku43 Date: Thu, 16 Jul 2026 14:20:24 +0300 Subject: [PATCH 04/33] Add many-apps.yml for ApplicationSet configuration --- .../my-application-sets/many-apps.yml | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 application-sets/my-application-sets/many-apps.yml diff --git a/application-sets/my-application-sets/many-apps.yml b/application-sets/my-application-sets/many-apps.yml new file mode 100644 index 0000000000..31bbcc9793 --- /dev/null +++ b/application-sets/my-application-sets/many-apps.yml @@ -0,0 +1,38 @@ +apiVersion: argoproj.io/v1alpha1 +kind: ApplicationSet +metadata: + name: many-apps-application-set + namespace: argocd +spec: + generators: + - git: + repoURL: https://github.com/codefresh-contrib/gitops-cert-level-2-examples.git + revision: HEAD + directories: + - path: application-sets/example-apps/* + template: + metadata: + name: '{{path.basename}}' + spec: + # The project the application belongs to. + project: default + + # Source of the application manifests + source: + repoURL: https://github.com/codefresh-contrib/gitops-cert-level-2-examples.git + targetRevision: HEAD + path: '{{path}}' + + # Destination cluster and namespace to deploy the application + destination: + server: https://kubernetes.default.svc + namespace: '{{path.basename}}' + + # Sync policy + syncPolicy: + syncOptions: + - CreateNamespace=true + automated: # automated sync by default retries failed attempts 5 times with following delays between attempts ( 5s, 10s, 20s, 40s, 80s ); retry controlled using `retry` field. + prune: true # Specifies if resources should be pruned during auto-syncing ( false by default ). + selfHeal: true # Specifies if partial app sync should be executed when resources are changed only in target Kubernetes cluster and no git change detected ( false by default ). + From 14b95b1b5122576d0e483a595e02588b052a87c7 Mon Sep 17 00:00:00 2001 From: talku43 Date: Thu, 16 Jul 2026 14:36:59 +0300 Subject: [PATCH 05/33] Create single-app-multiple-clusters.yml --- .../single-app-multiple-clusters.yml | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 application-sets/my-application-sets/single-app-multiple-clusters.yml diff --git a/application-sets/my-application-sets/single-app-multiple-clusters.yml b/application-sets/my-application-sets/single-app-multiple-clusters.yml new file mode 100644 index 0000000000..db9a363033 --- /dev/null +++ b/application-sets/my-application-sets/single-app-multiple-clusters.yml @@ -0,0 +1,34 @@ +apiVersion: argoproj.io/v1alpha1 +kind: ApplicationSet +metadata: + name: multi-cluster-application-set + namespace: argocd +spec: + generators: + - clusters: {} # Automatically use all clusters defined within Argo CD + template: + metadata: + name: '{{name}}-billing-app' + spec: + # The project the application belongs to. + project: default + + # Source of the application manifests + source: + repoURL: https://github.com/codefresh-contrib/gitops-cert-level-2-examples.git + targetRevision: HEAD + path: ./application-sets/manifests + + # Destination cluster and namespace to deploy the application + destination: + server: '{{server}}' + namespace: billing + + # Sync policy + syncPolicy: + syncOptions: + - CreateNamespace=true + automated: # automated sync by default retries failed attempts 5 times with following delays between attempts ( 5s, 10s, 20s, 40s, 80s ); retry controlled using `retry` field. + prune: true # Specifies if resources should be pruned during auto-syncing ( false by default ). + selfHeal: true # Specifies if partial app sync should be executed when resources are changed only in target Kubernetes cluster and no git change detected ( false by default ). + From 270dc1d6da3a6bc7c916813718a860a690cd2cd8 Mon Sep 17 00:00:00 2001 From: talku43 Date: Thu, 16 Jul 2026 14:44:37 +0300 Subject: [PATCH 06/33] Add ApplicationSet configuration for cluster-git --- .../many-apps-many-cluster.yml | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 application-sets/my-application-sets/many-apps-many-cluster.yml diff --git a/application-sets/my-application-sets/many-apps-many-cluster.yml b/application-sets/my-application-sets/many-apps-many-cluster.yml new file mode 100644 index 0000000000..488e9e16c8 --- /dev/null +++ b/application-sets/my-application-sets/many-apps-many-cluster.yml @@ -0,0 +1,32 @@ +apiVersion: argoproj.io/v1alpha1 +kind: ApplicationSet +metadata: + name: cluster-git +spec: + generators: + # matrix 'parent' generator + - matrix: + generators: + # git generator, 'child' #1 + - git: + repoURL: https://github.com/argoproj/argo-cd.git + revision: HEAD + directories: + - path: applicationset/examples/matrix/cluster-addons/* + # cluster generator, 'child' #2 + - clusters: + selector: + matchLabels: + argocd.argoproj.io/secret-type: cluster + template: + metadata: + name: '{{path.basename}}-{{name}}' + spec: + project: '{{metadata.labels.environment}}' + source: + repoURL: https://github.com/argoproj/argo-cd.git + targetRevision: HEAD + path: '{{path}}' + destination: + server: '{{server}}' + namespace: '{{path.basename}}' From a8293fa085a1e540edc125904a71475a1c608d9b Mon Sep 17 00:00:00 2001 From: talku43 Date: Thu, 16 Jul 2026 14:50:16 +0300 Subject: [PATCH 07/33] Update application set paths and project settings --- .../my-application-sets/many-apps-many-cluster.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/application-sets/my-application-sets/many-apps-many-cluster.yml b/application-sets/my-application-sets/many-apps-many-cluster.yml index 488e9e16c8..fd9d9988e5 100644 --- a/application-sets/my-application-sets/many-apps-many-cluster.yml +++ b/application-sets/my-application-sets/many-apps-many-cluster.yml @@ -12,17 +12,14 @@ spec: repoURL: https://github.com/argoproj/argo-cd.git revision: HEAD directories: - - path: applicationset/examples/matrix/cluster-addons/* + - path: application-sets/example-apps/* # cluster generator, 'child' #2 - - clusters: - selector: - matchLabels: - argocd.argoproj.io/secret-type: cluster + - clusters: {} template: metadata: name: '{{path.basename}}-{{name}}' spec: - project: '{{metadata.labels.environment}}' + project: default source: repoURL: https://github.com/argoproj/argo-cd.git targetRevision: HEAD From e569e61066104fd8f089b6cc9d24d9e325cc6741 Mon Sep 17 00:00:00 2001 From: talku43 Date: Thu, 16 Jul 2026 14:51:58 +0300 Subject: [PATCH 08/33] Update repoURL for git generator in YAML file --- application-sets/my-application-sets/many-apps-many-cluster.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application-sets/my-application-sets/many-apps-many-cluster.yml b/application-sets/my-application-sets/many-apps-many-cluster.yml index fd9d9988e5..9f7c59197f 100644 --- a/application-sets/my-application-sets/many-apps-many-cluster.yml +++ b/application-sets/my-application-sets/many-apps-many-cluster.yml @@ -9,7 +9,7 @@ spec: generators: # git generator, 'child' #1 - git: - repoURL: https://github.com/argoproj/argo-cd.git + repoURL: https://github.com/talku43/gitops-cert-level-2-examples.git revision: HEAD directories: - path: application-sets/example-apps/* From 6afa14e431b83f0859f084b17ee14315536c7b6c Mon Sep 17 00:00:00 2001 From: talku43 Date: Thu, 16 Jul 2026 15:59:31 +0300 Subject: [PATCH 09/33] Update version.yml --- environment-promotion/envs/prod/version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment-promotion/envs/prod/version.yml b/environment-promotion/envs/prod/version.yml index 51bc5350da..0423d0fa0a 100644 --- a/environment-promotion/envs/prod/version.yml +++ b/environment-promotion/envs/prod/version.yml @@ -8,4 +8,4 @@ spec: spec: containers: - name: webserver-simple - image: docker.io/kostiscodefresh/simple-env-app:1.0 + image: docker.io/kostiscodefresh/simple-env-app:2.0 From c700b3716fcf6918d47e436870d00ec4608ae625 Mon Sep 17 00:00:00 2001 From: talku43 Date: Thu, 16 Jul 2026 16:07:56 +0300 Subject: [PATCH 10/33] Enable manual dispatch for promote workflow Add manual trigger for application promotion workflow --- .github/workflows/promote.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/promote.yml b/.github/workflows/promote.yml index 67527d90db..b00ea59213 100644 --- a/.github/workflows/promote.yml +++ b/.github/workflows/promote.yml @@ -2,6 +2,7 @@ name: Promote application + # Controls when the workflow will run on: # Allows you to run this workflow manually from the Actions tab From 0e18384ce234fa6ca5e53c4eca91bfb552250b78 Mon Sep 17 00:00:00 2001 From: talku43 Date: Thu, 16 Jul 2026 13:08:44 +0000 Subject: [PATCH 11/33] Application promotion --- environment-promotion/envs/staging/version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment-promotion/envs/staging/version.yml b/environment-promotion/envs/staging/version.yml index 0423d0fa0a..c088376339 100644 --- a/environment-promotion/envs/staging/version.yml +++ b/environment-promotion/envs/staging/version.yml @@ -8,4 +8,4 @@ spec: spec: containers: - name: webserver-simple - image: docker.io/kostiscodefresh/simple-env-app:2.0 + image: docker.io/kostiscodefresh/simple-env-app:3.0 From 30eb444bc08f926e9fced636855361d0927b25d9 Mon Sep 17 00:00:00 2001 From: talku43 Date: Thu, 16 Jul 2026 13:10:44 +0000 Subject: [PATCH 12/33] Application promotion --- environment-promotion/envs/prod/settings.yml | 4 ++-- environment-promotion/envs/prod/version.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/environment-promotion/envs/prod/settings.yml b/environment-promotion/envs/prod/settings.yml index 2b94ef8ad9..400ffc97fb 100644 --- a/environment-promotion/envs/prod/settings.yml +++ b/environment-promotion/envs/prod/settings.yml @@ -10,7 +10,7 @@ spec: - name: webserver-simple env: - name: UI_THEME - value: "dark" + value: "light" - name: CACHE_SIZE value: "1024kb" - name: PAGE_LIMIT @@ -18,4 +18,4 @@ spec: - name: SORTING value: "ascending" - name: N_BUCKETS - value: "12" + value: "24" \ No newline at end of file diff --git a/environment-promotion/envs/prod/version.yml b/environment-promotion/envs/prod/version.yml index 0423d0fa0a..c088376339 100644 --- a/environment-promotion/envs/prod/version.yml +++ b/environment-promotion/envs/prod/version.yml @@ -8,4 +8,4 @@ spec: spec: containers: - name: webserver-simple - image: docker.io/kostiscodefresh/simple-env-app:2.0 + image: docker.io/kostiscodefresh/simple-env-app:3.0 From 1bc9f9de062eedbc55cd4aa3823af41311d3791a Mon Sep 17 00:00:00 2001 From: talku43 Date: Thu, 16 Jul 2026 13:12:27 +0000 Subject: [PATCH 13/33] test --- environment-promotion/envs/qa/settings.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environment-promotion/envs/qa/settings.yml b/environment-promotion/envs/qa/settings.yml index 738a5bec3a..400ffc97fb 100644 --- a/environment-promotion/envs/qa/settings.yml +++ b/environment-promotion/envs/qa/settings.yml @@ -12,10 +12,10 @@ spec: - name: UI_THEME value: "light" - name: CACHE_SIZE - value: "2048kb" + value: "1024kb" - name: PAGE_LIMIT value: "25" - name: SORTING value: "ascending" - name: N_BUCKETS - value: "42" \ No newline at end of file + value: "24" \ No newline at end of file From 5a51e5aeed46186bee164a1ce85bc5fb5c2276ad Mon Sep 17 00:00:00 2001 From: talku43 Date: Wed, 22 Jul 2026 10:06:28 +0300 Subject: [PATCH 14/33] Update image repository URLs in always-latest.yml --- image-updater/applications/always-latest.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-updater/applications/always-latest.yml b/image-updater/applications/always-latest.yml index 6c53b84d77..a071df0d8d 100644 --- a/image-updater/applications/always-latest.yml +++ b/image-updater/applications/always-latest.yml @@ -4,13 +4,13 @@ metadata: name: always-latest01 namespace: argocd annotations: - argocd-image-updater.argoproj.io/image-list: example=ghcr.io/codefresh-contrib/gitops-cert-level-2-examples + argocd-image-updater.argoproj.io/image-list: example=ghcr.io/talku43/gitops-cert-level-2-examples argocd-image-updater.argoproj.io/example.update-strategy: latest spec: project: default source: - repoURL: https://github.com/codefresh-contrib/gitops-cert-level-2-examples.git + repoURL: https://github.com/talku43/gitops-cert-level-2-examples.git targetRevision: HEAD path: ./image-updater/example-app/envs/qa/ From 95e6ff513578483e5347a9c9e9102cb0caffbe71 Mon Sep 17 00:00:00 2001 From: talku43 Date: Wed, 22 Jul 2026 10:06:39 +0300 Subject: [PATCH 15/33] Update image repository URLs in semver.yml --- image-updater/applications/semver.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/image-updater/applications/semver.yml b/image-updater/applications/semver.yml index 6801294bb3..68fd8f85d7 100644 --- a/image-updater/applications/semver.yml +++ b/image-updater/applications/semver.yml @@ -4,12 +4,12 @@ metadata: name: follow-semver02 namespace: argocd annotations: - argocd-image-updater.argoproj.io/image-list: ghcr.io/codefresh-contrib/gitops-cert-level-2-examples:~1 + argocd-image-updater.argoproj.io/image-list: ghcr.io/talku43/gitops-cert-level-2-examples:~1 spec: project: default source: - repoURL: https://github.com/codefresh-contrib/gitops-cert-level-2-examples.git + repoURL: https://github.com/talku43/gitops-cert-level-2-examples.git targetRevision: HEAD path: ./image-updater/example-app/envs/staging/ From f51bce40cac217c042bcfc1a705de85a4b36a21a Mon Sep 17 00:00:00 2001 From: talku43 Date: Wed, 22 Jul 2026 10:19:51 +0300 Subject: [PATCH 16/33] Update deployment.yml --- image-updater/example-app/base/deployment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image-updater/example-app/base/deployment.yml b/image-updater/example-app/base/deployment.yml index 59e85e3d0f..7d30e50749 100644 --- a/image-updater/example-app/base/deployment.yml +++ b/image-updater/example-app/base/deployment.yml @@ -18,7 +18,7 @@ spec: containers: - name: webserver-simple imagePullPolicy: Always - image: ghcr.io/codefresh-contrib/gitops-cert-level-2-examples:latest + image: ghcr.io/talku43/gitops-cert-level-2-examples:latest ports: - containerPort: 8080 From 0dcc0bbea7873f06d404d57b744935e509ee4215 Mon Sep 17 00:00:00 2001 From: talku43 Date: Wed, 22 Jul 2026 10:20:15 +0300 Subject: [PATCH 17/33] Update image reference for webserver-simple --- image-updater/example-app/envs/qa/version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image-updater/example-app/envs/qa/version.yml b/image-updater/example-app/envs/qa/version.yml index afaa590368..3a1d5e7f0f 100644 --- a/image-updater/example-app/envs/qa/version.yml +++ b/image-updater/example-app/envs/qa/version.yml @@ -8,4 +8,4 @@ spec: spec: containers: - name: webserver-simple - image: ghcr.io/codefresh-contrib/gitops-cert-level-2-examples:1.0 + image: ghcr.io/talku43/gitops-cert-level-2-examples:1.0 From aa2cbb6bc863d95f0a263220c899dd42440bcc8d Mon Sep 17 00:00:00 2001 From: talku43 Date: Wed, 22 Jul 2026 10:20:39 +0300 Subject: [PATCH 18/33] Update image reference in version.yml --- image-updater/example-app/envs/staging/version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image-updater/example-app/envs/staging/version.yml b/image-updater/example-app/envs/staging/version.yml index afaa590368..3a1d5e7f0f 100644 --- a/image-updater/example-app/envs/staging/version.yml +++ b/image-updater/example-app/envs/staging/version.yml @@ -8,4 +8,4 @@ spec: spec: containers: - name: webserver-simple - image: ghcr.io/codefresh-contrib/gitops-cert-level-2-examples:1.0 + image: ghcr.io/talku43/gitops-cert-level-2-examples:1.0 From 7a602dcdcbcba60daf0f4400974b4b43724e6592 Mon Sep 17 00:00:00 2001 From: talku43 Date: Wed, 22 Jul 2026 10:59:13 +0300 Subject: [PATCH 19/33] Add PostSync hook annotation to cleanup job --- sync-hooks-waves/03-postsync-cleanup/cleanup.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sync-hooks-waves/03-postsync-cleanup/cleanup.yml b/sync-hooks-waves/03-postsync-cleanup/cleanup.yml index 3a6550aa12..69b04f5791 100644 --- a/sync-hooks-waves/03-postsync-cleanup/cleanup.yml +++ b/sync-hooks-waves/03-postsync-cleanup/cleanup.yml @@ -5,8 +5,8 @@ metadata: generateName: cleanup-after-sync- labels: codefresh.io/cert: cleanup-job - #annotations: - #argocd.argoproj.io/hook: PostSync + annotations: + argocd.argoproj.io/hook: PostSync spec: template: spec: From d067dd1d9ecb4e39b1b95d469941bc2f0041c3ed Mon Sep 17 00:00:00 2001 From: talku43 Date: Wed, 22 Jul 2026 11:08:52 +0300 Subject: [PATCH 20/33] Add sync wave annotation to cleanup job Add Argo CD sync wave annotation to cleanup job --- sync-hooks-waves/06-waves-and-hooks/cleanup.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sync-hooks-waves/06-waves-and-hooks/cleanup.yml b/sync-hooks-waves/06-waves-and-hooks/cleanup.yml index f263b7f926..1ef4609f8b 100644 --- a/sync-hooks-waves/06-waves-and-hooks/cleanup.yml +++ b/sync-hooks-waves/06-waves-and-hooks/cleanup.yml @@ -5,6 +5,8 @@ metadata: generateName: cleanup-after-sync- labels: codefresh.io/cert: cleanup-job + annotations: + argocd.argoproj.io/sync-wave: "-20" spec: template: spec: From 6b7e6505493f16c08a413892d0b452a38321d423 Mon Sep 17 00:00:00 2001 From: talku43 Date: Wed, 22 Jul 2026 11:09:04 +0300 Subject: [PATCH 21/33] Update cleanup.yml --- sync-hooks-waves/06-waves-and-hooks/cleanup.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sync-hooks-waves/06-waves-and-hooks/cleanup.yml b/sync-hooks-waves/06-waves-and-hooks/cleanup.yml index 1ef4609f8b..c1ed8ec354 100644 --- a/sync-hooks-waves/06-waves-and-hooks/cleanup.yml +++ b/sync-hooks-waves/06-waves-and-hooks/cleanup.yml @@ -6,7 +6,7 @@ metadata: labels: codefresh.io/cert: cleanup-job annotations: - argocd.argoproj.io/sync-wave: "-20" + argocd.argoproj.io/sync-wave: "20" spec: template: spec: From f5933c881f535245c0b703e5729f9f555edd76bb Mon Sep 17 00:00:00 2001 From: talku43 Date: Wed, 22 Jul 2026 11:10:05 +0300 Subject: [PATCH 22/33] Update cleanup.yml --- sync-hooks-waves/06-waves-and-hooks/cleanup.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sync-hooks-waves/06-waves-and-hooks/cleanup.yml b/sync-hooks-waves/06-waves-and-hooks/cleanup.yml index c1ed8ec354..8b300225a7 100644 --- a/sync-hooks-waves/06-waves-and-hooks/cleanup.yml +++ b/sync-hooks-waves/06-waves-and-hooks/cleanup.yml @@ -6,7 +6,8 @@ metadata: labels: codefresh.io/cert: cleanup-job annotations: - argocd.argoproj.io/sync-wave: "20" + argocd.argoproj.io/sync-wave: "20" + argocd.argoproj.io/hook: PostSync spec: template: spec: From 5a47ab5d95f9489ace1a157728057f9373562ddd Mon Sep 17 00:00:00 2001 From: talku43 Date: Wed, 22 Jul 2026 11:10:32 +0300 Subject: [PATCH 23/33] Update db-upgrade.yml --- sync-hooks-waves/06-waves-and-hooks/db-upgrade.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sync-hooks-waves/06-waves-and-hooks/db-upgrade.yml b/sync-hooks-waves/06-waves-and-hooks/db-upgrade.yml index eccde62f08..f43de87696 100644 --- a/sync-hooks-waves/06-waves-and-hooks/db-upgrade.yml +++ b/sync-hooks-waves/06-waves-and-hooks/db-upgrade.yml @@ -5,6 +5,9 @@ metadata: generateName: my-db-upgrade- labels: codefresh.io/cert: db-job + annotations: + argocd.argoproj.io/sync-wave: "10" + argocd.argoproj.io/hook: PreSync spec: template: spec: From c8ce853266126ff726b91fbcf3615ac6dfcb5cdd Mon Sep 17 00:00:00 2001 From: talku43 Date: Wed, 22 Jul 2026 11:10:58 +0300 Subject: [PATCH 24/33] Add annotations for ArgoCD sync and hook --- sync-hooks-waves/06-waves-and-hooks/disable-alerts.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sync-hooks-waves/06-waves-and-hooks/disable-alerts.yml b/sync-hooks-waves/06-waves-and-hooks/disable-alerts.yml index f3e813b096..ac594a6ac1 100644 --- a/sync-hooks-waves/06-waves-and-hooks/disable-alerts.yml +++ b/sync-hooks-waves/06-waves-and-hooks/disable-alerts.yml @@ -5,6 +5,9 @@ metadata: generateName: disable-alerts- labels: codefresh.io/cert: disable-job + annotations: + argocd.argoproj.io/sync-wave: "20" + argocd.argoproj.io/hook: PreSync spec: template: spec: From e98dbef3ea63d509e9d4db9c29980a44855e0da2 Mon Sep 17 00:00:00 2001 From: talku43 Date: Wed, 22 Jul 2026 11:11:18 +0300 Subject: [PATCH 25/33] Update enable-alerts.yml --- sync-hooks-waves/06-waves-and-hooks/enable-alerts.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sync-hooks-waves/06-waves-and-hooks/enable-alerts.yml b/sync-hooks-waves/06-waves-and-hooks/enable-alerts.yml index 61a994f429..a03aa4ca76 100644 --- a/sync-hooks-waves/06-waves-and-hooks/enable-alerts.yml +++ b/sync-hooks-waves/06-waves-and-hooks/enable-alerts.yml @@ -5,6 +5,9 @@ metadata: generateName: enable-alerts- labels: codefresh.io/cert: enable-job + annotations: + argocd.argoproj.io/sync-wave: "20" + argocd.argoproj.io/hook: PostSync spec: template: spec: From 045e10d198096ecb01626cfefc5b7cded38e55cb Mon Sep 17 00:00:00 2001 From: talku43 Date: Wed, 22 Jul 2026 11:12:04 +0300 Subject: [PATCH 26/33] Update grafana-notify.yml --- sync-hooks-waves/06-waves-and-hooks/grafana-notify.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sync-hooks-waves/06-waves-and-hooks/grafana-notify.yml b/sync-hooks-waves/06-waves-and-hooks/grafana-notify.yml index 36c063f3fd..92088db1be 100644 --- a/sync-hooks-waves/06-waves-and-hooks/grafana-notify.yml +++ b/sync-hooks-waves/06-waves-and-hooks/grafana-notify.yml @@ -5,6 +5,9 @@ metadata: generateName: grafana-notify- labels: codefresh.io/cert: grafana-job + annotations: + argocd.argoproj.io/sync-wave: "10" + argocd.argoproj.io/hook: Sync spec: template: spec: From bf2c248f8d3b965ffbd24cbcee47dff157bb06c7 Mon Sep 17 00:00:00 2001 From: talku43 Date: Wed, 22 Jul 2026 11:12:34 +0300 Subject: [PATCH 27/33] Add annotations for ArgoCD sync and hook --- sync-hooks-waves/06-waves-and-hooks/slack-notify.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sync-hooks-waves/06-waves-and-hooks/slack-notify.yml b/sync-hooks-waves/06-waves-and-hooks/slack-notify.yml index 799afa765a..f57b024570 100644 --- a/sync-hooks-waves/06-waves-and-hooks/slack-notify.yml +++ b/sync-hooks-waves/06-waves-and-hooks/slack-notify.yml @@ -5,6 +5,9 @@ metadata: generateName: slack-notify- labels: codefresh.io/cert: slack-job + annotations: + argocd.argoproj.io/sync-wave: "30" + argocd.argoproj.io/hook: PostSync spec: template: spec: From 935b71e82148b9ee185110c3b6ed8a0cf2fa2f23 Mon Sep 17 00:00:00 2001 From: talku43 Date: Wed, 22 Jul 2026 11:13:31 +0300 Subject: [PATCH 28/33] Update smoke-tests.yml --- sync-hooks-waves/06-waves-and-hooks/smoke-tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sync-hooks-waves/06-waves-and-hooks/smoke-tests.yml b/sync-hooks-waves/06-waves-and-hooks/smoke-tests.yml index f32dbb46c3..dc05e62562 100644 --- a/sync-hooks-waves/06-waves-and-hooks/smoke-tests.yml +++ b/sync-hooks-waves/06-waves-and-hooks/smoke-tests.yml @@ -5,6 +5,9 @@ metadata: generateName: smoke-tests- labels: codefresh.io/cert: smoke-job + annotations: + argocd.argoproj.io/sync-wave: "10" + argocd.argoproj.io/hook: PostSync spec: template: spec: From 079db650aea2987df3b68faa30208703546c9f8d Mon Sep 17 00:00:00 2001 From: talku43 Date: Wed, 22 Jul 2026 11:13:41 +0300 Subject: [PATCH 29/33] Update grafana-notify.yml --- sync-hooks-waves/06-waves-and-hooks/grafana-notify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sync-hooks-waves/06-waves-and-hooks/grafana-notify.yml b/sync-hooks-waves/06-waves-and-hooks/grafana-notify.yml index 92088db1be..4bbb0f3b9a 100644 --- a/sync-hooks-waves/06-waves-and-hooks/grafana-notify.yml +++ b/sync-hooks-waves/06-waves-and-hooks/grafana-notify.yml @@ -6,7 +6,7 @@ metadata: labels: codefresh.io/cert: grafana-job annotations: - argocd.argoproj.io/sync-wave: "10" + argocd.argoproj.io/sync-wave: "-10" argocd.argoproj.io/hook: Sync spec: template: From ebd3a1113cafb48e31221f29a654322a59bfd128 Mon Sep 17 00:00:00 2001 From: talku43 Date: Thu, 23 Jul 2026 12:23:36 +0300 Subject: [PATCH 30/33] Add ignoreDifferences to with-hpa.yml Add ignoreDifferences for Deployment replicas in HPA config --- custom-diff/applications/with-hpa.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/custom-diff/applications/with-hpa.yml b/custom-diff/applications/with-hpa.yml index d5fd00b34d..58766511f2 100644 --- a/custom-diff/applications/with-hpa.yml +++ b/custom-diff/applications/with-hpa.yml @@ -21,4 +21,8 @@ spec: syncPolicy: syncOptions: - CreateNamespace=true - + ignoreDifferences: + - group: apps + kind: Deployment + jsonPointers: + - /spec/replicas From 055b6d04b55946cdc88593238cf9071aac9aa16e Mon Sep 17 00:00:00 2001 From: talku43 Date: Thu, 23 Jul 2026 12:25:17 +0300 Subject: [PATCH 31/33] Update with-hpa.yml --- custom-diff/applications/with-hpa.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom-diff/applications/with-hpa.yml b/custom-diff/applications/with-hpa.yml index 58766511f2..81d4600541 100644 --- a/custom-diff/applications/with-hpa.yml +++ b/custom-diff/applications/with-hpa.yml @@ -9,7 +9,7 @@ spec: project: default source: - repoURL: https://github.com/codefresh-contrib/gitops-cert-level-2-examples.git + repoURL: https://github.com/talku43/gitops-cert-level-2-examples.git targetRevision: HEAD path: ./custom-diff/01-with-hpa From b94c81d07feb28f9140c9cf378b1ed80d13d1fd3 Mon Sep 17 00:00:00 2001 From: talku43 Date: Thu, 23 Jul 2026 12:25:28 +0300 Subject: [PATCH 32/33] Update external-helm-app.yml --- custom-diff/applications/external-helm-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom-diff/applications/external-helm-app.yml b/custom-diff/applications/external-helm-app.yml index d7b727ff92..c7e338bd70 100644 --- a/custom-diff/applications/external-helm-app.yml +++ b/custom-diff/applications/external-helm-app.yml @@ -9,7 +9,7 @@ spec: project: default source: - repoURL: https://github.com/codefresh-contrib/gitops-cert-level-2-examples.git + repoURL: https://github.com/talku43/gitops-cert-level-2-examples.git targetRevision: HEAD path: ./custom-diff/02-external-app From b75e3652fa68eab476bc8f39d5516f01bb8b6701 Mon Sep 17 00:00:00 2001 From: talku43 Date: Thu, 23 Jul 2026 12:33:15 +0300 Subject: [PATCH 33/33] Update external-helm-app.yml with ignoreDifferences Added ignoreDifferences configuration for Deployment and Secret. --- custom-diff/applications/external-helm-app.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/custom-diff/applications/external-helm-app.yml b/custom-diff/applications/external-helm-app.yml index c7e338bd70..bb2470f779 100644 --- a/custom-diff/applications/external-helm-app.yml +++ b/custom-diff/applications/external-helm-app.yml @@ -20,5 +20,13 @@ spec: # Sync policy syncPolicy: syncOptions: - - CreateNamespace=true + - CreateNamespace=true + ignoreDifferences: + - group: apps + kind: Deployment + jsonPointers: + - /metadata/annotations/creation + - group: Secret + jsonPointers: + - /data/my-password