Fix devel version replacement

This will fix the devel version replacement which was not happening properly because label was not proper and cabundles were missing
tektoncd · Jul 10, 2024 · fc2ab75 · fc2ab75
1 parent e05c301
commit fc2ab75
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/cmd/kubernetes/operator/kodata/webhook/webhook.yaml b/cmd/kubernetes/operator/kodata/webhook/webhook.yaml
@@ -173,7 +173,7 @@ kind: ConfigMap
 metadata:
   name: tekton-operator-proxy-webhook-config-leader-election
   labels:
-    operator.tekton.dev/release: devel
+    operator.tekton.dev/release: "devel"
     app.kubernetes.io/instance: default
 data:
   _example: |
@@ -214,7 +214,7 @@ metadata:
   name: tekton-operator-proxy-webhook
   labels:
     app.kubernetes.io/instance: default
-    pipeline.tekton.dev/release: "devel"
+    operator.tekton.dev/release: "devel"
     version: "devel"
 spec:
   minReplicas: 1

diff --git a/cmd/openshift/operator/kodata/cabundles/config-service-cabundle.yaml b/cmd/openshift/operator/kodata/cabundles/config-service-cabundle.yaml
@@ -21,7 +21,7 @@ metadata:
   name: config-service-cabundle
   namespace: openshift-pipelines
   labels:
-    operator.tekton.dev/release: devel
+    operator.tekton.dev/release: "devel"
     app.kubernetes.io/part-of: tekton-pipelines
   annotations:
     service.beta.openshift.io/inject-cabundle: "true"
diff --git a/cmd/openshift/operator/kodata/cabundles/config-trusted-cabundle.yaml b/cmd/openshift/operator/kodata/cabundles/config-trusted-cabundle.yaml
@@ -21,6 +21,6 @@ metadata:
   name: config-trusted-cabundle
   namespace: openshift-pipelines
   labels:
-    operator.tekton.dev/release: devel
+    operator.tekton.dev/release: "devel"
     app.kubernetes.io/part-of: tekton-pipelines
     config.openshift.io/inject-trusted-cabundle: "true"
diff --git a/cmd/openshift/operator/kodata/webhook/webhook.yaml b/cmd/openshift/operator/kodata/webhook/webhook.yaml
@@ -218,7 +218,7 @@ kind: ConfigMap
 metadata:
   name: tekton-operator-proxy-webhook-config-leader-election
   labels:
-    operator.tekton.dev/release: devel
+    operator.tekton.dev/release: "devel"
     app.kubernetes.io/instance: default
 data:
   _example: |
@@ -259,7 +259,7 @@ metadata:
   name: tekton-operator-proxy-webhook
   labels:
     app.kubernetes.io/instance: default
-    pipeline.tekton.dev/release: "devel"
+    operator.tekton.dev/release: "devel"
     version: "devel"
 spec:
   minReplicas: 1

diff --git a/config/webhooks/webhook-config-leader-election.yaml b/config/webhooks/webhook-config-leader-election.yaml
@@ -17,7 +17,7 @@ kind: ConfigMap
 metadata:
   name: tekton-operator-webhook-config-leader-election
   labels:
-    operator.tekton.dev/release: devel
+    operator.tekton.dev/release: "devel"
     app.kubernetes.io/instance: default
 data:
   _example: |

diff --git a/hack/release.sh b/hack/release.sh
@@ -21,6 +21,9 @@ function set_version_label() {
     sed -i -e 's/\(operator.tekton.dev\/release\): "devel"/\1: '${operator_version}'/g' -e 's/\(app.kubernetes.io\/version\): "devel"/\1: '${operator_version}'/g' -e 's/\(version\): "devel"/\1: '${operator_version}'/g' -e 's/\("-version"\), "devel"/\1, '${operator_version}'/g' cmd/${platform}/operator/kodata/webhook/*.yaml
     sed -i 's/\(value\): "devel"/\1: '${operator_version}'/g' config/${platform}/base/operator.yaml
   done
+
+  # do changes in cabundles too which are available only for openshift
+  sed -i -e 's/\(operator.tekton.dev\/release\): "devel"/\1: '${operator_version}'/g' -e 's/\(app.kubernetes.io\/version\): "devel"/\1: '${operator_version}'/g' -e 's/\(version\): "devel"/\1: '${operator_version}'/g' -e 's/\("-version"\), "devel"/\1, '${operator_version}'/g' cmd/openshift/operator/kodata/cabundles/*.yaml
 }
 
 function commit_changes() {