feat: add argocd sync waves to ensure tasks and pipelines are created in the right order (#2117)

Author: CasLubbers

charts/team-ns/templates/builds/buildpack.yaml

@@ -8,6 +8,8 @@ metadata:
   name: buildpacks-build-{{ .name }}
   annotations:
     sidecar.istio.io/inject: "false"
+    # ArgoCD sync wave annotation to ensure it's applied first
+    argocd.argoproj.io/sync-wave: "-2"
   labels: {{- include "team-ns.chart-labels" $ | nindent 4 }}
 spec:
   workspaces:
@@ -87,6 +89,8 @@ apiVersion: triggers.tekton.dev/v1alpha1
 kind: TriggerTemplate
 metadata:
   name: trigger-template-{{ .name }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "-1"
   labels: {{- include "team-ns.chart-labels" $ | nindent 4 }}
 spec:
   resourcetemplates:
@@ -146,6 +150,8 @@ metadata:
   annotations:
     sidecar.istio.io/inject: "false"
     argocd.argoproj.io/compare-options: IgnoreExtraneous
+    # ArgoCD sync wave annotation to ensure it's applied after the pipeline
+    argocd.argoproj.io/sync-wave: "5"
   labels: {{- include "team-ns.chart-labels" $ | nindent 4 }}
 spec:
   pipelineRef:
@@ -190,6 +196,8 @@ spec:
 apiVersion: triggers.tekton.dev/v1alpha1
 kind: TriggerBinding
 metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: "-1"
   name: gitea-triggerbinding-{{ .name }}
   labels: {{- include "team-ns.chart-labels" $ | nindent 4 }}
 spec:
@@ -203,6 +211,8 @@ apiVersion: triggers.tekton.dev/v1alpha1
 kind: EventListener
 metadata:
   name: gitea-webhook-{{ .name }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "-1"
   labels:
     tekton.dev/pipeline: buildpacks-build-{{ .name }}
     {{- include "team-ns.chart-labels" $ | nindent 4 }}
@@ -218,4 +228,4 @@ spec:
 ---
 {{- end }}
 {{- end }}
-{{- end }}
+{{- end }}

charts/team-ns/templates/builds/docker.yaml

@@ -9,6 +9,8 @@ metadata:
   name: docker-build-{{ .name }}
   annotations:
     sidecar.istio.io/inject: "false"
+    # ArgoCD sync wave annotation to ensure it's applied first
+    argocd.argoproj.io/sync-wave: "-2" 
   labels: {{- include "team-ns.chart-labels" $ | nindent 4 }}
 spec:
   workspaces:
@@ -85,6 +87,8 @@ apiVersion: triggers.tekton.dev/v1alpha1
 kind: TriggerTemplate
 metadata:
   name: trigger-template-{{ .name }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "-1"
   labels: {{- include "team-ns.chart-labels" $ | nindent 4 }}
 spec:
   resourcetemplates:
@@ -137,13 +141,16 @@ spec:
             secretName: harbor-pushsecret-builds
 ---
 {{- else }}
+# Create PipelineRun with a higher sync wave to ensure it's created after the Pipeline
 apiVersion: tekton.dev/v1
 kind: PipelineRun
 metadata:
   name: docker-build-{{ .name }}
   annotations:
     sidecar.istio.io/inject: "false"
     argocd.argoproj.io/compare-options: IgnoreExtraneous
+    # ArgoCD sync wave annotation to ensure it's applied after the pipeline
+    argocd.argoproj.io/sync-wave: "5"
   labels: {{- include "team-ns.chart-labels" $ | nindent 4 }}
 spec:
   pipelineRef:
@@ -189,6 +196,8 @@ apiVersion: triggers.tekton.dev/v1alpha1
 kind: TriggerBinding
 metadata:
   name: gitea-triggerbinding-{{ .name }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "-1"
   labels: {{- include "team-ns.chart-labels" $ | nindent 4 }}
 spec:
   params:
@@ -201,6 +210,8 @@ apiVersion: triggers.tekton.dev/v1alpha1
 kind: EventListener
 metadata:
   name: gitea-webhook-{{ .name }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "-1" 
   labels:
     tekton.dev/pipeline: docker-build-{{ .name }}
     {{- include "team-ns.chart-labels" $ | nindent 4 }}
@@ -216,4 +227,4 @@ spec:
 ---
 {{- end }}
 {{- end }}
-{{- end }}
+{{- end }}

charts/team-ns/templates/tekton-tasks/buildpacks.yaml

@@ -6,6 +6,8 @@ metadata:
   labels:
     app.kubernetes.io/version: "0.6"
   annotations:
+    # Use ArgoCD sync wave annotation to ensure tasks are created first
+    argocd.argoproj.io/sync-wave: "-5"
     tekton.dev/categories: Image Build
     tekton.dev/pipelines.minVersion: "0.17.0"
     tekton.dev/tags: image-build

charts/team-ns/templates/tekton-tasks/git-clone.yaml

@@ -3,14 +3,16 @@ apiVersion: tekton.dev/v1
 kind: Task
 metadata:
   name: git-clone
-  labels:
-    app.kubernetes.io/version: "0.9"
   annotations:
+    # Use ArgoCD sync wave annotation to ensure tasks are created first
+    argocd.argoproj.io/sync-wave: "-5"
     tekton.dev/pipelines.minVersion: "0.38.0"
     tekton.dev/categories: Git
     tekton.dev/tags: git
     tekton.dev/displayName: "git clone"
     tekton.dev/platforms: "linux/amd64,linux/s390x,linux/ppc64le,linux/arm64"
+  labels:
+    app.kubernetes.io/version: "0.9"
 spec:
   stepTemplate:
     computeResources:

charts/team-ns/templates/tekton-tasks/grype.yaml

@@ -3,14 +3,16 @@ apiVersion: tekton.dev/v1
 kind: Task
 metadata:
   name: grype
-  labels:
-    app.kubernetes.io/version: "0.1"
   annotations:
+    # Use ArgoCD sync wave annotation to ensure tasks are created first
+    argocd.argoproj.io/sync-wave: "-5"
     tekton.dev/pipelines.minVersion: "0.12.1"
     tekton.dev/categories: Security
     tekton.dev/tags: CLI, grype
     tekton.dev/displayName: "grype"
     tekton.dev/platforms: "linux/amd64,linux/arm64,linux/ppc64le,linux/390x"
+  labels:
+    app.kubernetes.io/version: "0.1"
 spec:
   stepTemplate:
     computeResources:

charts/team-ns/templates/tekton-tasks/kaniko.yaml

@@ -6,6 +6,8 @@ metadata:
   labels:
     app.kubernetes.io/version: "0.6"
   annotations:
+    # ArgoCD sync wave annotation to ensure it's applied first
+    argocd.argoproj.io/sync-wave: "-5"
     tekton.dev/pipelines.minVersion: "0.17.0"
     tekton.dev/categories: Image Build
     tekton.dev/tags: image-build