From 88b93f5df5e89a26207ec68987b429124632ffd1 Mon Sep 17 00:00:00 2001 From: cmorinupgrade Date: Fri, 25 Jul 2025 10:21:43 -0400 Subject: [PATCH 1/4] add additionalEnvs capability to operator deployment --- charts/tekton-operator/templates/deployment.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/charts/tekton-operator/templates/deployment.yaml b/charts/tekton-operator/templates/deployment.yaml index 336b5aaa93..333cf5da86 100644 --- a/charts/tekton-operator/templates/deployment.yaml +++ b/charts/tekton-operator/templates/deployment.yaml @@ -66,6 +66,10 @@ spec: {{- end }} - name: CONFIG_OBSERVABILITY_NAME value: {{ include "tekton-operator.fullname" . }}-observability + {{- range .Values.additionalEnvs }} + - name: {{ .name }} + value: {{ .value }} + {{- end }} args: - "-controllers" - {{ .Values.controllers | default "tektonconfig,tektonpipeline,tektontrigger,tektonhub,tektonchain,tektonresult,tektondashboard,manualapprovalgate,tektonpruner" | quote }} From 205694d0fa4b8b1931e18bfb6fe079558078d5e0 Mon Sep 17 00:00:00 2001 From: cmorinupgrade Date: Tue, 29 Jul 2025 08:15:24 -0400 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=94=A7=20fix:=20reorganize=20addition?= =?UTF-8?q?alEnvs=20under=20operator=20section=20and=20add=20value=20quoti?= =?UTF-8?q?ng?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Move additionalEnvs configuration from root to operator section in values.yaml - Update deployment template to reference operator.additionalEnvs - Add quote wrapping for environment variable values to handle special characters - Add descriptive comment for additionalEnvs configuration --- charts/tekton-operator/templates/deployment.yaml | 4 ++-- charts/tekton-operator/values.yaml | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/charts/tekton-operator/templates/deployment.yaml b/charts/tekton-operator/templates/deployment.yaml index 333cf5da86..ad78827d9f 100644 --- a/charts/tekton-operator/templates/deployment.yaml +++ b/charts/tekton-operator/templates/deployment.yaml @@ -66,9 +66,9 @@ spec: {{- end }} - name: CONFIG_OBSERVABILITY_NAME value: {{ include "tekton-operator.fullname" . }}-observability - {{- range .Values.additionalEnvs }} + {{- range .Values.operator.additionalEnvs }} - name: {{ .name }} - value: {{ .value }} + value: {{ .value | quote }} {{- end }} args: - "-controllers" diff --git a/charts/tekton-operator/values.yaml b/charts/tekton-operator/values.yaml index 0a62095d7c..1bf5518c34 100644 --- a/charts/tekton-operator/values.yaml +++ b/charts/tekton-operator/values.yaml @@ -36,6 +36,8 @@ operator: pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. tag: "" + # Additional environment variables for the tekton-operator-lifecycle container + additionalEnvs: [] autoInstallComponents: true # The namespace in which Tekton components should be deployed # Defaults to "tekton-pipelines" for Kubernetes and to "openshift-pipelines" for Openshift flavor. From 35e6ff2e3926db3a6f2735bf438abf57d7a73d2c Mon Sep 17 00:00:00 2001 From: Charles Morin Date: Wed, 10 Dec 2025 09:52:17 -0500 Subject: [PATCH 3/4] replace deprecated `preserveUnknownFields` annotation with `x-kubernetes-preserve-unknown-fields` --- .../templates/kubernetes-crds.yaml | 20 ++++++++--------- .../templates/openshift-crds.yaml | 22 +++++++++---------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/charts/tekton-operator/templates/kubernetes-crds.yaml b/charts/tekton-operator/templates/kubernetes-crds.yaml index 5f484f310b..d8d9fd1f3b 100644 --- a/charts/tekton-operator/templates/kubernetes-crds.yaml +++ b/charts/tekton-operator/templates/kubernetes-crds.yaml @@ -16,7 +16,7 @@ spec: singular: manualapprovalgate shortNames: - mag - preserveUnknownFields: false + x-kubernetes-preserve-unknown-fields: false scope: Cluster versions: - name: v1alpha1 @@ -54,7 +54,7 @@ spec: listKind: TektonChainList plural: tektonchains singular: tektonchain - preserveUnknownFields: false + x-kubernetes-preserve-unknown-fields: false scope: Cluster versions: - additionalPrinterColumns: @@ -92,7 +92,7 @@ spec: listKind: TektonConfigList plural: tektonconfigs singular: tektonconfig - preserveUnknownFields: false + x-kubernetes-preserve-unknown-fields: false scope: Cluster versions: - additionalPrinterColumns: @@ -130,7 +130,7 @@ spec: listKind: TektonDashboardList plural: tektondashboards singular: tektondashboard - preserveUnknownFields: false + x-kubernetes-preserve-unknown-fields: false scope: Cluster versions: - additionalPrinterColumns: @@ -168,7 +168,7 @@ spec: listKind: TektonHubList plural: tektonhubs singular: tektonhub - preserveUnknownFields: false + x-kubernetes-preserve-unknown-fields: false scope: Cluster versions: - additionalPrinterColumns: @@ -212,7 +212,7 @@ spec: listKind: TektonInstallerSetList plural: tektoninstallersets singular: tektoninstallerset - preserveUnknownFields: false + x-kubernetes-preserve-unknown-fields: false scope: Cluster versions: - additionalPrinterColumns: @@ -247,7 +247,7 @@ spec: listKind: TektonPipelineList plural: tektonpipelines singular: tektonpipeline - preserveUnknownFields: false + x-kubernetes-preserve-unknown-fields: false scope: Cluster versions: - additionalPrinterColumns: @@ -285,7 +285,7 @@ spec: listKind: TektonResultList plural: tektonresults singular: tektonresult - preserveUnknownFields: false + x-kubernetes-preserve-unknown-fields: false scope: Cluster versions: - additionalPrinterColumns: @@ -323,7 +323,7 @@ spec: listKind: TektonTriggerList plural: tektontriggers singular: tektontrigger - preserveUnknownFields: false + x-kubernetes-preserve-unknown-fields: false scope: Cluster versions: - additionalPrinterColumns: @@ -361,7 +361,7 @@ spec: listKind: TektonPrunerList plural: tektonpruners singular: tektonpruner - preserveUnknownFields: false + x-kubernetes-preserve-unknown-fields: false scope: Cluster versions: - additionalPrinterColumns: diff --git a/charts/tekton-operator/templates/openshift-crds.yaml b/charts/tekton-operator/templates/openshift-crds.yaml index 2251d59519..92a3d3c04e 100644 --- a/charts/tekton-operator/templates/openshift-crds.yaml +++ b/charts/tekton-operator/templates/openshift-crds.yaml @@ -16,7 +16,7 @@ spec: singular: manualapprovalgate shortNames: - mag - preserveUnknownFields: false + x-kubernetes-preserve-unknown-fields: false scope: Cluster versions: - name: v1alpha1 @@ -57,7 +57,7 @@ spec: - opac - pac singular: openshiftpipelinesascode - preserveUnknownFields: false + x-kubernetes-preserve-unknown-fields: false scope: Cluster versions: - additionalPrinterColumns: @@ -95,7 +95,7 @@ spec: listKind: TektonAddonList plural: tektonaddons singular: tektonaddon - preserveUnknownFields: false + x-kubernetes-preserve-unknown-fields: false scope: Cluster versions: - additionalPrinterColumns: @@ -133,7 +133,7 @@ spec: listKind: TektonChainList plural: tektonchains singular: tektonchain - preserveUnknownFields: false + x-kubernetes-preserve-unknown-fields: false scope: Cluster versions: - additionalPrinterColumns: @@ -171,7 +171,7 @@ spec: listKind: TektonConfigList plural: tektonconfigs singular: tektonconfig - preserveUnknownFields: false + x-kubernetes-preserve-unknown-fields: false scope: Cluster versions: - additionalPrinterColumns: @@ -209,7 +209,7 @@ spec: listKind: TektonHubList plural: tektonhubs singular: tektonhub - preserveUnknownFields: false + x-kubernetes-preserve-unknown-fields: false scope: Cluster versions: - additionalPrinterColumns: @@ -253,7 +253,7 @@ spec: listKind: TektonInstallerSetList plural: tektoninstallersets singular: tektoninstallerset - preserveUnknownFields: false + x-kubernetes-preserve-unknown-fields: false scope: Cluster versions: - additionalPrinterColumns: @@ -288,7 +288,7 @@ spec: listKind: TektonPipelineList plural: tektonpipelines singular: tektonpipeline - preserveUnknownFields: false + x-kubernetes-preserve-unknown-fields: false scope: Cluster versions: - additionalPrinterColumns: @@ -326,7 +326,7 @@ spec: listKind: TektonResultList plural: tektonresults singular: tektonresult - preserveUnknownFields: false + x-kubernetes-preserve-unknown-fields: false scope: Cluster versions: - additionalPrinterColumns: @@ -364,7 +364,7 @@ spec: listKind: TektonTriggerList plural: tektontriggers singular: tektontrigger - preserveUnknownFields: false + x-kubernetes-preserve-unknown-fields: false scope: Cluster versions: - additionalPrinterColumns: @@ -402,7 +402,7 @@ spec: listKind: TektonPrunerList plural: tektonpruners singular: tektonpruner - preserveUnknownFields: false + x-kubernetes-preserve-unknown-fields: false scope: Cluster versions: - additionalPrinterColumns: From 5a591c396324131e466092849ffc6812e83bd68b Mon Sep 17 00:00:00 2001 From: cmorinupgrade Date: Wed, 10 Dec 2025 10:34:05 -0500 Subject: [PATCH 4/4] remove deprecated field --- charts/tekton-operator/templates/kubernetes-crds.yaml | 10 ---------- charts/tekton-operator/templates/openshift-crds.yaml | 11 ----------- 2 files changed, 21 deletions(-) diff --git a/charts/tekton-operator/templates/kubernetes-crds.yaml b/charts/tekton-operator/templates/kubernetes-crds.yaml index d8d9fd1f3b..f849a922ba 100644 --- a/charts/tekton-operator/templates/kubernetes-crds.yaml +++ b/charts/tekton-operator/templates/kubernetes-crds.yaml @@ -16,7 +16,6 @@ spec: singular: manualapprovalgate shortNames: - mag - x-kubernetes-preserve-unknown-fields: false scope: Cluster versions: - name: v1alpha1 @@ -54,7 +53,6 @@ spec: listKind: TektonChainList plural: tektonchains singular: tektonchain - x-kubernetes-preserve-unknown-fields: false scope: Cluster versions: - additionalPrinterColumns: @@ -92,7 +90,6 @@ spec: listKind: TektonConfigList plural: tektonconfigs singular: tektonconfig - x-kubernetes-preserve-unknown-fields: false scope: Cluster versions: - additionalPrinterColumns: @@ -130,7 +127,6 @@ spec: listKind: TektonDashboardList plural: tektondashboards singular: tektondashboard - x-kubernetes-preserve-unknown-fields: false scope: Cluster versions: - additionalPrinterColumns: @@ -168,7 +164,6 @@ spec: listKind: TektonHubList plural: tektonhubs singular: tektonhub - x-kubernetes-preserve-unknown-fields: false scope: Cluster versions: - additionalPrinterColumns: @@ -212,7 +207,6 @@ spec: listKind: TektonInstallerSetList plural: tektoninstallersets singular: tektoninstallerset - x-kubernetes-preserve-unknown-fields: false scope: Cluster versions: - additionalPrinterColumns: @@ -247,7 +241,6 @@ spec: listKind: TektonPipelineList plural: tektonpipelines singular: tektonpipeline - x-kubernetes-preserve-unknown-fields: false scope: Cluster versions: - additionalPrinterColumns: @@ -285,7 +278,6 @@ spec: listKind: TektonResultList plural: tektonresults singular: tektonresult - x-kubernetes-preserve-unknown-fields: false scope: Cluster versions: - additionalPrinterColumns: @@ -323,7 +315,6 @@ spec: listKind: TektonTriggerList plural: tektontriggers singular: tektontrigger - x-kubernetes-preserve-unknown-fields: false scope: Cluster versions: - additionalPrinterColumns: @@ -361,7 +352,6 @@ spec: listKind: TektonPrunerList plural: tektonpruners singular: tektonpruner - x-kubernetes-preserve-unknown-fields: false scope: Cluster versions: - additionalPrinterColumns: diff --git a/charts/tekton-operator/templates/openshift-crds.yaml b/charts/tekton-operator/templates/openshift-crds.yaml index 92a3d3c04e..222fac821f 100644 --- a/charts/tekton-operator/templates/openshift-crds.yaml +++ b/charts/tekton-operator/templates/openshift-crds.yaml @@ -16,7 +16,6 @@ spec: singular: manualapprovalgate shortNames: - mag - x-kubernetes-preserve-unknown-fields: false scope: Cluster versions: - name: v1alpha1 @@ -57,7 +56,6 @@ spec: - opac - pac singular: openshiftpipelinesascode - x-kubernetes-preserve-unknown-fields: false scope: Cluster versions: - additionalPrinterColumns: @@ -95,7 +93,6 @@ spec: listKind: TektonAddonList plural: tektonaddons singular: tektonaddon - x-kubernetes-preserve-unknown-fields: false scope: Cluster versions: - additionalPrinterColumns: @@ -133,7 +130,6 @@ spec: listKind: TektonChainList plural: tektonchains singular: tektonchain - x-kubernetes-preserve-unknown-fields: false scope: Cluster versions: - additionalPrinterColumns: @@ -171,7 +167,6 @@ spec: listKind: TektonConfigList plural: tektonconfigs singular: tektonconfig - x-kubernetes-preserve-unknown-fields: false scope: Cluster versions: - additionalPrinterColumns: @@ -209,7 +204,6 @@ spec: listKind: TektonHubList plural: tektonhubs singular: tektonhub - x-kubernetes-preserve-unknown-fields: false scope: Cluster versions: - additionalPrinterColumns: @@ -253,7 +247,6 @@ spec: listKind: TektonInstallerSetList plural: tektoninstallersets singular: tektoninstallerset - x-kubernetes-preserve-unknown-fields: false scope: Cluster versions: - additionalPrinterColumns: @@ -288,7 +281,6 @@ spec: listKind: TektonPipelineList plural: tektonpipelines singular: tektonpipeline - x-kubernetes-preserve-unknown-fields: false scope: Cluster versions: - additionalPrinterColumns: @@ -326,7 +318,6 @@ spec: listKind: TektonResultList plural: tektonresults singular: tektonresult - x-kubernetes-preserve-unknown-fields: false scope: Cluster versions: - additionalPrinterColumns: @@ -364,7 +355,6 @@ spec: listKind: TektonTriggerList plural: tektontriggers singular: tektontrigger - x-kubernetes-preserve-unknown-fields: false scope: Cluster versions: - additionalPrinterColumns: @@ -402,7 +392,6 @@ spec: listKind: TektonPrunerList plural: tektonpruners singular: tektonpruner - x-kubernetes-preserve-unknown-fields: false scope: Cluster versions: - additionalPrinterColumns: