Merge pull request #421 from RaphaelBut/tekton-pruner

openshift-merge-bot[bot] · web-flow · commit 179db6ae2797 · 2025-04-10T13:53:56.000Z
Make tekton pruner image configurable via app-interface
diff --git a/deploy/tekton-pruner.yaml b/deploy/tekton-pruner.yaml
@@ -19,7 +19,7 @@ spec:
               command:
                 - /bin/sh
                 - -c
-              image: quay.io/openshift-pipeline/openshift-pipelines-pipelines-cli-tkn-rhel8@sha256:e1fa47811f156e48a61741aabe73ef85078960567822a4b23c174c0d9b4d0ee6
+              image: ${TEKTON_RESOURCE_PRUNER_IMAGE}@${TEKTON_RESOURCE_PRUNER_SHA}
               imagePullPolicy: IfNotPresent
               name: tekton-resource-pruner
               resources:
@@ -92,4 +92,4 @@ roleRef:
   name: cad-tekton-pruner-role
 subjects:
   - kind: ServiceAccount
-    name: cad-tekton-pruner
+    name: cad-tekton-pruner
diff --git a/hack/update-template/main.go b/hack/update-template/main.go
@@ -33,6 +33,8 @@ var saasTemplateFile = Template{
 		{Name: "NAMESPACE_NAME", Value: "configuration-anomaly-detection"},
 		{Name: "CAD_EXPERIMENTAL_ENABLED", Value: "FALSE"},
 		{Name: "LOG_LEVEL", Value: "info"},
+		{Name: "TEKTON_RESOURCE_PRUNER_IMAGE", Value: "quay.io/openshift-pipeline/openshift-pipelines-pipelines-cli-tkn-rhel8"},
+		{Name: "TEKTON_RESOURCE_PRUNER_SHA", Value: ""},
 	},
 }
 
diff --git a/openshift/template.yaml b/openshift/template.yaml
@@ -13,6 +13,9 @@ parameters:
   value: "FALSE"
 - name: LOG_LEVEL
   value: info
+- name: TEKTON_RESOURCE_PRUNER_IMAGE
+  value: quay.io/openshift-pipeline/openshift-pipelines-pipelines-cli-tkn-rhel8
+- name: TEKTON_RESOURCE_PRUNER_SHA
 objects:
 - apiVersion: apps/v1
   kind: Deployment
@@ -350,7 +353,7 @@ objects:
               command:
               - /bin/sh
               - -c
-              image: quay.io/openshift-pipeline/openshift-pipelines-pipelines-cli-tkn-rhel8@sha256:e1fa47811f156e48a61741aabe73ef85078960567822a4b23c174c0d9b4d0ee6
+              image: ${TEKTON_RESOURCE_PRUNER_IMAGE}@${TEKTON_RESOURCE_PRUNER_SHA}
               imagePullPolicy: IfNotPresent
               name: tekton-resource-pruner
               resources:

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,8 @@ var saasTemplateFile = Template{`
`33`	`33`	`{Name: "NAMESPACE_NAME", Value: "configuration-anomaly-detection"},`
`34`	`34`	`{Name: "CAD_EXPERIMENTAL_ENABLED", Value: "FALSE"},`
`35`	`35`	`{Name: "LOG_LEVEL", Value: "info"},`
	`36`	`+ {Name: "TEKTON_RESOURCE_PRUNER_IMAGE", Value: "quay.io/openshift-pipeline/openshift-pipelines-pipelines-cli-tkn-rhel8"},`
	`37`	`+ {Name: "TEKTON_RESOURCE_PRUNER_SHA", Value: ""},`
`36`	`38`	`},`
`37`	`39`	`}`
`38`	`40`