From 15e6a20144dbde60b6e79bf6e8e66d78ca0b8cad Mon Sep 17 00:00:00 2001 From: Matthias Erll Date: Wed, 27 May 2026 12:06:59 +0200 Subject: [PATCH 1/5] feat: remove pvc after pipelinerun --- charts/team-ns/templates/builds/buildpack.yaml | 2 ++ charts/team-ns/templates/builds/docker.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/charts/team-ns/templates/builds/buildpack.yaml b/charts/team-ns/templates/builds/buildpack.yaml index 56f9188ee1..ec57a6dd3e 100644 --- a/charts/team-ns/templates/builds/buildpack.yaml +++ b/charts/team-ns/templates/builds/buildpack.yaml @@ -104,6 +104,7 @@ spec: annotations: sidecar.istio.io/inject: "false" argocd.argoproj.io/compare-options: IgnoreExtraneous + tekton.dev/auto-cleanup-pvc: "true" spec: pipelineRef: name: buildpacks-build-{{ .name }} @@ -153,6 +154,7 @@ metadata: argocd.argoproj.io/compare-options: IgnoreExtraneous # ArgoCD sync wave annotation to ensure it's applied after the pipeline argocd.argoproj.io/sync-wave: "5" + tekton.dev/auto-cleanup-pvc: "true" labels: {{- include "team-ns.chart-labels" $ | nindent 4 }} spec: pipelineRef: diff --git a/charts/team-ns/templates/builds/docker.yaml b/charts/team-ns/templates/builds/docker.yaml index e9389040ea..51c0a6c9f8 100644 --- a/charts/team-ns/templates/builds/docker.yaml +++ b/charts/team-ns/templates/builds/docker.yaml @@ -103,6 +103,7 @@ spec: annotations: sidecar.istio.io/inject: "false" argocd.argoproj.io/compare-options: IgnoreExtraneous + tekton.dev/auto-cleanup-pvc: "true" spec: pipelineRef: name: docker-build-{{ .name }} @@ -153,6 +154,7 @@ metadata: argocd.argoproj.io/compare-options: IgnoreExtraneous # ArgoCD sync wave annotation to ensure it's applied after the pipeline argocd.argoproj.io/sync-wave: "5" + tekton.dev/auto-cleanup-pvc: "true" labels: {{- include "team-ns.chart-labels" $ | nindent 4 }} spec: pipelineRef: From 2bfac1a3a26b550811307364bda5f477c06b59b7 Mon Sep 17 00:00:00 2001 From: Matthias Erll Date: Wed, 27 May 2026 13:43:35 +0200 Subject: [PATCH 2/5] chore: move istio sidecar exemption to label --- charts/team-ns/templates/builds/buildpack.yaml | 7 ++++--- charts/team-ns/templates/builds/docker.yaml | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/charts/team-ns/templates/builds/buildpack.yaml b/charts/team-ns/templates/builds/buildpack.yaml index ec57a6dd3e..523f42a0df 100644 --- a/charts/team-ns/templates/builds/buildpack.yaml +++ b/charts/team-ns/templates/builds/buildpack.yaml @@ -100,9 +100,9 @@ spec: generateName: buildpacks-build-{{ .name }}- labels: tekton.dev/pipeline: buildpacks-build-{{ .name }} + sidecar.istio.io/inject: "false" {{- include "team-ns.chart-labels" $ | nindent 10 }} annotations: - sidecar.istio.io/inject: "false" argocd.argoproj.io/compare-options: IgnoreExtraneous tekton.dev/auto-cleanup-pvc: "true" spec: @@ -150,12 +150,13 @@ kind: PipelineRun metadata: name: buildpacks-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" tekton.dev/auto-cleanup-pvc: "true" - labels: {{- include "team-ns.chart-labels" $ | nindent 4 }} + labels: + sidecar.istio.io/inject: "false" + {{- include "team-ns.chart-labels" $ | nindent 4 }} spec: pipelineRef: name: buildpacks-build-{{ .name }} diff --git a/charts/team-ns/templates/builds/docker.yaml b/charts/team-ns/templates/builds/docker.yaml index 51c0a6c9f8..34507eaba4 100644 --- a/charts/team-ns/templates/builds/docker.yaml +++ b/charts/team-ns/templates/builds/docker.yaml @@ -99,9 +99,9 @@ spec: generateName: docker-trigger-build-{{ .name }}- labels: tekton.dev/pipeline: docker-build-{{ .name }} + sidecar.istio.io/inject: "false" {{- include "team-ns.chart-labels" $ | nindent 10 }} annotations: - sidecar.istio.io/inject: "false" argocd.argoproj.io/compare-options: IgnoreExtraneous tekton.dev/auto-cleanup-pvc: "true" spec: @@ -150,12 +150,13 @@ 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" tekton.dev/auto-cleanup-pvc: "true" - labels: {{- include "team-ns.chart-labels" $ | nindent 4 }} + labels: + sidecar.istio.io/inject: "false" + {{- include "team-ns.chart-labels" $ | nindent 4 }} spec: pipelineRef: name: docker-build-{{ .name }} From 8d031ac063408a8592bdbc3f4e8c48437aeafa80 Mon Sep 17 00:00:00 2001 From: Matthias Erll Date: Wed, 27 May 2026 13:57:30 +0200 Subject: [PATCH 3/5] feat: do not inject istio into affinity assistant --- values/tekton-pipelines/tekton-pipelines.gotmpl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/values/tekton-pipelines/tekton-pipelines.gotmpl b/values/tekton-pipelines/tekton-pipelines.gotmpl index 3696c582e4..4c6530dca2 100644 --- a/values/tekton-pipelines/tekton-pipelines.gotmpl +++ b/values/tekton-pipelines/tekton-pipelines.gotmpl @@ -37,3 +37,6 @@ webhook: configDefaults: default-pod-template: | priorityClassName: tekton-low + default-affinity-assistant-pod-template: | + labels: + sidecar.istio.io/inject: "false" From 936cd9a04cdd562497aa25530c46ddc13d400353 Mon Sep 17 00:00:00 2001 From: Matthias Erll Date: Wed, 27 May 2026 15:33:35 +0200 Subject: [PATCH 4/5] test: reattempt push From fe18a7a56842dab96a56e012d00e8523e06e0a41 Mon Sep 17 00:00:00 2001 From: Matthias Erll Date: Thu, 28 May 2026 12:15:47 +0200 Subject: [PATCH 5/5] revert: remove label default without effect --- values/tekton-pipelines/tekton-pipelines.gotmpl | 3 --- 1 file changed, 3 deletions(-) diff --git a/values/tekton-pipelines/tekton-pipelines.gotmpl b/values/tekton-pipelines/tekton-pipelines.gotmpl index 4c6530dca2..3696c582e4 100644 --- a/values/tekton-pipelines/tekton-pipelines.gotmpl +++ b/values/tekton-pipelines/tekton-pipelines.gotmpl @@ -37,6 +37,3 @@ webhook: configDefaults: default-pod-template: | priorityClassName: tekton-low - default-affinity-assistant-pod-template: | - labels: - sidecar.istio.io/inject: "false"