CM-553: Rebase for operator v1.16.0 release with upstream cert-manager v1.16.4 (#268)

* Bump dependencies with upstream [email protected]
- replace github.com/cert-manager/cert-manager => github.com/openshift/jetstack-cert-manager v1.16.4

* updates bundle version to v1.16.4 for next z-stream & updates ripts
- make bundle
- make update
- make update-bindata
- changes in update-clientgen.sh

* Changes to OLM bundle replaces and SkipRange for v1.16.4
- replaces : cert-manager-operator.v1.15.1
- olm.skipRange: '>=1.15.1 <1.16.0'

* Updates CI base imagto 4.19
- updates ci-operator.yaml
- dockerfile
- images/ci

* updates for tools.go and openapi.json

* react to library-go bump, adds OperatorClient.ApplyOperatorStatus

* Changes

Author: siddhibhor-56

.ci-operator.yaml

@@ -1,4 +1,4 @@
 build_root_image:
   name: builder
   namespace: ocp
-  tag: rhel-9-golang-1.22-openshift-4.17
+  tag: rhel-9-golang-1.23-openshift-4.19

Dockerfile

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

Makefile

@@ -4,8 +4,8 @@
 # To re-generate a bundle for another specific version without changing the standard setup, you can:
 # - use the BUNDLE_VERSION as arg of the bundle target (e.g make bundle BUNDLE_VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export BUNDLE_VERSION=0.0.2)
-BUNDLE_VERSION ?= 1.15.1
-CERT_MANAGER_VERSION ?= "v1.15.5"
+BUNDLE_VERSION ?= 1.16.0
+CERT_MANAGER_VERSION ?= "v1.16.4"
 ISTIO_CSR_VERSION ?= "v0.14.0"
 
 # CHANNELS define the bundle channels used in the bundle.
@@ -128,7 +128,8 @@ manifests: ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefin
 
 .PHONY: generate
 generate: ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
-	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
+	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./api/..."
+	hack/update-clientgen.sh
 
 .PHONY: fmt
 fmt: ## Run go fmt against code.
@@ -149,13 +150,8 @@ update-manifests: $(HELM_BIN)
 	hack/update-istio-csr-manifests.sh $(ISTIO_CSR_VERSION)
 .PHONY: update-manifests
 
-update-scripts:
-	hack/update-deepcopy.sh
-	hack/update-clientgen.sh
-.PHONY: update-scripts
-
 .PHONY: update
-update: update-scripts update-manifests update-bindata
+update: generate update-manifests update-bindata
 
 .PHONY: update-with-container
 update-with-container:

README.md

@@ -4,7 +4,7 @@ This repository contains Cert Manager Operator designed for OpenShift. The opera
 
 ## The operator architecture and design assumptions
 
-The Operator uses the [upstream deployment manifests](https://github.com/jetstack/cert-manager/releases/download/v1.15.5/cert-manager.yaml). It divides them into separate files and deploys using 3 controllers:
+The Operator uses the [upstream deployment manifests](https://github.com/cert-manager/cert-manager/releases). It divides them into separate files and deploys using 3 controllers:
 - [cert_manager_cainjector_deployment.go](pkg/controller/deployment/cert_manager_cainjector_deployment.go)
 - [cert_manager_controller_deployment.go](pkg/controller/deployment/cert_manager_controller_deployment.go)
 - [cert_manager_webhook_deployment.go](pkg/controller/deployment/cert_manager_webhook_deployment.go)

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.15.5
+    app.kubernetes.io/version: v1.16.4
   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.15.5
+    app.kubernetes.io/version: v1.16.4
   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.15.5
+    app.kubernetes.io/version: v1.16.4
   name: cert-manager-cainjector
   namespace: cert-manager
 spec:
@@ -18,12 +18,16 @@ spec:
       app.kubernetes.io/name: cainjector
   template:
     metadata:
+      annotations:
+        prometheus.io/path: /metrics
+        prometheus.io/port: "9402"
+        prometheus.io/scrape: "true"
       labels:
         app: cainjector
         app.kubernetes.io/component: cainjector
         app.kubernetes.io/instance: cert-manager
         app.kubernetes.io/name: cainjector
-        app.kubernetes.io/version: v1.15.5
+        app.kubernetes.io/version: v1.16.4
     spec:
       containers:
         - args:
@@ -36,9 +40,13 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-          image: quay.io/jetstack/cert-manager-cainjector:v1.15.5
+          image: quay.io/jetstack/cert-manager-cainjector:v1.16.4
           imagePullPolicy: IfNotPresent
           name: cert-manager-cainjector
+          ports:
+            - containerPort: 9402
+              name: http-metrics
+              protocol: TCP
           securityContext:
             allowPrivilegeEscalation: false
             capabilities:

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.15.5
+    app.kubernetes.io/version: v1.16.4
   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.15.5
+    app.kubernetes.io/version: v1.16.4
   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.15.5
+    app.kubernetes.io/version: v1.16.4
   name: cert-manager-cainjector
   namespace: cert-manager