Merge pull request #94 from wallrj/release-1.11.4

Release 1.11.4
cert-manager · Jun 27, 2023 · 7b8c550 · 7b8c550
2 parents cee8cf8 + f4a3f52
commit 7b8c550
Show file tree

Hide file tree

Showing 16 changed files with 36 additions and 32 deletions.
diff --git a/Makefile b/Makefile
@@ -6,15 +6,15 @@ SHELL := bash
 .SUFFIXES:
 .ONESHELL:
 
-CERT_MANAGER_VERSION ?= 1.11.3
+CERT_MANAGER_VERSION ?= 1.11.4
 # Decoupled the BUNDLE_VERSION from the CERT_MANAGER_VERSION so that I can do a
 # patch release containing the fix for:
 # https://github.com/cert-manager/cert-manager/issues/5551
-export BUNDLE_VERSION ?= 1.11.3-rc1
+export BUNDLE_VERSION ?= 1.11.4
 # DO NOT PUBLISH PRE-RELEASES TO THE STABLE CHANNEL!
 # For stable releases use: `candidate stable`.
 # For pre-releases use: `candidate`.
-BUNDLE_CHANNELS ?= candidate
+BUNDLE_CHANNELS ?= candidate stable
 STABLE_CHANNEL ?= stable
 CATALOG_VERSION ?= $(shell git describe --tags --always --dirty)
 OPERATORHUB_CATALOG_IMAGE ?= quay.io/operatorhubio/catalog:latest
@@ -229,7 +229,7 @@ clean-bundle-test: ${kind}
 # on your laptop, and the version you supply will then be added to the metadata
 # of the VM so that it can be downloaded from the metadata API by the crc setup
 # scripts that run inside the VM.
-OPENSHIFT_VERSION ?= 4.9
+OPENSHIFT_VERSION ?= 4.13
 
 # The path to the pull-secret which you download from https://console.redhat.com/openshift/create/local
 PULL_SECRET ?=

diff --git a/bundle/bundle.Dockerfile b/bundle/bundle.Dockerfile
@@ -5,7 +5,8 @@ LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
 LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
 LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=cert-manager
-LABEL operators.operatorframework.io.bundle.channels.v1=candidate
+LABEL operators.operatorframework.io.bundle.channels.v1=candidate,stable
+LABEL operators.operatorframework.io.bundle.channel.default.v1=stable
 LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.25.0
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
 LABEL operators.operatorframework.io.metrics.project_layout=unknown

diff --git a/bundle/manifests/acme.cert-manager.io_challenges.yaml b/bundle/manifests/acme.cert-manager.io_challenges.yaml
@@ -6,7 +6,7 @@ metadata:
     app: cert-manager
     app.kubernetes.io/instance: cert-manager
     app.kubernetes.io/name: cert-manager
-    app.kubernetes.io/version: v1.11.3
+    app.kubernetes.io/version: v1.11.4
   name: challenges.acme.cert-manager.io
 spec:
   group: acme.cert-manager.io

diff --git a/bundle/manifests/acme.cert-manager.io_orders.yaml b/bundle/manifests/acme.cert-manager.io_orders.yaml
@@ -6,7 +6,7 @@ metadata:
     app: cert-manager
     app.kubernetes.io/instance: cert-manager
     app.kubernetes.io/name: cert-manager
-    app.kubernetes.io/version: v1.11.3
+    app.kubernetes.io/version: v1.11.4
   name: orders.acme.cert-manager.io
 spec:
   group: acme.cert-manager.io

diff --git a/bundle/manifests/cert-manager-edit_rbac.authorization.k8s.io_v1_clusterrole.yaml b/bundle/manifests/cert-manager-edit_rbac.authorization.k8s.io_v1_clusterrole.yaml
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/component: controller
     app.kubernetes.io/instance: cert-manager
     app.kubernetes.io/name: cert-manager
-    app.kubernetes.io/version: v1.11.3
+    app.kubernetes.io/version: v1.11.4
     rbac.authorization.k8s.io/aggregate-to-admin: "true"
     rbac.authorization.k8s.io/aggregate-to-edit: "true"
   name: cert-manager-edit

diff --git a/bundle/manifests/cert-manager-view_rbac.authorization.k8s.io_v1_clusterrole.yaml b/bundle/manifests/cert-manager-view_rbac.authorization.k8s.io_v1_clusterrole.yaml
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/component: controller
     app.kubernetes.io/instance: cert-manager
     app.kubernetes.io/name: cert-manager
-    app.kubernetes.io/version: v1.11.3
+    app.kubernetes.io/version: v1.11.4
     rbac.authorization.k8s.io/aggregate-to-admin: "true"
     rbac.authorization.k8s.io/aggregate-to-edit: "true"
     rbac.authorization.k8s.io/aggregate-to-view: "true"

