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] openshift/cluster-ingress-operator#52
openshift · Oct 19, 2018 · 7a0c740 · 7a0c740
1 parent 38fb38e
commit 7a0c740
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git 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

diff --git a/terraform.tfvars b/terraform.tfvars