Skip to content

Commit bbaca8e

Browse files
committed
Changes to OLM bundle replaces and skipRange for v1.15.1 per upgrade lifecycle
- replaces : cert-manager-operator.v1.15.0 - olm.skipRange: '>=1.15.0 <1.15.1' + more manual replaces of upstream version "v1.15.4" => "v1.15.5"
1 parent 5fbe703 commit bbaca8e

10 files changed

Lines changed: 17 additions & 17 deletions

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This repository contains Cert Manager Operator designed for OpenShift. The opera
44

55
## The operator architecture and design assumptions
66

7-
The Operator uses the [upstream deployment manifests](https://github.com/jetstack/cert-manager/releases/download/v1.15.4/cert-manager.yaml). It divides them into separate files and deploys using 3 controllers:
7+
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:
88
- [cert_manager_cainjector_deployment.go](pkg/controller/deployment/cert_manager_cainjector_deployment.go)
99
- [cert_manager_controller_deployment.go](pkg/controller/deployment/cert_manager_controller_deployment.go)
1010
- [cert_manager_webhook_deployment.go](pkg/controller/deployment/cert_manager_webhook_deployment.go)

bundle/manifests/acme.cert-manager.io_challenges.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
app: cert-manager
1010
app.kubernetes.io/instance: cert-manager
1111
app.kubernetes.io/name: cert-manager
12-
app.kubernetes.io/version: v1.15.4
12+
app.kubernetes.io/version: v1.15.5
1313
name: challenges.acme.cert-manager.io
1414
spec:
1515
group: acme.cert-manager.io

bundle/manifests/acme.cert-manager.io_orders.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ metadata:
1010
app.kubernetes.io/component: crds
1111
app.kubernetes.io/instance: cert-manager
1212
app.kubernetes.io/name: cert-manager
13-
app.kubernetes.io/version: v1.15.4
13+
app.kubernetes.io/version: v1.15.5
1414
name: orders.acme.cert-manager.io
1515
spec:
1616
group: acme.cert-manager.io

bundle/manifests/cert-manager-operator.clusterserviceversion.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ metadata:
250250
features.operators.openshift.io/token-auth-aws: "true"
251251
features.operators.openshift.io/token-auth-azure: "true"
252252
features.operators.openshift.io/token-auth-gcp: "true"
253-
olm.skipRange: '>=1.14.1 <1.15.0'
253+
olm.skipRange: '>=1.15.0 <1.15.1'
254254
operator.openshift.io/uninstall-message: The cert-manager Operator for Red Hat
255255
OpenShift will be removed from cert-manager-operator namespace. If your Operator
256256
configured any off-cluster resources, these will continue to run and require
@@ -305,7 +305,7 @@ spec:
305305
name: orders.acme.cert-manager.io
306306
version: v1
307307
description: |
308-
The cert-manager Operator for Red Hat OpenShift provides seamless support for [cert-manager v1.15.4](https://github.com/cert-manager/cert-manager/tree/v1.15.2), which automates certificate management.
308+
The cert-manager Operator for Red Hat OpenShift provides seamless support for [cert-manager v1.15.5](https://github.com/cert-manager/cert-manager/tree/v1.15.2), which automates certificate management.
309309
For more information, see the [cert-manager Operator for Red Hat OpenShift documentation](https://docs.openshift.com/container-platform/latest/security/cert_manager_operator/index.html).
310310
displayName: cert-manager Operator for Red Hat OpenShift
311311
icon:
@@ -804,5 +804,5 @@ spec:
804804
name: cert-manager-acmesolver
805805
- image: quay.io/jetstack/cert-manager-istio-csr:v0.12.0
806806
name: cert-manager-istiocsr
807-
replaces: cert-manager-operator.v1.14.1
807+
replaces: cert-manager-operator.v1.15.0
808808
version: 1.15.1

bundle/manifests/cert-manager.io_certificaterequests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
app: cert-manager
1010
app.kubernetes.io/instance: cert-manager
1111
app.kubernetes.io/name: cert-manager
12-
app.kubernetes.io/version: v1.15.4
12+
app.kubernetes.io/version: v1.15.5
1313
name: certificaterequests.cert-manager.io
1414
spec:
1515
group: cert-manager.io

bundle/manifests/cert-manager.io_certificates.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
app: cert-manager
1010
app.kubernetes.io/instance: cert-manager
1111
app.kubernetes.io/name: cert-manager
12-
app.kubernetes.io/version: v1.15.4
12+
app.kubernetes.io/version: v1.15.5
1313
name: certificates.cert-manager.io
1414
spec:
1515
group: cert-manager.io

bundle/manifests/cert-manager.io_clusterissuers.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
app: cert-manager
1010
app.kubernetes.io/instance: cert-manager
1111
app.kubernetes.io/name: cert-manager
12-
app.kubernetes.io/version: v1.15.4
12+
app.kubernetes.io/version: v1.15.5
1313
name: clusterissuers.cert-manager.io
1414
spec:
1515
group: cert-manager.io

bundle/manifests/cert-manager.io_issuers.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ metadata:
1010
app.kubernetes.io/component: crds
1111
app.kubernetes.io/instance: cert-manager
1212
app.kubernetes.io/name: cert-manager
13-
app.kubernetes.io/version: v1.15.4
13+
app.kubernetes.io/version: v1.15.5
1414
name: issuers.cert-manager.io
1515
spec:
1616
group: cert-manager.io

config/manifests/bases/cert-manager-operator.clusterserviceversion.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ metadata:
1818
features.operators.openshift.io/token-auth-aws: "true"
1919
features.operators.openshift.io/token-auth-azure: "true"
2020
features.operators.openshift.io/token-auth-gcp: "true"
21-
olm.skipRange: '>=1.14.1 <1.15.0'
21+
olm.skipRange: '>=1.15.0 <1.15.1'
2222
operator.openshift.io/uninstall-message: The cert-manager Operator for Red Hat
2323
OpenShift will be removed from cert-manager-operator namespace. If your Operator
2424
configured any off-cluster resources, these will continue to run and require
@@ -69,7 +69,7 @@ spec:
6969
name: certmanagers.operator.openshift.io
7070
version: v1alpha1
7171
description: |
72-
The cert-manager Operator for Red Hat OpenShift provides seamless support for [cert-manager v1.15.4](https://github.com/cert-manager/cert-manager/tree/v1.15.2), which automates certificate management.
72+
The cert-manager Operator for Red Hat OpenShift provides seamless support for [cert-manager v1.15.5](https://github.com/cert-manager/cert-manager/tree/v1.15.2), which automates certificate management.
7373
For more information, see the [cert-manager Operator for Red Hat OpenShift documentation](https://docs.openshift.com/container-platform/latest/security/cert_manager_operator/index.html).
7474
displayName: cert-manager Operator for Red Hat OpenShift
7575
icon:
@@ -105,5 +105,5 @@ spec:
105105
minKubeVersion: 1.25.0
106106
provider:
107107
name: Red Hat
108-
replaces: cert-manager-operator.v1.14.1
109-
version: 1.15.0
108+
replaces: cert-manager-operator.v1.15.0
109+
version: 1.15.1

pkg/controller/deployment/deployment_overrides_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func TestUnsupportedConfigOverrides(t *testing.T) {
3333
"--v=2",
3434
"--cluster-resource-namespace=$(POD_NAMESPACE)",
3535
"--leader-election-namespace=kube-system",
36-
"--acme-http01-solver-image=quay.io/jetstack/cert-manager-acmesolver:v1.15.4",
36+
"--acme-http01-solver-image=quay.io/jetstack/cert-manager-acmesolver:v1.15.5",
3737
"--max-concurrent-challenges=60",
3838
},
3939
"cert-manager-cainjector": {
@@ -120,7 +120,7 @@ func TestUnsupportedConfigOverrides(t *testing.T) {
120120
},
121121
},
122122
wantArgs: []string{
123-
"--acme-http01-solver-image=quay.io/jetstack/cert-manager-acmesolver:v1.15.4",
123+
"--acme-http01-solver-image=quay.io/jetstack/cert-manager-acmesolver:v1.15.5",
124124
"--cluster-resource-namespace=$(POD_NAMESPACE)",
125125
"--featureX=enable",
126126
"--leader-election-namespace=kube-system",
@@ -171,7 +171,7 @@ func TestUnsupportedConfigOverrides(t *testing.T) {
171171
},
172172
},
173173
wantArgs: []string{
174-
"--acme-http01-solver-image=quay.io/jetstack/cert-manager-acmesolver:v1.15.4",
174+
"--acme-http01-solver-image=quay.io/jetstack/cert-manager-acmesolver:v1.15.5",
175175
"--cluster-resource-namespace=$(POD_NAMESPACE)",
176176
"--featureY=disable",
177177
"--leader-election-namespace=kube-system",

0 commit comments

Comments
 (0)