diff --git a/bundle/manifests/cert-manager-webhook_v1_configmap.yaml b/bundle/manifests/cert-manager-webhook_v1_configmap.yaml
@@ -7,5 +7,5 @@ metadata:
     app.kubernetes.io/component: webhook
     app.kubernetes.io/instance: cert-manager
     app.kubernetes.io/name: webhook
-    app.kubernetes.io/version: v1.11.3
+    app.kubernetes.io/version: v1.11.4
   name: cert-manager-webhook
diff --git a/bundle/manifests/cert-manager-webhook_v1_service.yaml b/bundle/manifests/cert-manager-webhook_v1_service.yaml
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/component: webhook
     app.kubernetes.io/instance: cert-manager
     app.kubernetes.io/name: webhook
-    app.kubernetes.io/version: v1.11.3
+    app.kubernetes.io/version: v1.11.4
   name: cert-manager-webhook
 spec:
   ports:

diff --git a/bundle/manifests/cert-manager.clusterserviceversion.yaml b/bundle/manifests/cert-manager.clusterserviceversion.yaml
@@ -67,9 +67,9 @@ metadata:
       ]
     capabilities: Full Lifecycle
     categories: Security
-    containerImage: quay.io/jetstack/cert-manager-controller:v1.11.3
-    createdAt: '2023-06-15T13:01:17'
-    olm.skipRange: '>=1.11.0 <1.11.3-rc1'
+    containerImage: quay.io/jetstack/cert-manager-controller:v1.11.4
+    createdAt: '2023-06-27T11:30:28'
+    olm.skipRange: '>=1.11.0 <1.11.4'
     operators.operatorframework.io/builder: operator-sdk-v1.25.0
     operators.operatorframework.io/internal-objects: |-
       [
@@ -84,7 +84,7 @@ metadata:
     operatorframework.io/arch.arm64: supported
     operatorframework.io/arch.ppc64le: supported
     operatorframework.io/arch.s390x: supported
-  name: cert-manager.v1.11.3-rc1
+  name: cert-manager.v1.11.4
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -618,7 +618,7 @@ spec:
           app.kubernetes.io/component: controller
           app.kubernetes.io/instance: cert-manager
           app.kubernetes.io/name: cert-manager
-          app.kubernetes.io/version: v1.11.3
+          app.kubernetes.io/version: v1.11.4
         name: cert-manager
         spec:
           replicas: 1
@@ -639,21 +639,21 @@ spec:
                 app.kubernetes.io/component: controller
                 app.kubernetes.io/instance: cert-manager
                 app.kubernetes.io/name: cert-manager
-                app.kubernetes.io/version: v1.11.3
+                app.kubernetes.io/version: v1.11.4
             spec:
               containers:
               - args:
                 - --v=2
                 - --cluster-resource-namespace=$(POD_NAMESPACE)
                 - --leader-election-namespace=kube-system
-                - --acme-http01-solver-image=quay.io/jetstack/cert-manager-acmesolver:v1.11.3
+                - --acme-http01-solver-image=quay.io/jetstack/cert-manager-acmesolver:v1.11.4
                 - --max-concurrent-challenges=60
                 env:
                 - name: POD_NAMESPACE
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.namespace
-                image: quay.io/jetstack/cert-manager-controller:v1.11.3
+                image: quay.io/jetstack/cert-manager-controller:v1.11.4
                 imagePullPolicy: IfNotPresent
                 name: cert-manager-controller
                 ports:
@@ -678,7 +678,7 @@ spec:
           app.kubernetes.io/component: cainjector
           app.kubernetes.io/instance: cert-manager
           app.kubernetes.io/name: cainjector
-          app.kubernetes.io/version: v1.11.3
+          app.kubernetes.io/version: v1.11.4
         name: cert-manager-cainjector
         spec:
           replicas: 1
@@ -695,7 +695,7 @@ spec:
                 app.kubernetes.io/component: cainjector
                 app.kubernetes.io/instance: cert-manager
                 app.kubernetes.io/name: cainjector
-                app.kubernetes.io/version: v1.11.3
+                app.kubernetes.io/version: v1.11.4
             spec:
               containers:
               - args:
@@ -706,7 +706,7 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.namespace
-                image: quay.io/jetstack/cert-manager-cainjector:v1.11.3
+                image: quay.io/jetstack/cert-manager-cainjector:v1.11.4
                 imagePullPolicy: IfNotPresent
                 name: cert-manager-cainjector
                 resources: {}
@@ -727,7 +727,7 @@ spec:
           app.kubernetes.io/component: webhook
           app.kubernetes.io/instance: cert-manager
           app.kubernetes.io/name: webhook
-          app.kubernetes.io/version: v1.11.3
+          app.kubernetes.io/version: v1.11.4
         name: cert-manager-webhook
         spec:
           replicas: 1
@@ -744,7 +744,7 @@ spec:
                 app.kubernetes.io/component: webhook
                 app.kubernetes.io/instance: cert-manager
                 app.kubernetes.io/name: webhook
-                app.kubernetes.io/version: v1.11.3
+                app.kubernetes.io/version: v1.11.4
             spec:
               containers:
               - args:
@@ -760,7 +760,7 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.namespace
-                image: quay.io/jetstack/cert-manager-webhook:v1.11.3
+                image: quay.io/jetstack/cert-manager-webhook:v1.11.4
                 imagePullPolicy: IfNotPresent
                 livenessProbe:
                   failureThreshold: 3
@@ -888,7 +888,7 @@ spec:
   provider:
     name: The cert-manager maintainers
     url: https://cert-manager.io/
-  version: 1.11.3-rc1
+  version: 1.11.4
   webhookdefinitions:
   - admissionReviewVersions:
     - v1

diff --git a/bundle/manifests/cert-manager.io_certificaterequests.yaml b/bundle/manifests/cert-manager.io_certificaterequests.yaml
@@ -6,7 +6,7 @@ metadata:
     app: cert-manager
     app.kubernetes.io/instance: cert-manager
     app.kubernetes.io/name: cert-manager
-    app.kubernetes.io/version: v1.11.3
+    app.kubernetes.io/version: v1.11.4
   name: certificaterequests.cert-manager.io
 spec:
   group: cert-manager.io

diff --git a/bundle/manifests/cert-manager.io_certificates.yaml b/bundle/manifests/cert-manager.io_certificates.yaml
@@ -6,7 +6,7 @@ metadata:
     app: cert-manager
     app.kubernetes.io/instance: cert-manager
     app.kubernetes.io/name: cert-manager
-    app.kubernetes.io/version: v1.11.3
+    app.kubernetes.io/version: v1.11.4
   name: certificates.cert-manager.io
 spec:
   group: cert-manager.io

diff --git a/bundle/manifests/cert-manager.io_clusterissuers.yaml b/bundle/manifests/cert-manager.io_clusterissuers.yaml
@@ -6,7 +6,7 @@ metadata:
     app: cert-manager
     app.kubernetes.io/instance: cert-manager
     app.kubernetes.io/name: cert-manager
-    app.kubernetes.io/version: v1.11.3
+    app.kubernetes.io/version: v1.11.4
   name: clusterissuers.cert-manager.io
 spec:
   group: cert-manager.io

diff --git a/bundle/manifests/cert-manager.io_issuers.yaml b/bundle/manifests/cert-manager.io_issuers.yaml
@@ -6,7 +6,7 @@ metadata:
     app: cert-manager
     app.kubernetes.io/instance: cert-manager
     app.kubernetes.io/name: cert-manager
-    app.kubernetes.io/version: v1.11.3
+    app.kubernetes.io/version: v1.11.4
   name: issuers.cert-manager.io
 spec:
   group: cert-manager.io

diff --git a/bundle/manifests/cert-manager_v1_service.yaml b/bundle/manifests/cert-manager_v1_service.yaml
@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/component: controller
     app.kubernetes.io/instance: cert-manager
     app.kubernetes.io/name: cert-manager
-    app.kubernetes.io/version: v1.11.3
+    app.kubernetes.io/version: v1.11.4
   name: cert-manager
 spec:
   ports:

diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml
@@ -4,7 +4,8 @@ annotations:
   operators.operatorframework.io.bundle.manifests.v1: manifests/
   operators.operatorframework.io.bundle.metadata.v1: metadata/
   operators.operatorframework.io.bundle.package.v1: cert-manager
-  operators.operatorframework.io.bundle.channels.v1: candidate
+  operators.operatorframework.io.bundle.channels.v1: candidate,stable
+  operators.operatorframework.io.bundle.channel.default.v1: stable
   operators.operatorframework.io.metrics.builder: operator-sdk-v1.25.0
   operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
   operators.operatorframework.io.metrics.project_layout: unknown

diff --git a/hack/crc.mk b/hack/crc.mk
@@ -38,6 +38,8 @@ crc_version_4.8 := 1.33.1
 crc_version_4.9 := 1.39.0
 crc_version_4.10 := 2.6.0
 crc_version_4.11 := 2.12.0
+crc_version_4.12 := 2.19.0
+crc_version_4.13 := 2.20.0
 crc_version = ${crc_version_${OPENSHIFT_VERSION}}
 
 # Download the crc tarball