Merge pull request #627 from openshift-bot/synchronize-upstream

NO-ISSUE: Synchronize From Upstream Repositories

Author: ncdc

go.mod

@@ -85,7 +85,6 @@ require (
 	github.com/felixge/httpsnoop v1.0.3 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/fvbommel/sortorder v1.0.1 // indirect
-	github.com/ghodss/yaml v1.0.0 // indirect
 	github.com/go-air/gini v1.0.4 // indirect
 	github.com/go-errors/errors v1.4.2 // indirect
 	github.com/go-git/gcfg v1.5.0 // indirect

manifests/0000_50_olm_07-olm-operator.deployment.ibm-cloud-managed.yaml

@@ -10,7 +10,7 @@ metadata:
     capability.openshift.io/name: "OperatorLifecycleManager"
 spec:
   strategy:
-    type: RollingUpdate
+    type: Recreate
   replicas: 1
   selector:
     matchLabels:

manifests/0000_50_olm_07-olm-operator.deployment.yaml

@@ -10,7 +10,7 @@ metadata:
     capability.openshift.io/name: "OperatorLifecycleManager"
 spec:
   strategy:
-    type: RollingUpdate
+    type: Recreate
   replicas: 1
   selector:
     matchLabels:

manifests/0000_50_olm_08-catalog-operator.deployment.ibm-cloud-managed.yaml

@@ -10,7 +10,7 @@ metadata:
     capability.openshift.io/name: "OperatorLifecycleManager"
 spec:
   strategy:
-    type: RollingUpdate
+    type: Recreate
   replicas: 1
   selector:
     matchLabels:

manifests/0000_50_olm_08-catalog-operator.deployment.yaml

@@ -10,7 +10,7 @@ metadata:
     capability.openshift.io/name: "OperatorLifecycleManager"
 spec:
   strategy:
-    type: RollingUpdate
+    type: Recreate
   replicas: 1
   selector:
     matchLabels:

microshift-manifests/0000_50_olm_07-olm-operator.deployment.ibm-cloud-managed.yaml

@@ -10,7 +10,7 @@ metadata:
     capability.openshift.io/name: "OperatorLifecycleManager"
 spec:
   strategy:
-    type: RollingUpdate
+    type: Recreate
   replicas: 1
   selector:
     matchLabels:

microshift-manifests/0000_50_olm_07-olm-operator.deployment.yaml

@@ -10,7 +10,7 @@ metadata:
     capability.openshift.io/name: "OperatorLifecycleManager"
 spec:
   strategy:
-    type: RollingUpdate
+    type: Recreate
   replicas: 1
   selector:
     matchLabels:

microshift-manifests/0000_50_olm_08-catalog-operator.deployment.ibm-cloud-managed.yaml

@@ -10,7 +10,7 @@ metadata:
     capability.openshift.io/name: "OperatorLifecycleManager"
 spec:
   strategy:
-    type: RollingUpdate
+    type: Recreate
   replicas: 1
   selector:
     matchLabels:

microshift-manifests/0000_50_olm_08-catalog-operator.deployment.yaml

@@ -10,7 +10,7 @@ metadata:
     capability.openshift.io/name: "OperatorLifecycleManager"
 spec:
   strategy:
-    type: RollingUpdate
+    type: Recreate
   replicas: 1
   selector:
     matchLabels:

staging/operator-lifecycle-manager/deploy/chart/templates/0000_50_olm_07-olm-operator.deployment.yaml

@@ -7,7 +7,7 @@ metadata:
     app: olm-operator
 spec:
   strategy:
-    type: RollingUpdate
+    type: Recreate
   replicas: {{ .Values.olm.replicaCount }}
   selector:
     matchLabels: