Skip to content

Commit e3a7070

Browse files
Merge pull request #236 from siddhibhor-56/cm-480-cert-manager-1.15
CM-480: Rebase upstream cert-manager v1.15.5 for cert-manager-operator.v1.15.1 release
2 parents f8df39c + dbd6ec4 commit e3a7070

File tree

67 files changed

+193
-175
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+193
-175
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# To re-generate a bundle for another specific version without changing the standard setup, you can:
55
# - use the BUNDLE_VERSION as arg of the bundle target (e.g make bundle BUNDLE_VERSION=0.0.2)
66
# - use environment variables to overwrite this value (e.g export BUNDLE_VERSION=0.0.2)
7-
BUNDLE_VERSION ?= 1.15.0
7+
BUNDLE_VERSION ?= 1.15.1
88

99
# CHANNELS define the bundle channels used in the bundle.
1010
# Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")
@@ -106,7 +106,7 @@ E2E_TIMEOUT ?= 1h
106106
# https://onsi.github.io/ginkgo/#spec-labels. The default is to run tests on the AWS platform.
107107
E2E_GINKGO_LABEL_FILTER ?= "Platform: isSubsetOf {AWS}"
108108

109-
MANIFEST_SOURCE = https://github.com/cert-manager/cert-manager/releases/download/v1.15.4/cert-manager.yaml
109+
MANIFEST_SOURCE = https://github.com/cert-manager/cert-manager/releases/download/v1.15.5/cert-manager.yaml
110110

111111

112112
##@ Development

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)

bindata/cert-manager-deployment/cainjector/cert-manager-cainjector-cr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
app.kubernetes.io/component: cainjector
77
app.kubernetes.io/instance: cert-manager
88
app.kubernetes.io/name: cainjector
9-
app.kubernetes.io/version: v1.15.4
9+
app.kubernetes.io/version: v1.15.5
1010
name: cert-manager-cainjector
1111
rules:
1212
- apiGroups:

bindata/cert-manager-deployment/cainjector/cert-manager-cainjector-crb.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
app.kubernetes.io/component: cainjector
77
app.kubernetes.io/instance: cert-manager
88
app.kubernetes.io/name: cainjector
9-
app.kubernetes.io/version: v1.15.4
9+
app.kubernetes.io/version: v1.15.5
1010
name: cert-manager-cainjector
1111
roleRef:
1212
apiGroup: rbac.authorization.k8s.io

bindata/cert-manager-deployment/cainjector/cert-manager-cainjector-deployment.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
app.kubernetes.io/component: cainjector
77
app.kubernetes.io/instance: cert-manager
88
app.kubernetes.io/name: cainjector
9-
app.kubernetes.io/version: v1.15.4
9+
app.kubernetes.io/version: v1.15.5
1010
name: cert-manager-cainjector
1111
namespace: cert-manager
1212
spec:
@@ -23,7 +23,7 @@ spec:
2323
app.kubernetes.io/component: cainjector
2424
app.kubernetes.io/instance: cert-manager
2525
app.kubernetes.io/name: cainjector
26-
app.kubernetes.io/version: v1.15.4
26+
app.kubernetes.io/version: v1.15.5
2727
spec:
2828
containers:
2929
- args:
@@ -36,7 +36,7 @@ spec:
3636
valueFrom:
3737
fieldRef:
3838
fieldPath: metadata.namespace
39-
image: quay.io/jetstack/cert-manager-cainjector:v1.15.4
39+
image: quay.io/jetstack/cert-manager-cainjector:v1.15.5
4040
imagePullPolicy: IfNotPresent
4141
name: cert-manager-cainjector
4242
securityContext:

bindata/cert-manager-deployment/cainjector/cert-manager-cainjector-leaderelection-rb.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
app.kubernetes.io/component: cainjector
77
app.kubernetes.io/instance: cert-manager
88
app.kubernetes.io/name: cainjector
9-
app.kubernetes.io/version: v1.15.4
9+
app.kubernetes.io/version: v1.15.5
1010
name: cert-manager-cainjector:leaderelection
1111
namespace: kube-system
1212
roleRef:

bindata/cert-manager-deployment/cainjector/cert-manager-cainjector-leaderelection-role.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
app.kubernetes.io/component: cainjector
77
app.kubernetes.io/instance: cert-manager
88
app.kubernetes.io/name: cainjector
9-
app.kubernetes.io/version: v1.15.4
9+
app.kubernetes.io/version: v1.15.5
1010
name: cert-manager-cainjector:leaderelection
1111
namespace: kube-system
1212
rules:

bindata/cert-manager-deployment/cainjector/cert-manager-cainjector-sa.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ metadata:
77
app.kubernetes.io/component: cainjector
88
app.kubernetes.io/instance: cert-manager
99
app.kubernetes.io/name: cainjector
10-
app.kubernetes.io/version: v1.15.4
10+
app.kubernetes.io/version: v1.15.5
1111
name: cert-manager-cainjector
1212
namespace: cert-manager

bindata/cert-manager-deployment/cert-manager/cert-manager-controller-approve-cert-manager-io-cr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
app.kubernetes.io/component: cert-manager
77
app.kubernetes.io/instance: cert-manager
88
app.kubernetes.io/name: cert-manager
9-
app.kubernetes.io/version: v1.15.4
9+
app.kubernetes.io/version: v1.15.5
1010
name: cert-manager-controller-approve:cert-manager-io
1111
rules:
1212
- apiGroups:

bindata/cert-manager-deployment/cert-manager/cert-manager-controller-approve-cert-manager-io-crb.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
app.kubernetes.io/component: cert-manager
77
app.kubernetes.io/instance: cert-manager
88
app.kubernetes.io/name: cert-manager
9-
app.kubernetes.io/version: v1.15.4
9+
app.kubernetes.io/version: v1.15.5
1010
name: cert-manager-controller-approve:cert-manager-io
1111
roleRef:
1212
apiGroup: rbac.authorization.k8s.io

0 commit comments

Comments
 (0)