CM-180: Rebase 1.11.5

Makefile

@@ -4,7 +4,7 @@
 # To re-generate a bundle for another specific version without changing the standard setup, you can:
 # - use the BUNDLE_VERSION as arg of the bundle target (e.g make bundle BUNDLE_VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export BUNDLE_VERSION=0.0.2)
-BUNDLE_VERSION ?= 1.11.4
+BUNDLE_VERSION ?= 1.11.5
 
 # CHANNELS define the bundle channels used in the bundle.
 # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")
@@ -103,7 +103,7 @@ GOBUILD_VERSION_ARGS = -ldflags "-X $(PACKAGE)/pkg/version.SHORTCOMMIT=$(SHORTCO
 
 E2E_TIMEOUT ?= 1h
 
-MANIFEST_SOURCE = https://github.com/cert-manager/cert-manager/releases/download/v1.11.4/cert-manager.yaml
+MANIFEST_SOURCE = https://github.com/cert-manager/cert-manager/releases/download/v1.11.5/cert-manager.yaml
 
 
 ##@ Development

README.md

@@ -4,7 +4,7 @@ This repository contains Cert Manager Operator designed for OpenShift. The opera
 
 ## The operator architecture and design assumptions
 
-The Operator uses the [upstream deployment manifests](https://github.com/jetstack/cert-manager/releases/download/v1.11.4/cert-manager.yaml). It divides them into separate files and deploys using 3 controllers:
+The Operator uses the [upstream deployment manifests](https://github.com/jetstack/cert-manager/releases/download/v1.11.5/cert-manager.yaml). It divides them into separate files and deploys using 3 controllers:
 - [cert_manager_cainjector_deployment.go](pkg/controller/deployment/cert_manager_cainjector_deployment.go)
 - [cert_manager_controller_deployment.go](pkg/controller/deployment/cert_manager_controller_deployment.go)
 - [cert_manager_webhook_deployment.go](pkg/controller/deployment/cert_manager_webhook_deployment.go)

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

@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/component: cainjector
     app.kubernetes.io/instance: cert-manager
     app.kubernetes.io/name: cainjector
-    app.kubernetes.io/version: v1.11.4
+    app.kubernetes.io/version: v1.11.5
   name: cert-manager-cainjector
 rules:
   - apiGroups:

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

@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/component: cainjector
     app.kubernetes.io/instance: cert-manager
     app.kubernetes.io/name: cainjector
-    app.kubernetes.io/version: v1.11.4
+    app.kubernetes.io/version: v1.11.5
   name: cert-manager-cainjector
 roleRef:
   apiGroup: rbac.authorization.k8s.io

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

@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/component: cainjector
     app.kubernetes.io/instance: cert-manager
     app.kubernetes.io/name: cainjector
-    app.kubernetes.io/version: v1.11.4
+    app.kubernetes.io/version: v1.11.5
   name: cert-manager-cainjector
   namespace: cert-manager
 spec:
@@ -23,7 +23,7 @@ spec:
         app.kubernetes.io/component: cainjector
         app.kubernetes.io/instance: cert-manager
         app.kubernetes.io/name: cainjector
-        app.kubernetes.io/version: v1.11.4
+        app.kubernetes.io/version: v1.11.5
     spec:
       containers:
         - args:
@@ -36,7 +36,7 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-          image: quay.io/jetstack/cert-manager-cainjector:v1.11.4
+          image: quay.io/jetstack/cert-manager-cainjector:v1.11.5
           imagePullPolicy: IfNotPresent
           name: cert-manager-cainjector
           securityContext:

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

@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/component: cainjector
     app.kubernetes.io/instance: cert-manager
     app.kubernetes.io/name: cainjector
-    app.kubernetes.io/version: v1.11.4
+    app.kubernetes.io/version: v1.11.5
   name: cert-manager-cainjector:leaderelection
   namespace: kube-system
 roleRef:

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

@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/component: cainjector
     app.kubernetes.io/instance: cert-manager
     app.kubernetes.io/name: cainjector
-    app.kubernetes.io/version: v1.11.4
+    app.kubernetes.io/version: v1.11.5
   name: cert-manager-cainjector:leaderelection
   namespace: kube-system
 rules:

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

@@ -7,6 +7,6 @@ metadata:
     app.kubernetes.io/component: cainjector
     app.kubernetes.io/instance: cert-manager
     app.kubernetes.io/name: cainjector
-    app.kubernetes.io/version: v1.11.4
+    app.kubernetes.io/version: v1.11.5
   name: cert-manager-cainjector
   namespace: cert-manager

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

@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/component: cert-manager
     app.kubernetes.io/instance: cert-manager
     app.kubernetes.io/name: cert-manager
-    app.kubernetes.io/version: v1.11.4
+    app.kubernetes.io/version: v1.11.5
   name: cert-manager-controller-approve:cert-manager-io
 rules:
   - apiGroups:

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

@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/component: cert-manager
     app.kubernetes.io/instance: cert-manager
     app.kubernetes.io/name: cert-manager
-    app.kubernetes.io/version: v1.11.4
+    app.kubernetes.io/version: v1.11.5
   name: cert-manager-controller-approve:cert-manager-io
 roleRef:
   apiGroup: rbac.authorization.k8s.io

bindata/cert-manager-deployment/cert-manager/cert-manager-controller-certificatesigningrequests-cr.yaml

@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/component: cert-manager
     app.kubernetes.io/instance: cert-manager
     app.kubernetes.io/name: cert-manager
-    app.kubernetes.io/version: v1.11.4
+    app.kubernetes.io/version: v1.11.5
   name: cert-manager-controller-certificatesigningrequests
 rules:
   - apiGroups:

bindata/cert-manager-deployment/cert-manager/cert-manager-controller-certificatesigningrequests-crb.yaml

@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/component: cert-manager
     app.kubernetes.io/instance: cert-manager
     app.kubernetes.io/name: cert-manager
-    app.kubernetes.io/version: v1.11.4
+    app.kubernetes.io/version: v1.11.5
   name: cert-manager-controller-certificatesigningrequests
 roleRef:
   apiGroup: rbac.authorization.k8s.io

bindata/cert-manager-deployment/controller/cert-manager-controller-certificates-cr.yaml

@@ -6,7 +6,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.4
+    app.kubernetes.io/version: v1.11.5
   name: cert-manager-controller-certificates
 rules:
   - apiGroups:

bindata/cert-manager-deployment/controller/cert-manager-controller-certificates-crb.yaml

@@ -6,7 +6,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.4
+    app.kubernetes.io/version: v1.11.5
   name: cert-manager-controller-certificates
 roleRef:
   apiGroup: rbac.authorization.k8s.io

bindata/cert-manager-deployment/controller/cert-manager-controller-challenges-cr.yaml

@@ -6,7 +6,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.4
+    app.kubernetes.io/version: v1.11.5
   name: cert-manager-controller-challenges
 rules:
   - apiGroups:

bindata/cert-manager-deployment/controller/cert-manager-controller-challenges-crb.yaml

@@ -6,7 +6,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.4
+    app.kubernetes.io/version: v1.11.5
   name: cert-manager-controller-challenges
 roleRef:
   apiGroup: rbac.authorization.k8s.io

bindata/cert-manager-deployment/controller/cert-manager-controller-clusterissuers-cr.yaml

@@ -6,7 +6,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.4
+    app.kubernetes.io/version: v1.11.5
   name: cert-manager-controller-clusterissuers
 rules:
   - apiGroups:

bindata/cert-manager-deployment/controller/cert-manager-controller-clusterissuers-crb.yaml

@@ -6,7 +6,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.4
+    app.kubernetes.io/version: v1.11.5
   name: cert-manager-controller-clusterissuers
 roleRef:
   apiGroup: rbac.authorization.k8s.io

bindata/cert-manager-deployment/controller/cert-manager-controller-ingress-shim-cr.yaml

@@ -6,7 +6,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.4
+    app.kubernetes.io/version: v1.11.5
   name: cert-manager-controller-ingress-shim
 rules:
   - apiGroups:

bindata/cert-manager-deployment/controller/cert-manager-controller-ingress-shim-crb.yaml

@@ -6,7 +6,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.4
+    app.kubernetes.io/version: v1.11.5
   name: cert-manager-controller-ingress-shim
 roleRef:
   apiGroup: rbac.authorization.k8s.io

bindata/cert-manager-deployment/controller/cert-manager-controller-issuers-cr.yaml

@@ -6,7 +6,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.4
+    app.kubernetes.io/version: v1.11.5
   name: cert-manager-controller-issuers
 rules:
   - apiGroups:

bindata/cert-manager-deployment/controller/cert-manager-controller-issuers-crb.yaml

@@ -6,7 +6,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.4
+    app.kubernetes.io/version: v1.11.5
   name: cert-manager-controller-issuers
 roleRef:
   apiGroup: rbac.authorization.k8s.io

bindata/cert-manager-deployment/controller/cert-manager-controller-orders-cr.yaml

@@ -6,7 +6,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.4
+    app.kubernetes.io/version: v1.11.5
   name: cert-manager-controller-orders
 rules:
   - apiGroups:

bindata/cert-manager-deployment/controller/cert-manager-controller-orders-crb.yaml

@@ -6,7 +6,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.4
+    app.kubernetes.io/version: v1.11.5
   name: cert-manager-controller-orders
 roleRef:
   apiGroup: rbac.authorization.k8s.io

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

@@ -6,7 +6,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.4
+    app.kubernetes.io/version: v1.11.5
   name: cert-manager
   namespace: cert-manager
 spec:
@@ -27,14 +27,14 @@ spec:
         app.kubernetes.io/component: controller
         app.kubernetes.io/instance: cert-manager
         app.kubernetes.io/name: cert-manager
-        app.kubernetes.io/version: v1.11.4
+        app.kubernetes.io/version: v1.11.5
     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.4
+            - --acme-http01-solver-image=quay.io/jetstack/cert-manager-acmesolver:v1.11.5
             - --max-concurrent-challenges=60
           command:
             - /app/cmd/controller/controller
@@ -43,7 +43,7 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-          image: quay.io/jetstack/cert-manager-controller:v1.11.4
+          image: quay.io/jetstack/cert-manager-controller:v1.11.5
           imagePullPolicy: IfNotPresent
           name: cert-manager-controller
           ports:

bindata/cert-manager-deployment/controller/cert-manager-edit-cr.yaml

@@ -6,7 +6,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.4
+    app.kubernetes.io/version: v1.11.5
     rbac.authorization.k8s.io/aggregate-to-admin: "true"
     rbac.authorization.k8s.io/aggregate-to-edit: "true"
   name: cert-manager-edit

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

@@ -6,7 +6,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.4
+    app.kubernetes.io/version: v1.11.5
   name: cert-manager:leaderelection
   namespace: kube-system
 roleRef:

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

@@ -6,7 +6,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.4
+    app.kubernetes.io/version: v1.11.5
   name: cert-manager:leaderelection
   namespace: kube-system
 rules:

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

@@ -7,6 +7,6 @@ metadata:
     app.kubernetes.io/component: controller
     app.kubernetes.io/instance: cert-manager
     app.kubernetes.io/name: cert-manager
-    app.kubernetes.io/version: v1.11.4
+    app.kubernetes.io/version: v1.11.5
   name: cert-manager
   namespace: cert-manager

bindata/cert-manager-deployment/controller/cert-manager-svc.yaml

@@ -6,7 +6,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.4
+    app.kubernetes.io/version: v1.11.5
   name: cert-manager
   namespace: cert-manager
 spec:

bindata/cert-manager-deployment/controller/cert-manager-view-cr.yaml

@@ -6,7 +6,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.4
+    app.kubernetes.io/version: v1.11.5
     rbac.authorization.k8s.io/aggregate-to-admin: "true"
     rbac.authorization.k8s.io/aggregate-to-edit: "true"
     rbac.authorization.k8s.io/aggregate-to-view: "true"

bindata/cert-manager-deployment/webhook/cert-manager-webhook-configmap.yaml

@@ -7,6 +7,6 @@ metadata:
     app.kubernetes.io/component: webhook
     app.kubernetes.io/instance: cert-manager
     app.kubernetes.io/name: webhook
-    app.kubernetes.io/version: v1.11.4
+    app.kubernetes.io/version: v1.11.5
   name: cert-manager-webhook
   namespace: cert-manager

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

@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/component: webhook
     app.kubernetes.io/instance: cert-manager
     app.kubernetes.io/name: webhook
-    app.kubernetes.io/version: v1.11.4
+    app.kubernetes.io/version: v1.11.5
   name: cert-manager-webhook
   namespace: cert-manager
 spec:
@@ -23,7 +23,7 @@ spec:
         app.kubernetes.io/component: webhook
         app.kubernetes.io/instance: cert-manager
         app.kubernetes.io/name: webhook
-        app.kubernetes.io/version: v1.11.4
+        app.kubernetes.io/version: v1.11.5
     spec:
       containers:
         - args:
@@ -39,7 +39,7 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-          image: quay.io/jetstack/cert-manager-webhook:v1.11.4
+          image: quay.io/jetstack/cert-manager-webhook:v1.11.5
           imagePullPolicy: IfNotPresent
           livenessProbe:
             failureThreshold: 3

bindata/cert-manager-deployment/webhook/cert-manager-webhook-dynamic-serving-rb.yaml

@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/component: webhook
     app.kubernetes.io/instance: cert-manager
     app.kubernetes.io/name: webhook
-    app.kubernetes.io/version: v1.11.4
+    app.kubernetes.io/version: v1.11.5
   name: cert-manager-webhook:dynamic-serving
   namespace: cert-manager
 roleRef:

bindata/cert-manager-deployment/webhook/cert-manager-webhook-dynamic-serving-role.yaml

@@ -6,7 +6,7 @@ metadata:
     app.kubernetes.io/component: webhook
     app.kubernetes.io/instance: cert-manager
     app.kubernetes.io/name: webhook
-    app.kubernetes.io/version: v1.11.4
+    app.kubernetes.io/version: v1.11.5
   name: cert-manager-webhook:dynamic-serving
   namespace: cert-manager
 rules:

bindata/cert-manager-deployment/webhook/cert-manager-webhook-mutatingwebhookconfiguration.yaml

@@ -8,7 +8,7 @@ metadata:
     app.kubernetes.io/component: webhook
     app.kubernetes.io/instance: cert-manager
     app.kubernetes.io/name: webhook
-    app.kubernetes.io/version: v1.11.4
+    app.kubernetes.io/version: v1.11.5
   name: cert-manager-webhook
 webhooks:
   - admissionReviewVersions:

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

@@ -7,6 +7,6 @@ metadata:
     app.kubernetes.io/component: webhook
     app.kubernetes.io/instance: cert-manager
     app.kubernetes.io/name: webhook
-    app.kubernetes.io/version: v1.11.4
+    app.kubernetes.io/version: v1.11.5
   name: cert-manager-webhook
   namespace: cert-manager