WIP - Move tectonic-ingress to openshift-ingress

config.tf

@@ -70,7 +70,7 @@ variable "tectonic_container_images" {
     tectonic_channel_operator            = "quay.io/coreos/tectonic-channel-operator-dev:df42b97af403702013f4739fc82cd005cfd0c766"
     kube_addon_operator                  = "quay.io/coreos/kube-addon-operator-dev:df42b97af403702013f4739fc82cd005cfd0c766"
     tectonic_alm_operator                = "quay.io/coreos/tectonic-alm-operator:v0.3.1"
-    tectonic_ingress_controller_operator = "quay.io/coreos/tectonic-ingress-controller-operator-dev:df42b97af403702013f4739fc82cd005cfd0c766"
+    tectonic_ingress_controller_operator = "registry.svc.ci.openshift.org/clayton-dev/tectonic-ingress-controller-operator-dev:cc7977c70a011c3e08dc4d7c4a1cfa1518da82b4-dirty"
     tectonic_utility_operator            = "quay.io/coreos/tectonic-utility-operator-dev:df42b97af403702013f4739fc82cd005cfd0c766"
     tectonic_network_operator            = "quay.io/coreos/tectonic-network-operator-dev:df42b97af403702013f4739fc82cd005cfd0c766"
   }

modules/bootkube/resources/manifests/02-ingress-namespace.yaml

@@ -2,9 +2,9 @@ apiVersion: v1
 kind: Namespace
 metadata:
   # This is the namespace used to hold the tectonic ingress controllers
-  name: tectonic-ingress
+  name: openshift-ingress
   # Give the namespace a label, so we can select for it in networkpolicy
   labels:
     kubernetes.io/ingress.class: tectonic
-    name: tectonic-ingress
+    name: openshift-ingress
     openshift.io/run-level: "1"

modules/tectonic/resources/manifests/ingress/cluster-config.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: cluster-config-v1
-  namespace: tectonic-ingress
+  namespace: openshift-ingress
 data:
   ingress-config: |
     apiVersion: v1

modules/tectonic/resources/manifests/ingress/pull.json

@@ -3,7 +3,7 @@
   "kind": "Secret",
   "type": "kubernetes.io/dockerconfigjson",
   "metadata": {
-    "namespace": "tectonic-ingress",
+    "namespace": "openshift-ingress",
     "name": "coreos-pull-secret"
   },
   "data": {

modules/tectonic/resources/manifests/ingress/svc-account.yaml

@@ -2,4 +2,4 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: tectonic-ingress-controller-operator
-  namespace: tectonic-ingress
+  namespace: openshift-ingress

modules/tectonic/resources/manifests/rbac/binding-admin.yaml

@@ -7,7 +7,7 @@ subjects:
     namespace: tectonic-system
     name: default
   - kind: ServiceAccount
-    namespace: tectonic-ingress
+    namespace: openshift-ingress
     name: tectonic-ingress-controller-operator
 roleRef:
   kind: ClusterRole

modules/tectonic/resources/manifests/secrets/ingress-tls.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: tectonic-ingress-tls
-  namespace: tectonic-ingress
+  namespace: openshift-ingress
 type: Opaque
 data:
   tls.crt: ${ingress_tls_cert}

modules/tectonic/resources/manifests/security/priviledged-scc-tectonic.yaml

@@ -16,7 +16,7 @@ fsGroup:
   type: RunAsAny
 groups:
 - system:serviceaccounts:tectonic-system
-- system:serviceaccounts:tectonic-ingress
+- system:serviceaccounts:openshift-ingress
 readOnlyRootFilesystem: false
 runAsUser:
   type: RunAsAny

modules/tectonic/resources/manifests/updater/operators/tectonic-ingress-controller-operator.yaml

@@ -2,7 +2,7 @@ apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   name: tectonic-ingress-controller-operator
-  namespace: tectonic-ingress
+  namespace: openshift-ingress
   labels:
     k8s-app: tectonic-ingress-controller-operator
     managed-by-channel-operator: "true"