Merge pull request #430 from deads2k/enable-openshift

update to allow openshift operator to run
openshift · Oct 9, 2018 · 3e27597 · 3e27597
2 parents c033120 + 7807875
commit 3e27597
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/pkg/asset/manifests/content/bootkube/cvo-overrides.go b/pkg/asset/manifests/content/bootkube/cvo-overrides.go
@@ -31,14 +31,6 @@ overrides:
   namespace: openshift-core-operators
   name: openshift-cluster-kube-controller-manager-operator
   unmanaged: true
-- kind: Deployment                    # this conflicts with kube-core-operator
-  namespace: openshift-core-operators
-  name: openshift-cluster-openshift-apiserver-operator
-  unmanaged: true
-- kind: Deployment                    # this conflicts with kube-core-operator
-  namespace: openshift-core-operators
-  name: openshift-cluster-openshift-controller-manager-operator
-  unmanaged: true
 - kind: Deployment                    # this conflicts with kube-core-operator
   namespace: openshift-cluster-network-operator
   name: cluster-network-operator