From 51ba4fdb29d9727e71bbe1f0e9f6e30365a55a60 Mon Sep 17 00:00:00 2001 From: xuzhu-591 <zhuxu591@163.com> Date: Wed, 26 Jul 2023 12:17:56 +0800 Subject: [PATCH 1/4] feat: expose flag Signed-off-by: xuzhu-591 <zhuxu591@163.com> --- charts/tektoncd/Chart.yaml | 2 +- charts/tektoncd/templates/tekton-pipelines/release.yaml | 2 +- charts/tektoncd/values.yaml | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/charts/tektoncd/Chart.yaml b/charts/tektoncd/Chart.yaml index 80234a0..38cb795 100644 --- a/charts/tektoncd/Chart.yaml +++ b/charts/tektoncd/Chart.yaml @@ -3,7 +3,7 @@ name: tektoncd type: application -version: 2.1.2 +version: 2.1.3 appVersion: 0.28.0 diff --git a/charts/tektoncd/templates/tekton-pipelines/release.yaml b/charts/tektoncd/templates/tekton-pipelines/release.yaml index b0d8667..62d3b0d 100644 --- a/charts/tektoncd/templates/tekton-pipelines/release.yaml +++ b/charts/tektoncd/templates/tekton-pipelines/release.yaml @@ -818,7 +818,7 @@ data: enable-api-fields: "stable" # Setting this flag to "true" scopes when expressions to guard a Task only # instead of a Task and its dependent Tasks. - scope-when-expressions-to-task: "false" + scope-when-expressions-to-task: "{{ .Values.scopeWhenExpressionsToTask }}" --- # Copyright 2021 The Tekton Authors diff --git a/charts/tektoncd/values.yaml b/charts/tektoncd/values.yaml index bc3b19b..9bf3d82 100644 --- a/charts/tektoncd/values.yaml +++ b/charts/tektoncd/values.yaml @@ -83,3 +83,5 @@ configDefaults: # but that a TaskRun does not explicitly provide. # default-task-run-workspace-binding: | # emptyDir: {} + +scopeWhenExpressionsToTask: "true" From 9b99563937ca7d6fb78e1161f5371edb30127d8f Mon Sep 17 00:00:00 2001 From: xuzhu-591 <zhuxu591@163.com> Date: Wed, 26 Jul 2023 17:49:11 +0800 Subject: [PATCH 2/4] fix: tekton pipeline resources Signed-off-by: xuzhu-591 <zhuxu591@163.com> --- charts/tektoncd/templates/tekton-pipelines/release.yaml | 8 +++++++- charts/tektoncd/values.yaml | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/charts/tektoncd/templates/tekton-pipelines/release.yaml b/charts/tektoncd/templates/tekton-pipelines/release.yaml index 62d3b0d..d4a7624 100644 --- a/charts/tektoncd/templates/tekton-pipelines/release.yaml +++ b/charts/tektoncd/templates/tekton-pipelines/release.yaml @@ -1105,11 +1105,17 @@ spec: "-shell-image", "{{ .Values.tektonPipelineController.shellImage }}", # for script mode to work with windows we need a powershell image # pinning to nanoserver tag as of July 15 2021 - "-shell-image-win", "{{ .Values.tektonPipelineController.shellImageWin }}", + "-shell-image-win", "{{ .Values.tektonPipelineController.shellImageWin }}" # Experimental. Uncomment below to disable TaskRun and PipelineRun # reconcilers' built-in taskRef and pipelineRef resolution procedures. # "-experimental-disable-in-tree-resolution", + {{- range .Values.tektonPipelineController.extraArgs }} + , {{ . | quote }} + {{- end }} ] + {{- with .Values.tektonPipelineController.resources }} + resources: {{ toYaml . | nindent 12 }} + {{- end }} volumeMounts: - name: config-logging mountPath: /etc/config-logging diff --git a/charts/tektoncd/values.yaml b/charts/tektoncd/values.yaml index 9bf3d82..b4b7f06 100644 --- a/charts/tektoncd/values.yaml +++ b/charts/tektoncd/values.yaml @@ -17,6 +17,8 @@ tektonPipelineController: gsutilImage: gcr.io/google.com/cloudsdktool/cloud-sdk@sha256:27b2c22bf259d9bc1a291e99c63791ba0c27a04d2db0a43241ba0f1f20f4067f shellImage: gcr.io/distroless/base:debug shellImageWin: mcr.microsoft.com/powershell:nanoserver@sha256:b6d5ff841b78bdf2dfed7550000fd4f3437385b8fa686ec0f010be24777654d6 + extraArgs: [] + resources: {} tektonPipelineWebhook: image: gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/webhook:v0.28.0@sha256:f19dd16303ff8a8d55d706db5c8f8db593ba597684888bb15e70420fc4824103 From e1952a4f57f61ec3e583f16a00e4a126536967d5 Mon Sep 17 00:00:00 2001 From: xuzhu-591 <zhuxu591@163.com> Date: Fri, 28 Jul 2023 11:06:17 +0800 Subject: [PATCH 3/4] fix: review Signed-off-by: xuzhu-591 <zhuxu591@163.com> --- charts/tektoncd/templates/tekton-pipelines/release.yaml | 2 +- charts/tektoncd/values.yaml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/charts/tektoncd/templates/tekton-pipelines/release.yaml b/charts/tektoncd/templates/tekton-pipelines/release.yaml index d4a7624..76f0984 100644 --- a/charts/tektoncd/templates/tekton-pipelines/release.yaml +++ b/charts/tektoncd/templates/tekton-pipelines/release.yaml @@ -818,7 +818,7 @@ data: enable-api-fields: "stable" # Setting this flag to "true" scopes when expressions to guard a Task only # instead of a Task and its dependent Tasks. - scope-when-expressions-to-task: "{{ .Values.scopeWhenExpressionsToTask }}" + scope-when-expressions-to-task: "{{ .Values.featureFlags.scopeWhenExpressionsToTask }}" --- # Copyright 2021 The Tekton Authors diff --git a/charts/tektoncd/values.yaml b/charts/tektoncd/values.yaml index b4b7f06..9e4184c 100644 --- a/charts/tektoncd/values.yaml +++ b/charts/tektoncd/values.yaml @@ -86,4 +86,5 @@ configDefaults: # default-task-run-workspace-binding: | # emptyDir: {} -scopeWhenExpressionsToTask: "true" +featureFlags: + scopeWhenExpressionsToTask: "true" From 7bea4e88841534e90d168c579dd948ff574df9bc Mon Sep 17 00:00:00 2001 From: xuzhu-591 <zhuxu591@163.com> Date: Fri, 28 Jul 2023 11:24:23 +0800 Subject: [PATCH 4/4] bump horizon to 2.2.10 Signed-off-by: xuzhu-591 <zhuxu591@163.com> --- charts/horizon/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/horizon/Chart.yaml b/charts/horizon/Chart.yaml index 2f8d3ad..adbe6bb 100644 --- a/charts/horizon/Chart.yaml +++ b/charts/horizon/Chart.yaml @@ -4,7 +4,7 @@ description: A CICD DevOps Platform type: application -version: 2.2.9 +version: 2.2.10 appVersion: v2.5.0 dependencies: - name: common