Merge pull request #302 from PillaiManish/cm-662

CM-662:  Upstream bump for v1.18.x and rebase for v1.18.0 release

Author: openshift-merge-bot[bot]

Makefile

@@ -3,16 +3,16 @@
 # 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.17.0
-CERT_MANAGER_VERSION ?= "v1.17.4"
+BUNDLE_VERSION ?= 1.18.0
+CERT_MANAGER_VERSION ?= "v1.18.2"
 ISTIO_CSR_VERSION ?= "v0.14.2"
 
 # 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")
 # To re-generate a bundle for other specific channels without changing the standard setup, you can:
 # - use the CHANNELS as arg of the bundle target (e.g make bundle CHANNELS=candidate,fast,stable)
 # - use environment variables to overwrite this value (e.g export CHANNELS="candidate,fast,stable")
-CHANNELS ?= "stable-v1,stable-v1.17"
+CHANNELS ?= "stable-v1,stable-v1.18"
 ifneq ($(origin CHANNELS), undefined)
 BUNDLE_CHANNELS := --channels=$(CHANNELS)
 endif

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.17.4
+    app.kubernetes.io/version: v1.18.2
   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.17.4
+    app.kubernetes.io/version: v1.18.2
   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.17.4
+    app.kubernetes.io/version: v1.18.2
   name: cert-manager-cainjector
   namespace: cert-manager
 spec:
@@ -27,7 +27,7 @@ spec:
         app.kubernetes.io/component: cainjector
         app.kubernetes.io/instance: cert-manager
         app.kubernetes.io/name: cainjector
-        app.kubernetes.io/version: v1.17.4
+        app.kubernetes.io/version: v1.18.2
     spec:
       containers:
         - args:
@@ -40,7 +40,7 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-          image: quay.io/jetstack/cert-manager-cainjector:v1.17.4
+          image: quay.io/jetstack/cert-manager-cainjector:v1.18.2
           imagePullPolicy: IfNotPresent
           name: cert-manager-cainjector
           ports:

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.17.4
+    app.kubernetes.io/version: v1.18.2
   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.17.4
+    app.kubernetes.io/version: v1.18.2
   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.17.4
+    app.kubernetes.io/version: v1.18.2
   name: cert-manager-cainjector
   namespace: cert-manager

bindata/cert-manager-deployment/cainjector/cert-manager-cainjector-svc.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.17.4
+    app.kubernetes.io/version: v1.18.2
   name: cert-manager-cainjector
   namespace: cert-manager
 spec:

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.17.4
+    app.kubernetes.io/version: v1.18.2
   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.17.4
+    app.kubernetes.io/version: v1.18.2
   name: cert-manager-controller-approve:cert-manager-io
 roleRef:
   apiGroup: rbac.authorization.k8s.io