Merge pull request #735 from squeed/network-operator-overrides

cvo: remove (ignored) network-operator override
openshift · Nov 28, 2018 · 7e7c26f · 7e7c26f
2 parents 6971ab6 + 83825b9
commit 7e7c26f
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/data/data/manifests/bootkube/cvo-overrides.yaml.template b/data/data/manifests/bootkube/cvo-overrides.yaml.template
@@ -8,10 +8,6 @@ spec:
   channel: fast
   clusterID: {{.CVOClusterID}}
   overrides:
-  - kind: Deployment                    # this conflicts with kube-core-operator
-    namespace: openshift-cluster-network-operator
-    name: cluster-network-operator
-    unmanaged: true
   - kind: APIService                    # packages.apps.redhat.com fails to start properly
     name: v1alpha1.packages.apps.redhat.com
     unmanaged: true
diff --git a/data/data/manifests/bootkube/legacy-cvo-overrides.yaml.template b/data/data/manifests/bootkube/legacy-cvo-overrides.yaml.template
@@ -7,10 +7,6 @@ upstream: http://localhost:8080/graph
 channel: fast
 clusterID: {{.CVOClusterID}}
 overrides:
-- kind: Deployment                    # this conflicts with kube-core-operator
-  namespace: openshift-cluster-network-operator
-  name: cluster-network-operator
-  unmanaged: true
 - kind: APIService                    # packages.apps.redhat.com fails to start properly
   name: v1alpha1.packages.apps.redhat.com
   unmanaged: true