Merge pull request #443 from arun717/rebase-1.20.0

CM-997: Rebase cert-manager-operator to v1.20.0 (cert-manager v1.20.2)

Author: openshift-merge-bot[bot]

.ci-operator.yaml

@@ -1,4 +1,4 @@
 build_root_image:
   name: builder
   namespace: ocp
-  tag: rhel-9-golang-1.25-openshift-4.21
+  tag: rhel-9-golang-1.26-openshift-4.23

Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.io/golang:1.25 AS builder
+FROM docker.io/golang:1.26 AS builder
 WORKDIR /go/src/github.com/openshift/cert-manager-operator
 COPY . .
 RUN make build --warn-undefined-variables

Makefile

@@ -19,7 +19,7 @@ export XDG_CONFIG_HOME ?= $(PROJECT_ROOT)/_output/.config
 # ============================================================================
 
 # DEFAULT_VERSION is the default version to use for image tags when not set.
-DEFAULT_VERSION := 1.19.0
+DEFAULT_VERSION := 1.20.0
 
 # Helper function to validate semver (Major.Minor.Patch format)
 # Returns 'valid' if the version matches semver (X.Y.Z) or 'latest', empty string otherwise
@@ -57,7 +57,7 @@ endif
 # --- Operand Versions ---
 
 # Versions of the cert-manager components managed by this operator
-CERT_MANAGER_VERSION ?= v1.19.4
+CERT_MANAGER_VERSION ?= v1.20.2
 ISTIO_CSR_VERSION ?= v0.16.0
 TRUST_MANAGER_VERSION ?= v0.20.3
 
@@ -137,7 +137,7 @@ USE_IMAGE_DIGESTS ?= false
 
 # CHANNELS define the bundle channels used in the bundle.
 # To override: make bundle CHANNELS=candidate,fast,stable or export CHANNELS="candidate,fast,stable"
-CHANNELS ?= stable-v1,stable-v1.19
+CHANNELS ?= stable-v1,stable-v1.20
 ifneq ($(origin CHANNELS), undefined)
 BUNDLE_CHANNELS := --channels=$(CHANNELS)
 endif
@@ -169,7 +169,7 @@ TLS_VERIFY ?= true
 CONTAINER_PUSH_ARGS ?= $(if $(filter $(CONTAINER_ENGINE),docker),,--tls-verify=$(TLS_VERIFY))
 
 # Container image used for running make targets in a container
-CONTAINER_IMAGE_NAME ?= registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.21
+CONTAINER_IMAGE_NAME ?= registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.26-openshift-4.23
 
 # ============================================================================
 # Build Configuration

bindata/cert-manager-deployment/cainjector/cert-manager-cainjector-cr.yaml

@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/component: cainjector
     app.kubernetes.io/instance: cert-manager
     app.kubernetes.io/name: cainjector
-    app.kubernetes.io/version: v1.19.4
+    app.kubernetes.io/version: v1.20.2
   name: cert-manager-cainjector
 rules:
   - apiGroups:

bindata/cert-manager-deployment/cainjector/cert-manager-cainjector-crb.yaml

@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/component: cainjector
     app.kubernetes.io/instance: cert-manager
     app.kubernetes.io/name: cainjector
-    app.kubernetes.io/version: v1.19.4
+    app.kubernetes.io/version: v1.20.2
   name: cert-manager-cainjector
 roleRef:
   apiGroup: rbac.authorization.k8s.io

bindata/cert-manager-deployment/cainjector/cert-manager-cainjector-deployment.yaml

@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/component: cainjector
     app.kubernetes.io/instance: cert-manager
     app.kubernetes.io/name: cainjector
-    app.kubernetes.io/version: v1.19.4
+    app.kubernetes.io/version: v1.20.2
   name: cert-manager-cainjector
   namespace: cert-manager
 spec:
@@ -27,7 +27,7 @@ spec:
         app.kubernetes.io/component: cainjector
         app.kubernetes.io/instance: cert-manager
         app.kubernetes.io/name: cainjector
-        app.kubernetes.io/version: v1.19.4
+        app.kubernetes.io/version: v1.20.2
     spec:
       containers:
         - args:
@@ -40,7 +40,7 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-          image: quay.io/jetstack/cert-manager-cainjector:v1.19.4
+          image: quay.io/jetstack/cert-manager-cainjector:v1.20.2
           imagePullPolicy: IfNotPresent
           name: cert-manager-cainjector
           ports:

bindata/cert-manager-deployment/cainjector/cert-manager-cainjector-leaderelection-rb.yaml

@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/component: cainjector
     app.kubernetes.io/instance: cert-manager
     app.kubernetes.io/name: cainjector
-    app.kubernetes.io/version: v1.19.4
+    app.kubernetes.io/version: v1.20.2
   name: cert-manager-cainjector:leaderelection
   namespace: kube-system
 roleRef:

bindata/cert-manager-deployment/cainjector/cert-manager-cainjector-leaderelection-role.yaml

@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/component: cainjector
     app.kubernetes.io/instance: cert-manager
     app.kubernetes.io/name: cainjector
-    app.kubernetes.io/version: v1.19.4
+    app.kubernetes.io/version: v1.20.2
   name: cert-manager-cainjector:leaderelection
   namespace: kube-system
 rules:

bindata/cert-manager-deployment/cainjector/cert-manager-cainjector-sa.yaml

@@ -7,6 +7,6 @@ metadata:
     app.kubernetes.io/component: cainjector
     app.kubernetes.io/instance: cert-manager
     app.kubernetes.io/name: cainjector
-    app.kubernetes.io/version: v1.19.4
+    app.kubernetes.io/version: v1.20.2
   name: cert-manager-cainjector
   namespace: cert-manager

bindata/cert-manager-deployment/cainjector/cert-manager-cainjector-svc.yaml

@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/component: cainjector
     app.kubernetes.io/instance: cert-manager
     app.kubernetes.io/name: cainjector
-    app.kubernetes.io/version: v1.19.4
+    app.kubernetes.io/version: v1.20.2
   name: cert-manager-cainjector
   namespace: cert-manager
 spec: