From 10d0a29ee4f895ea276bc7e49985afb8c5bba92d Mon Sep 17 00:00:00 2001 From: Richard Wall Date: Wed, 9 Oct 2024 15:20:14 +0100 Subject: [PATCH 1/2] Bump cert-manager version Signed-off-by: Richard Wall --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index ed81a5d..0dc08d2 100644 --- a/Makefile +++ b/Makefile @@ -20,16 +20,16 @@ SHELL := bash # successful. # # See README.md#Release Process for more details. -CERT_MANAGER_VERSION ?= 1.16.0-beta.0 +CERT_MANAGER_VERSION ?= 1.16.1 export BUNDLE_VERSION ?= $(CERT_MANAGER_VERSION) # BUNDLE_CHANNELS determines which of the OLM release channels this bundle will be assigned to. # * if the BUNDLE_VERSION has a pre-release suffix such as `-rc1` this should be `candidate`. # * else this should be `stable candidate`. -BUNDLE_CHANNELS := candidate +BUNDLE_CHANNELS := stable candidate # STABLE_CHANNEL is the default channel for the bundle. It should be the first of the BUNDLE_CHANNELS, -STABLE_CHANNEL := candidate +STABLE_CHANNEL := stable # These variables are used for local testing only and it should not be necessary # to override them. From d15bfe69c9348dc319ad36f71dd7bfdc93ee5183 Mon Sep 17 00:00:00 2001 From: Richard Wall Date: Wed, 9 Oct 2024 15:21:31 +0100 Subject: [PATCH 2/2] make bundle-generate Signed-off-by: Richard Wall --- bundle/bundle.Dockerfile | 4 +-- .../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 +- ...c.authorization.k8s.io_v1_clusterrole.yaml | 2 +- .../cert-manager-webhook_v1_service.yaml | 2 +- .../cert-manager.clusterserviceversion.yaml | 29 ++++++++++--------- .../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 +- bundle/metadata/annotations.yaml | 4 +-- 14 files changed, 30 insertions(+), 29 deletions(-) diff --git a/bundle/bundle.Dockerfile b/bundle/bundle.Dockerfile index 7316ee3..ff869b9 100644 --- a/bundle/bundle.Dockerfile +++ b/bundle/bundle.Dockerfile @@ -5,8 +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.channel.default.v1=candidate +LABEL operators.operatorframework.io.bundle.channels.v1=stable,candidate +LABEL operators.operatorframework.io.bundle.channel.default.v1=stable LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.33.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 index e6082f1..32e4d66 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.16.0-beta.0 + app.kubernetes.io/version: v1.16.1 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 540decd..cb4daf6 100644 --- a/bundle/manifests/acme.cert-manager.io_orders.yaml +++ b/bundle/manifests/acme.cert-manager.io_orders.yaml @@ -7,7 +7,7 @@ metadata: app.kubernetes.io/component: crds app.kubernetes.io/instance: cert-manager app.kubernetes.io/name: cert-manager - app.kubernetes.io/version: v1.16.0-beta.0 + app.kubernetes.io/version: v1.16.1 name: orders.acme.cert-manager.io spec: group: acme.cert-manager.io diff --git a/bundle/manifests/cert-manager-cluster-view_rbac.authorization.k8s.io_v1_clusterrole.yaml b/bundle/manifests/cert-manager-cluster-view_rbac.authorization.k8s.io_v1_clusterrole.yaml index b2e22eb..a86acc6 100644 --- a/bundle/manifests/cert-manager-cluster-view_rbac.authorization.k8s.io_v1_clusterrole.yaml +++ b/bundle/manifests/cert-manager-cluster-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.16.0-beta.0 + app.kubernetes.io/version: v1.16.1 rbac.authorization.k8s.io/aggregate-to-cluster-reader: "true" name: cert-manager-cluster-view rules: 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 4253016..2aea592 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.16.0-beta.0 + app.kubernetes.io/version: v1.16.1 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 a6dc053..28a933d 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.16.0-beta.0 + app.kubernetes.io/version: v1.16.1 rbac.authorization.k8s.io/aggregate-to-admin: "true" rbac.authorization.k8s.io/aggregate-to-cluster-reader: "true" rbac.authorization.k8s.io/aggregate-to-edit: "true" diff --git a/bundle/manifests/cert-manager-webhook_v1_service.yaml b/bundle/manifests/cert-manager-webhook_v1_service.yaml index 31eed8c..093ac4f 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.16.0-beta.0 + app.kubernetes.io/version: v1.16.1 name: cert-manager-webhook spec: ports: diff --git a/bundle/manifests/cert-manager.clusterserviceversion.yaml b/bundle/manifests/cert-manager.clusterserviceversion.yaml index 996249b..7db5322 100644 --- a/bundle/manifests/cert-manager.clusterserviceversion.yaml +++ b/bundle/manifests/cert-manager.clusterserviceversion.yaml @@ -67,8 +67,9 @@ metadata: ] capabilities: Full Lifecycle categories: Security - containerImage: quay.io/jetstack/cert-manager-controller:v1.16.0-beta.0 - createdAt: '2024-10-02T16:10:00' + containerImage: quay.io/jetstack/cert-manager-controller:v1.16.1 + createdAt: '2024-10-09T14:20:33' + olm.skipRange: '>=1.16.0 <1.16.1' operators.operatorframework.io/builder: operator-sdk-v1.33.0 operators.operatorframework.io/internal-objects: |- [ @@ -83,7 +84,7 @@ metadata: operatorframework.io/arch.arm64: supported operatorframework.io/arch.ppc64le: supported operatorframework.io/arch.s390x: supported - name: cert-manager.v1.16.0-beta.0 + name: cert-manager.v1.16.1 namespace: placeholder spec: apiservicedefinitions: {} @@ -629,7 +630,7 @@ spec: app.kubernetes.io/component: controller app.kubernetes.io/instance: cert-manager app.kubernetes.io/name: cert-manager - app.kubernetes.io/version: v1.16.0-beta.0 + app.kubernetes.io/version: v1.16.1 name: cert-manager spec: replicas: 1 @@ -650,21 +651,21 @@ spec: app.kubernetes.io/component: controller app.kubernetes.io/instance: cert-manager app.kubernetes.io/name: cert-manager - app.kubernetes.io/version: v1.16.0-beta.0 + app.kubernetes.io/version: v1.16.1 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.16.0-beta.0 + - --acme-http01-solver-image=quay.io/jetstack/cert-manager-acmesolver:v1.16.1 - --max-concurrent-challenges=60 env: - name: POD_NAMESPACE valueFrom: fieldRef: fieldPath: metadata.namespace - image: quay.io/jetstack/cert-manager-controller:v1.16.0-beta.0 + image: quay.io/jetstack/cert-manager-controller:v1.16.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 8 @@ -704,7 +705,7 @@ spec: app.kubernetes.io/component: cainjector app.kubernetes.io/instance: cert-manager app.kubernetes.io/name: cainjector - app.kubernetes.io/version: v1.16.0-beta.0 + app.kubernetes.io/version: v1.16.1 name: cert-manager-cainjector spec: replicas: 1 @@ -725,7 +726,7 @@ spec: app.kubernetes.io/component: cainjector app.kubernetes.io/instance: cert-manager app.kubernetes.io/name: cainjector - app.kubernetes.io/version: v1.16.0-beta.0 + app.kubernetes.io/version: v1.16.1 spec: containers: - args: @@ -736,7 +737,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: quay.io/jetstack/cert-manager-cainjector:v1.16.0-beta.0 + image: quay.io/jetstack/cert-manager-cainjector:v1.16.1 imagePullPolicy: IfNotPresent name: cert-manager-cainjector ports: @@ -763,7 +764,7 @@ spec: app.kubernetes.io/component: webhook app.kubernetes.io/instance: cert-manager app.kubernetes.io/name: webhook - app.kubernetes.io/version: v1.16.0-beta.0 + app.kubernetes.io/version: v1.16.1 name: cert-manager-webhook spec: replicas: 1 @@ -784,7 +785,7 @@ spec: app.kubernetes.io/component: webhook app.kubernetes.io/instance: cert-manager app.kubernetes.io/name: webhook - app.kubernetes.io/version: v1.16.0-beta.0 + app.kubernetes.io/version: v1.16.1 spec: containers: - args: @@ -797,7 +798,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: quay.io/jetstack/cert-manager-webhook:v1.16.0-beta.0 + image: quay.io/jetstack/cert-manager-webhook:v1.16.1 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 @@ -938,7 +939,7 @@ spec: provider: name: The cert-manager maintainers url: https://cert-manager.io/ - version: 1.16.0-beta.0 + version: 1.16.1 webhookdefinitions: - admissionReviewVersions: - v1 diff --git a/bundle/manifests/cert-manager.io_certificaterequests.yaml b/bundle/manifests/cert-manager.io_certificaterequests.yaml index 1e84c31..d9b18bf 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.16.0-beta.0 + app.kubernetes.io/version: v1.16.1 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 44d250d..6a68108 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.16.0-beta.0 + app.kubernetes.io/version: v1.16.1 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 423fda0..c283f95 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.16.0-beta.0 + app.kubernetes.io/version: v1.16.1 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 c398319..7250c2e 100644 --- a/bundle/manifests/cert-manager.io_issuers.yaml +++ b/bundle/manifests/cert-manager.io_issuers.yaml @@ -7,7 +7,7 @@ metadata: app.kubernetes.io/component: crds app.kubernetes.io/instance: cert-manager app.kubernetes.io/name: cert-manager - app.kubernetes.io/version: v1.16.0-beta.0 + app.kubernetes.io/version: v1.16.1 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 b284863..22f9a39 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.16.0-beta.0 + app.kubernetes.io/version: v1.16.1 name: cert-manager spec: ports: diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index ae29793..0b72003 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -4,8 +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.channel.default.v1: candidate + operators.operatorframework.io.bundle.channels.v1: stable,candidate + operators.operatorframework.io.bundle.channel.default.v1: stable operators.operatorframework.io.metrics.builder: operator-sdk-v1.33.0 operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 operators.operatorframework.io.metrics.project_layout: unknown