From 35586e23acbe915c730cb9c7c699ea8d052315e2 Mon Sep 17 00:00:00 2001 From: Richard Wall Date: Thu, 22 Jun 2023 18:19:43 +0100 Subject: [PATCH 1/5] v1.11.4-rc1 Signed-off-by: Richard Wall --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1a7d454..b4c3a48 100644 --- a/Makefile +++ b/Makefile @@ -6,11 +6,11 @@ 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-rc1 # DO NOT PUBLISH PRE-RELEASES TO THE STABLE CHANNEL! # For stable releases use: `candidate stable`. # For pre-releases use: `candidate`. From ddfb89504152774759d190a4e0f8419254cc025b Mon Sep 17 00:00:00 2001 From: Richard Wall Date: Thu, 22 Jun 2023 18:20:34 +0100 Subject: [PATCH 2/5] make bundle-generate Signed-off-by: Richard Wall --- .../acme.cert-manager.io_challenges.yaml | 2 +- .../acme.cert-manager.io_orders.yaml | 2 +- ...c.authorization.k8s.io_v1_clusterrole.yaml | 2 +- ...c.authorization.k8s.io_v1_clusterrole.yaml | 2 +- .../cert-manager-webhook_v1_configmap.yaml | 2 +- .../cert-manager-webhook_v1_service.yaml | 2 +- .../cert-manager.clusterserviceversion.yaml | 30 +++++++++---------- .../cert-manager.io_certificaterequests.yaml | 2 +- .../cert-manager.io_certificates.yaml | 2 +- .../cert-manager.io_clusterissuers.yaml | 2 +- bundle/manifests/cert-manager.io_issuers.yaml | 2 +- bundle/manifests/cert-manager_v1_service.yaml | 2 +- 12 files changed, 26 insertions(+), 26 deletions(-) diff --git a/bundle/manifests/acme.cert-manager.io_challenges.yaml b/bundle/manifests/acme.cert-manager.io_challenges.yaml index 0d34e40..5a63f5d 100644 --- 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 index aa03908..76fe0e2 100644 --- 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 index 61b4c13..e4f0ce7 100644 --- 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 index d770925..5dc0dd4 100644 --- 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 index 293f29c..cbe48c6 100644 --- 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 index a052407..eb1d678 100644 --- 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 index 8bdf039..32f0f49 100644 --- 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-22T17:20:03' + olm.skipRange: '>=1.11.0 <1.11.4-rc1' 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-rc1 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-rc1 webhookdefinitions: - admissionReviewVersions: - v1 diff --git a/bundle/manifests/cert-manager.io_certificaterequests.yaml b/bundle/manifests/cert-manager.io_certificaterequests.yaml index 5484087..014800f 100644 --- 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 index 00d7a56..37f4c4e 100644 --- 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 index 2566be0..92ddf95 100644 --- 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 index 54314fc..9ce5804 100644 --- 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 index a1d19a7..c0577d0 100644 --- 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: From a4bf834b81cee5c27f5ef839014bee57a8b2e68e Mon Sep 17 00:00:00 2001 From: Richard Wall Date: Tue, 27 Jun 2023 12:20:08 +0100 Subject: [PATCH 3/5] Add latest CRC versions and use OpenShift 4.13 by default for E2E tests Signed-off-by: Richard Wall --- Makefile | 2 +- hack/crc.mk | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b4c3a48..b0875e9 100644 --- a/Makefile +++ b/Makefile @@ -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/hack/crc.mk b/hack/crc.mk index 2a6632d..13a0df2 100755 --- 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 From fb386bceaa8b7177af2409bdc3f393a5cc798486 Mon Sep 17 00:00:00 2001 From: Richard Wall Date: Tue, 27 Jun 2023 12:27:41 +0100 Subject: [PATCH 4/5] v1.11.4 Signed-off-by: Richard Wall --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b0875e9..501f473 100644 --- a/Makefile +++ b/Makefile @@ -10,11 +10,11 @@ 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.4-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 From f4a3f52a28180bac180b92f0d137291086901b16 Mon Sep 17 00:00:00 2001 From: Richard Wall Date: Tue, 27 Jun 2023 12:30:48 +0100 Subject: [PATCH 5/5] make bundle-generate Signed-off-by: Richard Wall --- bundle/bundle.Dockerfile | 3 ++- bundle/manifests/cert-manager.clusterserviceversion.yaml | 8 ++++---- bundle/metadata/annotations.yaml | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/bundle/bundle.Dockerfile b/bundle/bundle.Dockerfile index 27a5aff..4101107 100644 --- 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/cert-manager.clusterserviceversion.yaml b/bundle/manifests/cert-manager.clusterserviceversion.yaml index 32f0f49..29050b7 100644 --- a/bundle/manifests/cert-manager.clusterserviceversion.yaml +++ b/bundle/manifests/cert-manager.clusterserviceversion.yaml @@ -68,8 +68,8 @@ metadata: capabilities: Full Lifecycle categories: Security containerImage: quay.io/jetstack/cert-manager-controller:v1.11.4 - createdAt: '2023-06-22T17:20:03' - olm.skipRange: '>=1.11.0 <1.11.4-rc1' + 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.4-rc1 + name: cert-manager.v1.11.4 namespace: placeholder spec: apiservicedefinitions: {} @@ -888,7 +888,7 @@ spec: provider: name: The cert-manager maintainers url: https://cert-manager.io/ - version: 1.11.4-rc1 + version: 1.11.4 webhookdefinitions: - admissionReviewVersions: - v1 diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index 171da85..df833d8 100644 --- 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