From 006929a25d93db0129d1c7f5db21ec0ac18369c3 Mon Sep 17 00:00:00 2001 From: Dan Mace Date: Fri, 19 Oct 2018 11:47:29 -0400 Subject: [PATCH] Re-disable the cluster-ingress-operator Fix the cluster-ingress-operator override to match the cluster-ingress-operator's new namespace and deployment name[1]. [1] https://github.com/openshift/cluster-ingress-operator/pull/52 --- pkg/asset/manifests/content/bootkube/cvo-overrides.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/asset/manifests/content/bootkube/cvo-overrides.go b/pkg/asset/manifests/content/bootkube/cvo-overrides.go index ed29b8b9389..9e0bb660933 100644 --- a/pkg/asset/manifests/content/bootkube/cvo-overrides.go +++ b/pkg/asset/manifests/content/bootkube/cvo-overrides.go @@ -24,8 +24,8 @@ overrides: name: cluster-network-operator unmanaged: true - kind: Deployment # this conflicts with tectonic-ingress-controller-operator - namespace: openshift-cluster-ingress-operator - name: cluster-ingress-operator + namespace: openshift-ingress-operator + name: ingress-operator unmanaged: true - kind: ServiceAccount # missing run level 0 on the namespace and has 0000_08 namespace: openshift-cluster-dns-operator