CM-826: Rebase istio-csr with upstream v0.15.0 (#363)

arun717 · Arun Maurya · web-flow · commit da0c5123a4bb · 2026-01-08T13:48:55.000Z
* Update Makefile: ISTIO_CSR_VERSION

* Update CSV: OLM bundle name, version, replaces, skipRange and skips

* More manual replacements

* Remove rebase automation script

* Bump up ISTIOCSR_OPERAND_IMAGE_VERSION

---------

Co-authored-by: Arun Maurya &lt;amaurya@amaurya-thinkpadp1gen7.bengluru.csb&gt;
diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@
 # - use environment variables to overwrite this value (e.g export BUNDLE_VERSION=0.0.2)
 BUNDLE_VERSION ?= 1.19.0
 CERT_MANAGER_VERSION ?= "v1.19.2"
-ISTIO_CSR_VERSION ?= "v0.14.2"
+ISTIO_CSR_VERSION ?= "v0.15.0"
 
 # CHANNELS define the bundle channels used in the bundle.
 # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")
diff --git a/bindata/istio-csr/cert-manager-istio-csr-clusterrole.yaml b/bindata/istio-csr/cert-manager-istio-csr-clusterrole.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/name: cert-manager-istio-csr
     app.kubernetes.io/instance: cert-manager-istio-csr
-    app.kubernetes.io/version: v0.14.2
+    app.kubernetes.io/version: v0.15.0
     app.kubernetes.io/managed-by: cert-manager-operator
   name: cert-manager-istio-csr
 rules:
diff --git a/bindata/istio-csr/cert-manager-istio-csr-clusterrolebinding.yaml b/bindata/istio-csr/cert-manager-istio-csr-clusterrolebinding.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/name: cert-manager-istio-csr
     app.kubernetes.io/instance: cert-manager-istio-csr
-    app.kubernetes.io/version: v0.14.2
+    app.kubernetes.io/version: v0.15.0
     app.kubernetes.io/managed-by: cert-manager-operator
   name: cert-manager-istio-csr
 roleRef:
diff --git a/bindata/istio-csr/cert-manager-istio-csr-deployment.yaml b/bindata/istio-csr/cert-manager-istio-csr-deployment.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     app.kubernetes.io/name: cert-manager-istio-csr
     app.kubernetes.io/instance: cert-manager-istio-csr
-    app.kubernetes.io/version: v0.14.2
+    app.kubernetes.io/version: v0.15.0
     app.kubernetes.io/managed-by: cert-manager-operator
 spec:
   replicas: 1
@@ -19,14 +19,14 @@ spec:
         app: cert-manager-istio-csr
         app.kubernetes.io/name: cert-manager-istio-csr
         app.kubernetes.io/instance: cert-manager-istio-csr
-        app.kubernetes.io/version: v0.14.2
+        app.kubernetes.io/version: v0.15.0
     spec:
       serviceAccountName: cert-manager-istio-csr
       nodeSelector:
         kubernetes.io/os: linux
       containers:
         - name: cert-manager-istio-csr
-          image: quay.io/jetstack/cert-manager-istio-csr:v0.14.2
+          image: quay.io/jetstack/cert-manager-istio-csr:v0.15.0
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 6443
diff --git a/bindata/istio-csr/cert-manager-istio-csr-leases-role.yaml b/bindata/istio-csr/cert-manager-istio-csr-leases-role.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/name: cert-manager-istio-csr
     app.kubernetes.io/instance: cert-manager-istio-csr
-    app.kubernetes.io/version: v0.14.2
+    app.kubernetes.io/version: v0.15.0
     app.kubernetes.io/managed-by: cert-manager-operator
   name: cert-manager-istio-csr-leases
   namespace: istio-system
diff --git a/bindata/istio-csr/cert-manager-istio-csr-leases-rolebinding.yaml b/bindata/istio-csr/cert-manager-istio-csr-leases-rolebinding.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     app.kubernetes.io/name: cert-manager-istio-csr
     app.kubernetes.io/instance: cert-manager-istio-csr
-    app.kubernetes.io/version: v0.14.2
+    app.kubernetes.io/version: v0.15.0
     app.kubernetes.io/managed-by: cert-manager-operator
 roleRef:
   apiGroup: rbac.authorization.k8s.io
diff --git a/bindata/istio-csr/cert-manager-istio-csr-metrics-service.yaml b/bindata/istio-csr/cert-manager-istio-csr-metrics-service.yaml
@@ -7,7 +7,7 @@ metadata:
     app: cert-manager-istio-csr-metrics
     app.kubernetes.io/name: cert-manager-istio-csr
     app.kubernetes.io/instance: cert-manager-istio-csr
-    app.kubernetes.io/version: v0.14.2
+    app.kubernetes.io/version: v0.15.0
     app.kubernetes.io/managed-by: cert-manager-operator
 spec:
   type: ClusterIP
diff --git a/bindata/istio-csr/cert-manager-istio-csr-role.yaml b/bindata/istio-csr/cert-manager-istio-csr-role.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/name: cert-manager-istio-csr
     app.kubernetes.io/instance: cert-manager-istio-csr
-    app.kubernetes.io/version: v0.14.2
+    app.kubernetes.io/version: v0.15.0
     app.kubernetes.io/managed-by: cert-manager-operator
   name: cert-manager-istio-csr
   namespace: istio-system
diff --git a/bindata/istio-csr/cert-manager-istio-csr-rolebinding.yaml b/bindata/istio-csr/cert-manager-istio-csr-rolebinding.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     app.kubernetes.io/name: cert-manager-istio-csr
     app.kubernetes.io/instance: cert-manager-istio-csr
-    app.kubernetes.io/version: v0.14.2
+    app.kubernetes.io/version: v0.15.0
     app.kubernetes.io/managed-by: cert-manager-operator
 roleRef:
   apiGroup: rbac.authorization.k8s.io
diff --git a/bindata/istio-csr/cert-manager-istio-csr-service.yaml b/bindata/istio-csr/cert-manager-istio-csr-service.yaml
@@ -7,7 +7,7 @@ metadata:
     app: cert-manager-istio-csr
     app.kubernetes.io/name: cert-manager-istio-csr
     app.kubernetes.io/instance: cert-manager-istio-csr
-    app.kubernetes.io/version: v0.14.2
+    app.kubernetes.io/version: v0.15.0
     app.kubernetes.io/managed-by: cert-manager-operator
 spec:
   type: ClusterIP
diff --git a/bindata/istio-csr/cert-manager-istio-csr-serviceaccount.yaml b/bindata/istio-csr/cert-manager-istio-csr-serviceaccount.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/name: cert-manager-istio-csr
     app.kubernetes.io/instance: cert-manager-istio-csr
-    app.kubernetes.io/version: v0.14.2
+    app.kubernetes.io/version: v0.15.0
     app.kubernetes.io/managed-by: cert-manager-operator
   name: cert-manager-istio-csr
   namespace: cert-manager
diff --git a/bindata/istio-csr/istiod-certificate.yaml b/bindata/istio-csr/istiod-certificate.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     app.kubernetes.io/name: cert-manager-istio-csr
     app.kubernetes.io/instance: cert-manager-istio-csr
-    app.kubernetes.io/version: v0.14.2
+    app.kubernetes.io/version: v0.15.0
     app.kubernetes.io/managed-by: cert-manager-operator
 spec:
   commonName: istiod.istio-system.svc
diff --git a/bundle/manifests/cert-manager-operator.clusterserviceversion.yaml b/bundle/manifests/cert-manager-operator.clusterserviceversion.yaml
@@ -706,11 +706,11 @@ spec:
                 - name: RELATED_IMAGE_CERT_MANAGER_ACMESOLVER
                   value: quay.io/jetstack/cert-manager-acmesolver:v1.19.2
                 - name: RELATED_IMAGE_CERT_MANAGER_ISTIOCSR
-                  value: quay.io/jetstack/cert-manager-istio-csr:v0.14.2
+                  value: quay.io/jetstack/cert-manager-istio-csr:v0.15.0
                 - name: OPERAND_IMAGE_VERSION
                   value: 1.19.2
                 - name: ISTIOCSR_OPERAND_IMAGE_VERSION
-                  value: 0.14.2
+                  value: 0.15.0
                 - name: OPERATOR_IMAGE_VERSION
                   value: 1.19.0
                 - name: OPERATOR_LOG_LEVEL
@@ -822,7 +822,7 @@ spec:
     name: cert-manager-controller
   - image: quay.io/jetstack/cert-manager-acmesolver:v1.19.2
     name: cert-manager-acmesolver
-  - image: quay.io/jetstack/cert-manager-istio-csr:v0.14.2
+  - image: quay.io/jetstack/cert-manager-istio-csr:v0.15.0
     name: cert-manager-istiocsr
   replaces: cert-manager-operator.v1.18.0
   version: 1.19.0
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -83,11 +83,11 @@ spec:
             - name: RELATED_IMAGE_CERT_MANAGER_ACMESOLVER
               value: quay.io/jetstack/cert-manager-acmesolver:v1.19.2
             - name: RELATED_IMAGE_CERT_MANAGER_ISTIOCSR
-              value: quay.io/jetstack/cert-manager-istio-csr:v0.14.2
+              value: quay.io/jetstack/cert-manager-istio-csr:v0.15.0
             - name: OPERAND_IMAGE_VERSION
               value: 1.19.2
             - name: ISTIOCSR_OPERAND_IMAGE_VERSION
-              value: 0.14.2
+              value: 0.15.0
             - name: OPERATOR_IMAGE_VERSION
               value: 1.19.0
             - name: OPERATOR_LOG_LEVEL
diff --git a/pkg/operator/assets/bindata.go b/pkg/operator/assets/bindata.go
