diff --git a/assets/defaults/cluster-ingress.yaml b/assets/defaults/cluster-ingress.yaml index c5ae259b6d..e667d018ae 100644 --- a/assets/defaults/cluster-ingress.yaml +++ b/assets/defaults/cluster-ingress.yaml @@ -4,7 +4,7 @@ kind: ClusterIngress apiVersion: ingress.openshift.io/v1alpha1 metadata: name: default - namespace: openshift-cluster-ingress-operator + namespace: openshift-ingress-operator finalizers: # Ensure that only the operator can delete the default cluster ingress object. finalizers: diff --git a/assets/router/cluster-role-binding.yaml b/assets/router/cluster-role-binding.yaml index 67a95635f7..f093e1107e 100644 --- a/assets/router/cluster-role-binding.yaml +++ b/assets/router/cluster-role-binding.yaml @@ -2,14 +2,12 @@ kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: - name: cluster-ingress:router + name: openshift-ingress-router subjects: - kind: ServiceAccount name: router - namespace: openshift-cluster-ingress-router + namespace: openshift-ingress roleRef: kind: ClusterRole - name: cluster-ingress:router - namespace: openshift-cluster-ingress-router -userNames: -- "system:serviceaccount:openshift-cluster-ingress-router:router" + name: openshift-ingress-router + namespace: openshift-ingress diff --git a/assets/router/cluster-role.yaml b/assets/router/cluster-role.yaml index 9a8a91a3c0..ae1322d30d 100644 --- a/assets/router/cluster-role.yaml +++ b/assets/router/cluster-role.yaml @@ -2,7 +2,7 @@ kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: - name: cluster-ingress:router + name: openshift-ingress-router rules: - apiGroups: - "" diff --git a/assets/router/daemonset.yaml b/assets/router/daemonset.yaml index 1645a416ea..167420a395 100644 --- a/assets/router/daemonset.yaml +++ b/assets/router/daemonset.yaml @@ -4,7 +4,7 @@ kind: DaemonSet apiVersion: apps/v1 metadata: # Name is set at runtime. - namespace: openshift-cluster-ingress-router + namespace: openshift-ingress labels: app: router spec: @@ -38,7 +38,7 @@ spec: - name: STATS_PORT value: "1936" - name: ROUTER_SERVICE_NAMESPACE - value: openshift-cluster-ingress-router + value: openshift-ingress livenessProbe: initialDelaySeconds: 10 httpGet: diff --git a/assets/router/namespace.yaml b/assets/router/namespace.yaml index a799ab52e0..7dbf2adcf0 100644 --- a/assets/router/namespace.yaml +++ b/assets/router/namespace.yaml @@ -1,7 +1,7 @@ kind: Namespace apiVersion: v1 metadata: - name: openshift-cluster-ingress-router + name: openshift-ingress annotations: openshift.io/node-selector: "" labels: diff --git a/assets/router/service-account.yaml b/assets/router/service-account.yaml index f6c1aceafa..9cbf829fcd 100644 --- a/assets/router/service-account.yaml +++ b/assets/router/service-account.yaml @@ -4,4 +4,4 @@ kind: ServiceAccount apiVersion: v1 metadata: name: router - namespace: openshift-cluster-ingress-router + namespace: openshift-ingress diff --git a/assets/router/service-cloud.yaml b/assets/router/service-cloud.yaml index 8f1393b410..b0d0a08b9c 100644 --- a/assets/router/service-cloud.yaml +++ b/assets/router/service-cloud.yaml @@ -4,7 +4,7 @@ kind: Service apiVersion: v1 metadata: # Name is set at runtime. - namespace: openshift-cluster-ingress-router + namespace: openshift-ingress labels: app: router spec: diff --git a/hack/uninstall.sh b/hack/uninstall.sh index a5a47cad3d..dcbd009092 100755 --- a/hack/uninstall.sh +++ b/hack/uninstall.sh @@ -4,15 +4,14 @@ set -uo pipefail # Disable the CVO oc patch -n openshift-cluster-version daemonsets/cluster-version-operator --patch '{"spec": {"template": {"spec": {"nodeSelector": {"node-role.kubernetes.io/fake": ""}}}}}' -# Uninstall tectonic ingress -oc delete namespaces/openshift-ingress - # Uninstall the cluster-ingress-operator -oc delete --force --grace-period 0 -n openshift-cluster-ingress-operator clusteringresses/default -oc delete namespaces/openshift-cluster-ingress-operator -oc delete namespaces/openshift-cluster-ingress-router -oc delete clusterroles/cluster-ingress-operator:operator -oc delete clusterroles/cluster-ingress:router -oc delete clusterrolebindings/cluster-ingress-operator:operator -oc delete clusterrolebindings/cluster-ingress:router +oc delete -n openshift-ingress-operator deployments/ingress-operator +oc patch -n openshift-ingress-operator clusteringresses/default --patch '{"metadata":{"finalizers": []}}' --type=merge +oc delete --force --grace-period=0 -n openshift-ingress-operator clusteringresses/default +oc delete namespaces/openshift-ingress-operator +oc delete namespaces/openshift-ingress +oc delete clusterroles/openshift-ingress-operator +oc delete clusterroles/openshift-ingress-router +oc delete clusterrolebindings/openshift-ingress-operator +oc delete clusterrolebindings/openshift-ingress-router oc delete customresourcedefinition.apiextensions.k8s.io/clusteringresses.ingress.openshift.io diff --git a/manifests/00-cluster-role.yaml b/manifests/00-cluster-role.yaml index dc10dabd31..118d3f099c 100644 --- a/manifests/00-cluster-role.yaml +++ b/manifests/00-cluster-role.yaml @@ -2,7 +2,7 @@ kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: - name: cluster-ingress-operator:operator + name: openshift-ingress-operator rules: - apiGroups: - "" diff --git a/manifests/00-namespace.yaml b/manifests/00-namespace.yaml index 4709b46a1c..7ba19875ed 100644 --- a/manifests/00-namespace.yaml +++ b/manifests/00-namespace.yaml @@ -1,7 +1,7 @@ kind: Namespace apiVersion: v1 metadata: - name: openshift-cluster-ingress-operator + name: openshift-ingress-operator labels: # set value to avoid depending on kube admission that depends on openshift apis openshift.io/run-level: "0" diff --git a/manifests/01-cluster-role-binding.yaml b/manifests/01-cluster-role-binding.yaml index aadc955d3a..6ce56527aa 100644 --- a/manifests/01-cluster-role-binding.yaml +++ b/manifests/01-cluster-role-binding.yaml @@ -2,12 +2,12 @@ kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: - name: cluster-ingress-operator:operator + name: openshift-ingress-operator subjects: - kind: ServiceAccount - name: cluster-ingress-operator - namespace: openshift-cluster-ingress-operator + name: ingress-operator + namespace: openshift-ingress-operator roleRef: kind: ClusterRole apiGroup: rbac.authorization.k8s.io - name: cluster-ingress-operator:operator + name: openshift-ingress-operator diff --git a/manifests/01-role-binding.yaml b/manifests/01-role-binding.yaml index a47c1345ff..9dba452227 100644 --- a/manifests/01-role-binding.yaml +++ b/manifests/01-role-binding.yaml @@ -2,13 +2,13 @@ kind: RoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: - name: cluster-ingress-operator - namespace: openshift-cluster-ingress-operator + name: ingress-operator + namespace: openshift-ingress-operator subjects: - kind: ServiceAccount - name: cluster-ingress-operator - namespace: openshift-cluster-ingress-operator + name: ingress-operator + namespace: openshift-ingress-operator roleRef: kind: Role apiGroup: rbac.authorization.k8s.io - name: cluster-ingress-operator + name: ingress-operator diff --git a/manifests/01-role.yaml b/manifests/01-role.yaml index 80e1945673..539a44c61a 100644 --- a/manifests/01-role.yaml +++ b/manifests/01-role.yaml @@ -2,8 +2,8 @@ kind: Role apiVersion: rbac.authorization.k8s.io/v1 metadata: - name: cluster-ingress-operator - namespace: openshift-cluster-ingress-operator + name: ingress-operator + namespace: openshift-ingress-operator rules: - apiGroups: - ingress.openshift.io diff --git a/manifests/01-service-account.yaml b/manifests/01-service-account.yaml index edafc320ea..d6c56665be 100644 --- a/manifests/01-service-account.yaml +++ b/manifests/01-service-account.yaml @@ -3,5 +3,5 @@ kind: ServiceAccount apiVersion: v1 metadata: - name: cluster-ingress-operator - namespace: openshift-cluster-ingress-operator + name: ingress-operator + namespace: openshift-ingress-operator diff --git a/manifests/02-deployment.yaml b/manifests/02-deployment.yaml index 46619a36bc..68f70ff969 100644 --- a/manifests/02-deployment.yaml +++ b/manifests/02-deployment.yaml @@ -1,20 +1,20 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: cluster-ingress-operator - namespace: openshift-cluster-ingress-operator + name: ingress-operator + namespace: openshift-ingress-operator spec: replicas: 1 selector: matchLabels: - name: cluster-ingress-operator + name: ingress-operator template: metadata: labels: - name: cluster-ingress-operator + name: ingress-operator spec: containers: - - name: cluster-ingress-operator + - name: ingress-operator image: openshift/origin-cluster-ingress-operator:latest ports: - containerPort: 60000 @@ -27,5 +27,5 @@ spec: fieldRef: fieldPath: metadata.namespace - name: OPERATOR_NAME - value: "cluster-ingress-operator" - serviceAccountName: cluster-ingress-operator + value: ingress-operator + serviceAccountName: ingress-operator diff --git a/pkg/manifests/bindata.go b/pkg/manifests/bindata.go index 297c8aa51e..0d2af7ae3c 100644 --- a/pkg/manifests/bindata.go +++ b/pkg/manifests/bindata.go @@ -83,7 +83,7 @@ func (fi bindataFileInfo) Sys() interface{} { return nil } -var _assetsDefaultsClusterIngressYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x6c\x91\x31\x8f\x9b\x40\x10\x85\x7b\x7e\xc5\x93\x5d\x43\x74\x2d\x5d\x94\xa4\x38\x29\x45\xa4\x48\xe9\xc7\xcb\xc3\x4c\xbc\xcc\xae\x76\x07\x9f\x9c\x5f\x1f\x71\x40\x0a\xe7\x4a\x9e\x86\x6f\xbe\x7d\x73\xc6\x97\xb8\x54\x67\x79\xb5\x6b\x61\xad\x78\x53\x9f\x30\x70\x94\x25\x3a\xee\x12\x17\xd6\xe6\x8c\x57\xab\x2e\x31\xb2\x20\x24\x1b\xf5\x8a\x9a\x19\x74\xd4\xb0\x8f\x40\x0a\x21\x39\x47\xe5\x00\x71\x94\xc5\x5c\x67\x76\xcd\x4d\x6d\xe8\x9f\x76\x34\x92\xf5\x17\x4b\xd5\x64\x3d\x74\xcb\xba\x94\x69\x75\xd2\xd1\x3b\x4d\x9f\xee\x2f\x12\xf3\x24\x2f\xcd\x4c\x97\x41\x5c\xfa\x06\x30\x99\xd9\x1f\x6a\xfb\x77\xcd\x12\xd8\xe3\xdf\xcf\x6d\xd8\x36\xb5\x3b\xb6\x4d\x99\x45\x3c\x95\x06\x18\xd5\x24\xea\x1f\x96\xba\xd2\xce\xf8\x66\x75\x29\x84\x4f\xe2\x48\x16\x1f\xf0\x89\x38\xe6\x11\xc4\x30\x30\xd2\xf9\x9e\x1f\x8d\xec\xfc\x43\x1b\xe9\xf2\x9b\xc1\xbb\xff\xf0\xed\xc7\x0f\xdb\x31\xcf\x9a\xcd\x5a\xe7\x66\xb5\x77\xf4\x35\xcd\xa2\x06\xad\x1f\xb4\x8a\xa5\xaa\x5d\xdf\xb5\xf4\xe9\x2e\xab\x88\xa5\x81\x3f\xa2\x04\xce\x34\x5f\xa1\x5b\xf4\x93\x91\xc1\x53\xd9\x12\x60\x16\x0f\xd3\x77\xb9\x30\xd6\x23\x02\x4e\xeb\x64\x5b\x52\x64\x77\x5b\x2e\x2c\x46\x67\x5d\xc5\xdf\x52\xb9\xb1\x9c\x7a\x9c\x4e\x0d\x30\xe9\x75\xfa\x7c\x17\x8d\x72\xd1\xa8\xfe\xd8\x00\xfe\xc8\x5c\x6f\x9d\x96\xa1\xf9\x1b\x00\x00\xff\xff\x3c\x82\x14\x4d\x58\x02\x00\x00") +var _assetsDefaultsClusterIngressYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x6c\x91\x31\x8f\x9b\x40\x10\x85\x7b\x7e\xc5\x93\x5d\x43\x74\x2d\x5d\x94\xa4\x38\x29\x45\xa4\x48\xe9\xc7\xcb\xc3\x4c\xbc\xcc\xae\x76\x07\x9f\x9c\x5f\x1f\x71\x40\x8a\x8b\x4b\x9e\x86\x6f\xbf\x79\x73\xc6\x97\xb8\x54\x67\x79\xb5\x6b\x61\xad\x78\x53\x9f\x30\x70\x94\x25\x3a\xee\x12\x17\xd6\xe6\x8c\x57\xab\x2e\x31\xb2\x20\x24\x1b\xf5\x8a\x9a\x19\x74\xd4\xb0\x8f\x40\x0a\x21\x39\x47\xe5\x00\x71\x94\xc5\x5c\x67\x76\xcd\x4d\x6d\xe8\x3f\xbc\xd1\x48\xd6\x5f\x2c\x55\x93\xf5\xd0\x2d\xeb\x52\xa6\xd5\x49\x47\xef\x34\x7d\xba\xbf\x48\xcc\x93\xbc\x34\x33\x5d\x06\x71\xe9\x1b\xc0\x64\x66\x7f\xa8\xed\xdf\x35\x4b\x60\x8f\x7f\x3f\xb7\x3b\xae\x4d\x99\x45\x3c\x95\x06\x18\xd5\x24\xea\x1f\x96\xba\x52\xce\xf8\x66\x75\x29\x84\x4f\xe2\x48\x16\x1f\xf0\x89\x38\xe6\x11\xc4\x30\x30\xd2\xf9\x9e\x1f\x4d\x84\x6d\x83\x43\x17\xe9\xf2\x9b\xc1\xbb\xff\xf0\xed\xf3\x85\x76\x4c\xbb\x63\x0e\xcd\x66\xad\x71\xb3\xda\xbb\xf9\x9a\x66\x51\x83\xd6\x27\x6d\x62\xa9\x6a\xd7\x77\x2d\xfd\x70\x8f\x55\xc4\xd2\xc0\x1f\x51\x02\x67\x9a\xaf\xd0\x2d\xfa\xc9\xc8\xe0\xa9\x6c\x09\x30\x8b\x87\xe9\xbb\x5c\x18\xeb\x11\x01\xa7\x75\xb2\x2d\x29\xb2\xbb\x2d\x17\x16\xa3\xb3\xae\xe2\x6f\xa9\xdc\x58\x4e\x3d\x4e\xa7\x06\x98\xf4\x3a\x7d\xbe\x8b\x46\xb9\x68\x54\x7f\x6c\x00\x7f\x64\xae\x37\x4e\xcb\xd0\xfc\x0d\x00\x00\xff\xff\xbb\x91\xf4\xc5\x50\x02\x00\x00") func assetsDefaultsClusterIngressYamlBytes() ([]byte, error) { return bindataRead( @@ -98,12 +98,12 @@ func assetsDefaultsClusterIngressYaml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "assets/defaults/cluster-ingress.yaml", size: 600, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "assets/defaults/cluster-ingress.yaml", size: 592, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } -var _assetsRouterClusterRoleBindingYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x94\x8f\x31\x4f\xc4\x30\x0c\x85\xf7\xfc\x0a\xeb\x98\x5b\xc4\x86\xb2\x01\x3b\xc3\x21\xb1\xfb\x52\xdf\xd5\x5c\x1b\x57\xb6\x73\x12\xfc\x7a\x14\x25\x62\x80\xa1\x62\xb4\xf4\xfc\xde\xf7\xdd\xc1\x33\xe7\xc9\xc0\x67\x02\x95\xe2\xa4\xa0\xb2\x10\xb8\x00\xbb\xc1\x1b\xe9\x8d\x13\xc1\x53\x4a\x52\xb2\x8f\xe1\xca\x79\x8a\xf0\xb2\x14\x73\xd2\xa3\x2c\x54\xdf\x39\x5f\x02\x6e\xfc\x4e\x6a\x2c\x39\x82\x9e\x30\x8d\x58\x7c\x16\xe5\x2f\x74\x96\x3c\x5e\x1f\x6d\x64\xb9\xbf\x3d\x84\x95\x1c\x27\x74\x8c\x01\x20\xe3\x4a\x11\x52\x6b\x1b\x38\x5f\x94\xcc\x62\xe3\x08\x56\x4e\x1f\x94\xdc\x62\x18\xa0\xcd\x76\x9a\x0e\xf3\xf3\xdf\xf3\xed\xb4\x0d\x13\x45\x90\x8d\xb2\xcd\x7c\xf6\xe1\x57\xfb\xd0\xd3\xd5\xf2\x48\xe7\x4a\xf1\xc7\x69\x8f\xec\x7f\x4b\xc5\x48\x5f\x6b\xbe\x8a\x1c\xec\xd3\x9c\xd6\x68\x4d\x05\x9b\x4a\xdc\x2b\xe9\xcb\x87\xf0\x1d\x00\x00\xff\xff\x23\x98\xf9\xf1\xb0\x01\x00\x00") +var _assetsRouterClusterRoleBindingYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x84\x8f\x31\x4e\xc4\x40\x0c\x45\xfb\x39\x85\x25\xea\x0c\xa2\x43\xd3\x01\x37\x58\x24\x7a\xef\xc4\xbb\x31\x49\xec\xc8\xf6\xa4\xe0\xf4\x28\x4a\x44\xc3\x4a\x29\x2d\xf9\xbf\xff\xfe\x13\xbc\xb3\xf4\x0e\x31\x10\x98\xb6\x20\x03\xd3\x89\x20\x14\x38\x1c\x3e\xc9\x56\xae\x04\x6f\xb5\x6a\x93\xc8\x69\x64\xe9\x0b\x7c\x4c\xcd\x83\xec\xa2\x13\x6d\x71\x96\x7b\xc2\x85\xbf\xc8\x9c\x55\x0a\xd8\x15\x6b\xc6\x16\x83\x1a\xff\x60\xb0\x4a\x1e\x5f\x3d\xb3\x3e\xaf\x2f\x69\xa6\xc0\x1e\x03\x4b\x02\x10\x9c\xa9\x80\x2e\x24\x3e\xf0\x2d\x3a\x96\xbb\x91\x7b\xb7\x9b\x24\x6f\xd7\x6f\xaa\xe1\x25\x75\xb0\x17\x1f\x3e\x87\xce\x1f\xe1\xf8\xdf\x4f\x5f\xb0\x3e\xa2\xa6\x6d\xd8\x85\x6e\x5b\xf1\xbf\x19\xe7\x32\x27\xf0\xdf\x00\x00\x00\xff\xff\x83\x13\xa9\xa6\x49\x01\x00\x00") func assetsRouterClusterRoleBindingYamlBytes() ([]byte, error) { return bindataRead( @@ -118,12 +118,12 @@ func assetsRouterClusterRoleBindingYaml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "assets/router/cluster-role-binding.yaml", size: 432, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "assets/router/cluster-role-binding.yaml", size: 329, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } -var _assetsRouterClusterRoleYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x91\x31\x6f\xe3\x30\x0c\x85\x77\xfd\x0a\x22\x37\xdb\xc1\x6d\x07\xad\x37\xdc\x1e\x1c\xba\xd3\x32\x53\xb3\x51\x44\x81\xa4\x1c\xa0\xbf\xbe\xb0\x9d\xa0\x41\x8b\x0e\x29\xba\xe9\x41\x78\x8f\xdf\x23\x7f\xc1\xdf\xdc\xcc\x49\xc1\x92\x54\x1a\x41\x25\x13\x1c\x45\x41\xa5\x39\xa9\xf5\xf0\x7f\x62\x03\x9b\xa4\xe5\x11\x06\x02\x34\x50\x32\x57\x4e\xce\xf3\x2a\xab\x98\xf1\x90\xa9\x0f\x27\x2e\x63\xbc\x25\x1e\x24\x53\xc0\xca\x4f\xa4\xc6\x52\x22\xe8\x80\xa9\xc7\xe6\x93\x28\xbf\xa2\xb3\x94\xfe\xf4\xc7\x7a\x96\xfd\xfc\x3b\x9c\xc9\x71\x44\xc7\x18\x00\x0a\x9e\x29\x42\xda\x62\x3a\x2e\xcf\x4a\x66\x71\x03\x0a\xda\x32\x59\x0c\x1d\x60\xe5\x7f\x2a\xad\xda\x62\xe9\x60\xb7\x0b\x00\xe8\xae\x3c\x34\xa7\xc3\x0d\x51\x8a\x45\x28\x2d\xe7\x00\x0b\xb7\x34\x4d\x74\x75\x50\x19\xab\x70\x71\x5b\xd5\x32\xd4\x2a\x26\xda\xa4\x91\xce\xbc\x89\x99\x74\xb8\x5a\x32\x9b\xaf\x8f\x0b\x7a\x9a\x3e\x43\x2c\xed\xa8\x38\xa7\xfb\x7a\x8f\x72\xb9\x9c\xa8\x28\xcd\x4c\x97\x2b\x4b\x1b\x5e\x28\x39\xa6\x44\x66\xef\x1f\x77\x5c\x49\x09\x9d\xbe\x58\x4a\xb7\xdd\xb2\x97\x4a\xc5\x26\x3e\xfa\x37\x98\xd6\x84\x07\x97\xf1\xc3\xc3\xf7\xe6\xe8\xed\x03\x43\xab\xe3\x52\xfc\x2d\x00\x00\xff\xff\x14\x2b\x2f\xcf\xc7\x02\x00\x00") +var _assetsRouterClusterRoleYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x91\x31\x4f\xc3\x40\x0c\x85\xf7\xfb\x15\x56\x99\x93\x8a\x0d\x65\x65\x60\xaf\x10\xbb\x73\x71\x89\xe9\xf5\x7c\xb2\x7d\xa9\xc4\xaf\x47\x49\x5a\xa8\x40\x0c\x45\x6c\xf7\x74\x7a\xf6\xf7\x9e\xef\xe0\x31\x55\x73\x52\xb0\x28\x85\x06\x50\x49\x04\x7b\x51\x50\xa9\x4e\x6a\x2d\x3c\x8f\x6c\x60\xa3\xd4\x34\x40\x4f\x80\x06\x4a\xe6\xca\xd1\x79\x5a\x64\x11\x33\xee\x13\xb5\xe1\xc0\x79\xe8\x2e\x13\x77\x92\x28\x60\xe1\x17\x52\x63\xc9\x1d\x68\x8f\xb1\xc5\xea\xa3\x28\xbf\xa3\xb3\xe4\xf6\xf0\x60\x2d\xcb\x76\xba\x0f\x47\x72\x1c\xd0\xb1\x0b\x00\x19\x8f\xd4\x81\x14\xca\x36\xf2\xde\x1b\xce\xaf\x4a\x66\xcd\x8a\x14\xb4\x26\xb2\x2e\x34\x80\x85\x9f\x54\x6a\xb1\xd9\xd4\xc0\x66\x13\x00\xd0\x5d\xb9\xaf\x4e\xbb\x0b\xa4\x64\xeb\x20\xd7\x94\x02\xcc\xe4\x52\x35\xd2\xd9\x41\x79\x28\xc2\xd9\x6d\x51\xf3\x5a\x2b\x18\x69\x95\x46\x3a\xf1\x2a\x26\xd2\xfe\x6c\x49\x6c\xbe\x3c\x4e\xe8\x71\xfc\x09\x31\xe7\xa3\xec\x1c\xaf\x03\xde\xca\xe5\x72\xa0\xac\x34\x31\x9d\xce\x2c\xb5\x7f\xa3\xe8\x18\x23\x99\x7d\x7d\x5c\x71\x45\x25\x74\xfa\xa5\x94\x66\xbd\x66\xfb\x59\xe9\x1f\x98\x96\x09\x37\x96\xf1\xcf\xcb\xb7\xe6\xe8\xf5\x1b\x43\x2d\xc3\x1c\xfc\x23\x00\x00\xff\xff\x13\x49\xf9\x92\xc9\x02\x00\x00") func assetsRouterClusterRoleYamlBytes() ([]byte, error) { return bindataRead( @@ -138,12 +138,12 @@ func assetsRouterClusterRoleYaml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "assets/router/cluster-role.yaml", size: 711, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "assets/router/cluster-role.yaml", size: 713, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } -var _assetsRouterDaemonsetYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x93\x41\x6f\xdb\x3e\x0c\xc5\xef\xfe\x14\x84\x73\x76\xd2\xa0\xc5\x1f\xff\xe9\x16\xa4\xc1\x50\x60\x6d\x8d\x38\xeb\xb5\x60\x65\x26\x16\x22\x4b\x02\x45\xbb\xeb\x3e\xfd\xa0\x36\x5d\xec\x20\x2b\xba\xd3\x78\x32\xc4\xf7\x7e\x7c\xa6\xa0\x09\x5c\x23\xb5\xde\x55\x24\xf0\x6c\xa4\x81\x9a\xb6\xd8\x59\x81\x1e\x6d\x47\x31\x9b\xc0\xd2\x76\x51\x88\xe1\xc6\xed\x98\x62\x84\x18\x48\x9b\xad\xd1\x07\x05\x20\x13\x60\x08\xd6\x50\x0d\x28\xc0\x9d\x13\xd3\xd2\x34\xdb\x1b\x57\xab\x23\x3d\xc3\x60\x1e\x88\xa3\xf1\x4e\x25\x7d\x9c\xf5\xf3\xac\x25\xc1\x1a\x05\x55\x06\x30\x81\x3b\x6c\x09\x4c\x84\x48\x32\x22\x01\x38\x6c\x29\x06\xd4\xa4\xc0\x07\x72\xb1\x31\x5b\x29\xf4\x5b\xb0\xc2\xbc\x05\x2b\xd8\x77\x42\x9c\x01\x58\x7c\x22\x1b\x13\x13\xd2\x24\x05\x87\x4e\x4a\x9e\x4e\x23\x59\xd2\xe2\xf9\x4d\xd1\xa2\xe8\xe6\xdb\xc0\x32\x36\x01\x08\xb5\xc1\xa2\xd0\x41\x3e\x88\x9c\xca\x8e\x9c\xa7\x5e\x80\xf7\xa1\xaf\xdf\xc4\xbd\xd1\xb4\xd0\xda\x77\x4e\xd2\xef\x8e\xa4\x00\xce\xd7\x54\x8d\xd2\xa5\xca\xd3\x71\xc1\xde\xd2\x74\xdf\x3d\x11\x3b\x12\x8a\x53\xe3\x67\xcf\x9e\xf7\xc4\xb9\x82\x3c\x3f\x88\xb5\x77\x82\xc6\x11\x0f\x12\x15\xaf\xeb\x3b\x99\x94\xca\xb4\xb8\x23\x05\x79\xed\xf5\x9e\x38\x01\x7f\x2f\x77\xe6\xd9\xec\x8c\x2b\x1a\x0c\xec\x7f\xbc\x1c\x76\xab\xfa\xcb\xe9\x7c\x3e\xbd\xc8\x4f\x21\x65\x67\x6d\xe9\xad\xd1\x2f\x0a\x6e\xb6\x77\x5e\x4a\xa6\x48\x4e\x06\xba\xe0\x59\x06\xa1\x8e\xb1\x1a\x91\x30\x38\x1e\xfc\x43\xe9\x59\x14\xfc\x7f\x31\xea\x06\xf6\xe2\xb5\xb7\x0a\x36\xcb\xf2\x0f\xb8\xf8\x11\xef\xea\xea\xf2\xaf\x80\x51\x50\x3e\x04\xce\xbf\x5c\xfe\xf7\x29\xe2\x04\x6e\x89\x77\x27\xcf\xe4\xd8\x26\xd7\x9f\xdb\x4f\xb5\x59\x6c\xaa\xc7\xf2\x7e\xbd\x19\x0d\x79\x7d\x7d\x0a\xf2\x34\x3d\x3f\x63\x5b\xdf\x7f\xdf\xac\xd6\x8f\xd5\x6a\xfd\x70\xb3\x5c\x3d\xde\x2d\x6e\x57\x55\xb9\x58\xae\xce\x41\x3e\xf1\xa6\xde\xcb\x9a\x9e\x1c\xc5\x58\xb2\x7f\x22\x35\x82\x19\x67\xc4\xa0\xbd\x26\x8b\x2f\x15\x69\xef\xea\xa8\x60\x3e\xbe\xbd\x74\x3b\x5f\x49\xc6\x46\x80\x80\xd2\x28\x98\x35\x84\x56\x9a\x9f\xa7\xcd\x73\x5b\x66\xc2\xda\xfc\xbb\x20\xbf\x02\x00\x00\xff\xff\x44\x37\x9c\x37\x37\x05\x00\x00") +var _assetsRouterDaemonsetYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x93\x41\x6f\xdb\x30\x0c\x85\xef\xfe\x15\x84\x73\x4e\xd2\xa0\xc5\xb0\xe9\x16\xa4\xc1\x50\x60\x6d\x8d\x38\xeb\xb5\x60\x65\x26\x16\x22\x4b\x02\x45\xbb\xeb\x7e\xfd\xa0\x24\x5d\xec\x20\x2b\xb6\xd3\x78\x32\xa4\xf7\x3e\x3e\x53\xe0\x08\x6e\x91\x1a\xef\x4a\x12\x78\x35\x52\x43\x45\x1b\x6c\xad\x40\x87\xb6\xa5\x98\x8d\x60\x61\xdb\x28\xc4\x70\xe7\xb6\x4c\x31\x42\x0c\xa4\xcd\xc6\xe8\xa3\x02\x90\x09\x30\x04\x6b\xa8\x02\x14\xe0\xd6\x89\x69\x68\x92\xed\x8c\xab\xd4\x89\x9e\x61\x30\x4f\xc4\xd1\x78\xa7\x92\x3e\x4e\xbb\x59\xd6\x90\x60\x85\x82\x2a\x03\x18\xc1\x03\x36\x04\x26\x42\x24\x19\x90\x00\x1c\x36\x14\x03\x6a\x52\xe0\x03\xb9\x58\x9b\x8d\x8c\xcd\x21\x50\x06\x60\xf1\x85\x6c\x4c\x10\x48\x68\x05\xec\x5b\x21\xce\x52\xd4\x74\x1a\xc9\x92\x16\xcf\x07\x45\x83\xa2\xeb\x6f\x3d\xcb\xd0\x04\x20\xd4\x04\x8b\x42\x47\x79\x2f\x63\x2a\x3b\x70\x9e\x7b\x01\xde\x9b\xee\xbf\x89\x3b\xa3\x69\xae\xb5\x6f\x9d\xa4\xff\x1b\x48\x01\x9c\xaf\xa8\x1c\xa4\x4b\x95\xa7\xe3\x31\x7b\x4b\x93\x5d\xfb\x42\xec\x48\x28\x4e\x8c\x9f\xbe\x7a\xde\x11\xe7\x0a\xf2\xfc\x28\xd6\xde\x09\x1a\x47\xdc\x4b\x34\xde\xcf\xeb\xac\x53\x2a\xd3\xe0\x96\x14\xe4\x95\xd7\x3b\xe2\x04\xfc\x3d\xcd\xa9\x67\xb3\x35\x6e\x5c\x63\x60\xff\xe3\x6d\x7c\xf0\xaa\xee\x7a\x32\x9b\x4d\xae\xf2\x73\x48\xd1\x5a\x5b\x78\x6b\xf4\x9b\x82\xbb\xcd\x83\x97\x82\x29\x92\x93\x9e\x2e\x78\x96\x5e\xa8\x53\xac\x5a\x24\xf4\x8e\x7b\xff\x50\x78\x16\x05\x9f\xaf\x06\xb7\x81\xbd\x78\xed\xad\x82\xf5\xa2\xf8\x03\x2e\x7e\xc4\xbb\xb9\xb9\xfe\x27\x60\x14\x94\x0f\x81\xb3\x2f\xd7\x9f\xfe\x8a\x38\x82\x7b\xe2\xed\xd9\x5e\x9c\xae\xc9\x75\x97\xe6\x53\xae\xe7\xeb\xf2\xb9\x78\x5c\xad\x07\x4d\xf6\xeb\xa6\x20\x4f\xdd\xf3\x0b\xb6\xd5\xe3\xf7\xf5\x72\xf5\x5c\x2e\x57\x4f\x77\x8b\xe5\xf3\xc3\xfc\x7e\x59\x16\xf3\xc5\xf2\x12\xe4\xd2\x12\xbd\x97\x35\x1d\x39\x8a\xb1\x60\xff\x42\x6a\xe0\x36\xce\x88\x41\x7b\x4b\x16\xdf\x4a\xd2\xde\x55\x51\xc1\x6c\xf8\x5c\xe9\x39\xbe\x92\x0c\x8d\x00\x01\xa5\x56\x30\xad\x09\xad\xd4\x3f\xcf\x2f\x2f\x8d\x95\x09\x2b\xf3\xff\x82\xfc\x0a\x00\x00\xff\xff\x6e\x00\x98\x99\x19\x05\x00\x00") func assetsRouterDaemonsetYamlBytes() ([]byte, error) { return bindataRead( @@ -158,12 +158,12 @@ func assetsRouterDaemonsetYaml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "assets/router/daemonset.yaml", size: 1335, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "assets/router/daemonset.yaml", size: 1305, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } -var _assetsRouterNamespaceYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x64\x8e\x3b\x6e\xc3\x30\x10\x44\x7b\x9e\x62\xa0\xd4\xca\xa7\xe5\x21\x52\xa6\x5f\x9b\x13\x7b\x61\x6a\x57\xe0\x2e\x75\xfe\x40\x80\x91\x14\xa9\xe7\x3d\xcc\x7b\xa8\xb5\x8a\x4f\xd9\x18\xbb\x5c\x59\x64\xd7\x2f\x8e\x50\xb7\x8a\xe3\xa3\x6c\x4c\x69\x92\x52\x0b\x60\xb2\xb1\xc2\x77\x5a\xdc\xf5\x3b\xd7\x6b\x9f\x91\x1c\xab\xda\x6d\x30\x62\x1d\x3e\x93\xa3\x00\x62\xe6\x29\xa9\x6e\x71\x7a\xf8\x73\x5e\xd5\xdf\xcc\x1b\xd7\x60\xe7\x35\x7d\x54\x2c\x4b\x01\xba\x5c\xd8\x9f\xf0\x0b\x82\x89\x43\xfa\x24\xd2\x21\x87\x6b\x43\xe3\x4e\x6b\x6a\x37\xb8\xe1\x31\x2f\x84\xb4\x4d\xe3\xec\x44\xde\x25\x9f\x40\x9c\xf3\xef\x1b\x64\xd7\xf8\x1f\x30\xa6\xad\x9d\x07\x7b\xc5\xf2\xbe\x94\x9f\x00\x00\x00\xff\xff\xd0\x69\x8c\xfa\x02\x01\x00\x00") +var _assetsRouterNamespaceYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x64\xce\xbd\x6e\xc3\x30\x0c\xc4\xf1\x5d\x4f\x71\x70\x67\xf7\x63\xd5\x43\x74\xec\xce\x44\xd7\x84\x88\x4c\x0a\x26\xad\xe7\x2f\x0c\x04\xed\xd0\xf9\x7e\xc0\xfd\x1f\x6a\xad\xe2\x53\x36\xc6\x90\x2b\x8b\x0c\xfd\xe2\x1e\xea\x56\x31\x3f\xca\xc6\x94\x26\x29\xb5\x00\x26\x1b\x2b\x7c\xd0\xe2\xae\xdf\xb9\xaa\xdd\x76\x46\x14\x40\xcc\x3c\x25\xd5\x2d\x4e\x88\x3f\xf4\xaa\xfe\x66\xde\xb8\x06\x3b\xaf\xe9\x7b\xc5\xb2\x14\xa0\xcb\x85\xfd\x89\x5f\x10\x4c\x4c\xe9\x07\x91\x0e\x99\xae\x0d\x8d\x83\xd6\xd4\x6e\x70\xc3\xe3\xb8\x10\xd2\x36\x8d\x33\x0c\x79\x97\x7c\x82\x38\xe7\xdf\x37\xc8\xd0\xf8\x1f\xb0\x1f\xb6\x76\x4e\xf6\x8a\xe5\x7d\x29\x3f\x01\x00\x00\xff\xff\x55\xe9\xbf\x8f\xf3\x00\x00\x00") func assetsRouterNamespaceYamlBytes() ([]byte, error) { return bindataRead( @@ -178,12 +178,12 @@ func assetsRouterNamespaceYaml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "assets/router/namespace.yaml", size: 258, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "assets/router/namespace.yaml", size: 243, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } -var _assetsRouterServiceAccountYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x2c\xce\xb1\x6a\x04\x31\x0c\x84\xe1\xde\x4f\x31\x70\xf5\x1e\xa4\x75\x97\x32\x6d\x02\xe9\x1d\xef\xdc\x9d\xc8\xae\xe5\x48\xf2\x86\xbc\x7d\xd8\xc3\xa5\x40\xf3\xf3\x5d\xf0\x5a\xab\x8e\x16\xb8\xa9\xc1\x74\x04\xcd\x51\x8d\x25\xb8\xe2\xeb\x0f\xf1\x20\xb4\xd3\x4a\xa8\x5d\xf1\x16\xf8\x95\x6d\x83\xf1\x67\x88\x11\x75\x1b\x1e\x34\x78\xd5\xce\x35\x5d\xd0\x69\xbb\xb8\x8b\x36\x87\x71\x7b\x56\x42\xf1\x7e\x86\xd1\x4d\x2b\xdd\xa5\xdd\xaf\xe9\x5b\xda\x9a\xf1\x41\x3b\xa4\x72\x1a\x52\xe9\xf2\x49\x3b\xd7\x19\xc7\x4b\xda\x19\x65\x2d\x51\x72\x02\x5a\xd9\x99\x27\x70\x9e\xde\x4b\x65\x3e\x75\xcd\x1f\x72\x8b\x65\x6a\x16\x69\x77\xa3\xfb\x32\xbf\xff\x03\x00\x00\xff\xff\x46\x51\x70\x49\xe4\x00\x00\x00") +var _assetsRouterServiceAccountYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x2c\xce\xb1\x4e\xc4\x30\x10\x84\xe1\xde\x4f\x31\xd2\xd5\x9c\x44\xeb\x8e\x92\x16\x24\x7a\xb3\x99\xbb\x5b\x91\x78\xcd\xee\x3a\x88\xb7\x47\x41\x29\xa7\x98\x5f\xdf\x05\x2f\x22\x36\x7b\xe2\x66\x0e\xb7\x99\xf4\x80\x38\x5b\x72\xc1\xe7\x2f\xf2\x41\xd8\xa0\xb7\x34\xbf\xe2\x35\xf1\xa3\xeb\x0a\xe7\xf7\x54\x27\x64\x9d\x91\x74\x84\xd8\xe0\x52\x2e\x18\xf4\x4d\x23\xd4\x7a\xc0\xb9\xfe\x57\xd2\xf0\x76\x84\x31\xdc\x84\x11\xda\xef\xd7\xf2\xa5\x7d\xa9\x78\xa7\xef\x2a\x3c\x0d\xa5\x0d\xfd\xa0\x1f\xef\x8a\xfd\xb9\x6c\xcc\xb6\xb4\x6c\xb5\x00\xbd\x6d\xac\x27\xf0\x9c\x31\x9a\xb0\x1e\xba\x1e\x0f\xbd\xe5\x93\xf6\xbb\x33\xa2\xfc\x05\x00\x00\xff\xff\x33\xdc\xda\x8c\xd5\x00\x00\x00") func assetsRouterServiceAccountYamlBytes() ([]byte, error) { return bindataRead( @@ -198,12 +198,12 @@ func assetsRouterServiceAccountYaml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "assets/router/service-account.yaml", size: 228, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "assets/router/service-account.yaml", size: 213, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } -var _assetsRouterServiceCloudYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x64\x91\x31\x8b\xdc\x40\x0c\x85\x7b\xff\x8a\x07\x5b\xef\x91\x74\xc1\xe5\x5d\x15\x38\xc2\x42\x96\xf4\xba\xb1\xbc\x33\xdc\x58\x1a\x24\x79\x93\xfd\xf7\x61\xc6\x77\x45\x48\xe9\x87\x25\x7d\xef\x9b\x13\x5e\x95\x16\x3c\x53\x25\x49\x6c\xf8\xc9\x76\x2f\x89\x11\x8a\x56\x29\x31\x8a\x60\x35\x95\x80\xae\x88\xcc\x30\xdd\x83\xad\xc7\xa9\xea\xbe\x80\xe5\x5e\x4c\x65\x63\x09\x7f\x9a\x4e\x78\xa9\xbb\xf7\x1f\xbe\xcb\xcd\xd8\x1d\xde\x38\x95\xb5\x24\xdc\xa9\xee\xec\x20\x63\x50\x6b\xb5\xf0\x02\x0a\xd8\x2e\x51\x36\x7e\x9a\xde\x8b\x2c\xf3\xe7\xf9\x89\x5a\xf9\xc5\xe6\x45\x65\xc6\xfd\xeb\xb4\x71\xd0\x42\x41\xf3\x04\x9c\xf0\x83\x36\x46\x71\x38\xc7\x3f\x2b\x00\xa1\x8d\xbd\x51\xe2\x19\xda\x58\x3c\x97\x35\xce\xe9\x20\x3a\x97\x83\xe8\x7c\x34\x98\x80\x4a\x6f\x5c\xbd\xef\x44\x47\x9a\x3f\xba\x4d\x1d\xb9\xa7\xf1\x68\x3c\x0f\x3f\x9f\x7a\x26\xc0\xb9\x72\x0a\xb5\xff\xc7\x3a\xda\x35\x17\x07\x55\x57\x64\xf2\xe1\x8b\xd7\x95\xd3\xb0\xb7\x91\xbd\x17\xb9\xe1\xf5\x19\x4d\xb5\x22\xc8\x6e\x1c\x0e\x72\xec\x92\x99\x6a\xe4\x07\x7e\x67\x16\x88\x8e\x65\x1f\xaa\x9b\x2e\x87\xb6\x66\xec\xdc\x5f\x42\x40\x10\x5d\x18\x6f\x9c\x8b\x2c\xe3\x8e\x1f\xe6\xba\x05\xfe\x13\x6c\x42\xf5\x6a\xb4\xae\x25\x5d\xb4\x96\xf4\xe8\x45\x12\xd5\x09\x68\x6a\x31\x5a\x9f\x87\xaf\x19\x39\xa2\x8d\x36\xcd\x34\x34\x69\x9d\x71\x7d\xb9\x1c\x89\x5a\xcc\xf8\xf6\x65\x7c\x1c\xc0\x97\x11\x8d\x99\xbf\x01\x00\x00\xff\xff\x17\xe2\x05\xe9\x3d\x02\x00\x00") +var _assetsRouterServiceCloudYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x64\x90\x31\x8b\x1c\x31\x0c\x85\xfb\xf9\x15\x0f\xb6\xbe\x23\xe9\xc2\x94\x77\x55\xe0\x08\x0b\x59\xd2\xeb\x3c\x9a\xb5\x39\x8f\x64\x24\xcd\x26\xfb\xef\x83\x3d\xb7\x45\x48\xe9\x87\x25\xbd\xef\x3b\xe1\x4d\x69\xc1\x0b\x55\x92\xc4\x86\x9f\x6c\xb7\x92\x18\xa1\x68\x95\x12\xa3\x08\x56\x53\x09\xe8\x8a\xc8\x0c\xd3\x3d\xd8\x7a\x9c\xaa\xee\x0b\x58\x6e\xc5\x54\x36\x96\xf0\xe7\xe9\x84\xd7\xba\x7b\xff\xf0\x5d\xae\xc6\xee\xf0\xc6\xa9\xac\x25\xe1\x46\x75\x67\x07\x19\x83\x5a\xab\x85\x17\x50\xc0\x76\x89\xb2\xf1\xf3\xf4\x51\x64\x99\x1f\xe7\x27\x6a\xe5\x17\x9b\x17\x95\x19\xb7\xaf\xd3\xc6\x41\x0b\x05\xcd\x13\x70\xc2\x0f\xda\x18\xc5\xe1\x1c\xff\xac\x00\x84\x36\xf6\x46\x89\x67\x68\x63\xf1\x5c\xd6\x78\x2a\x47\x93\x09\xa8\xf4\xce\xd5\xfb\x12\xf4\x0e\xf3\x27\xcc\xd4\x3b\xf6\x34\xee\x8d\xe7\x21\xe4\xe1\x63\x02\x9c\x2b\xa7\x50\xfb\x7f\xac\x77\xb9\xe4\xe2\xa0\xea\x8a\x4c\x3e\x04\xf1\xba\x72\x1a\xba\x36\xb2\x8f\x22\x57\xbc\xbd\xa0\xa9\x56\x04\xd9\x95\xc3\x41\x8e\x5d\x32\x53\x8d\x7c\xc7\xef\xcc\x02\xd1\xb1\xec\xd3\x6d\xd3\xe5\xf0\xd4\x8c\x9d\xbb\x7a\x01\x41\x74\x61\xbc\x73\x2e\xb2\x8c\x3b\x7e\xa8\xea\xd8\xfc\x27\xd8\x84\xea\xc5\x68\x5d\x4b\x3a\x6b\x2d\xe9\xde\x41\x12\xd5\x09\x68\x6a\x31\xa8\x9f\x86\xa0\x19\x39\xa2\x0d\x9a\x66\x1a\x9a\xb4\xce\xb8\xbc\x9e\x8f\x44\x2d\x66\x7c\xfb\x32\x1e\x47\xe1\xf3\x88\xc6\xcc\xdf\x00\x00\x00\xff\xff\x4c\x7a\xce\x39\x2e\x02\x00\x00") func assetsRouterServiceCloudYamlBytes() ([]byte, error) { return bindataRead( @@ -218,12 +218,12 @@ func assetsRouterServiceCloudYaml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "assets/router/service-cloud.yaml", size: 573, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "assets/router/service-cloud.yaml", size: 558, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } -var _manifests00ClusterRoleYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x92\x41\x8f\xd3\x40\x0c\x85\xef\xf9\x15\xa3\xee\x0d\xa9\xa9\xb8\xa1\x5c\x39\x70\xe2\xc2\x81\xbb\x3b\x79\x69\xcd\x26\xe3\x91\xed\xe9\x02\xbf\x1e\x4d\x9a\x08\x91\xb6\x2b\xd0\x8a\x53\x6d\xd7\xb1\xbf\x79\xcf\x4f\xe1\xe3\x58\xcc\xa1\x41\x65\x44\x18\x44\x83\x9f\x11\x24\x43\xc9\x45\x03\xbb\x61\x1c\xda\xe6\x99\x53\xdf\xad\xbd\x5f\x64\x44\x43\x99\xbf\x42\x8d\x25\x75\x41\x8f\x14\x5b\x2a\x7e\x16\xe5\x9f\xe4\x2c\xa9\x7d\xfe\x60\x2d\xcb\xe1\xf2\xbe\x99\xe0\xd4\x93\x53\xd7\x84\x90\x68\x42\x17\xe2\x75\xcc\x9e\xd3\x49\x61\xb6\x5f\xb7\x75\x6b\xd0\x68\x19\x61\x5d\xb3\x0f\x94\xf9\x93\x4a\xc9\x56\xbf\xde\x87\xdd\xae\x09\x41\x61\x52\x34\x62\xa9\x45\x49\x03\x9f\x26\xca\x36\xa7\x75\x85\x65\x8a\xb8\xa6\x06\xbd\x70\x04\xc5\x28\x25\xf9\x1f\xb5\x9a\x5c\xa0\xc7\x75\x8e\x82\x1c\x73\x78\x82\xcf\xbf\x23\xdb\x35\x78\x21\x8f\xe7\x39\xea\x31\xc2\xd1\xdc\xa2\x51\x5e\x00\xf0\xdd\x91\xaa\x2e\x76\xcb\xda\x13\x26\x49\x06\xdf\xec\xde\xbd\xdb\xdd\x19\xf9\x50\xd6\x3b\x22\x5c\x25\xad\x26\xda\xb6\x70\xe4\xd4\x73\x3a\x3d\x7e\xee\xe6\x99\xb7\x20\x8b\x51\xad\x64\x24\x3b\xf3\xe0\xaf\x31\x2c\xcd\x5b\x79\xb7\x4b\x9e\xc2\x67\x56\x15\x45\x1f\x06\x95\x29\x90\x55\x59\x0e\x2a\xc5\xa1\x87\xf5\x44\x2a\x7f\xfb\x83\xa6\xf1\xef\x6e\x01\xa9\xcf\xc2\x77\x7c\xde\xdc\xc5\x63\xae\x37\x63\x55\xbf\x90\x9c\xe3\xeb\x86\xb9\x3c\x23\x29\x2e\x8c\x97\x05\xb6\x1c\xbf\x21\x3a\xc5\x08\xb3\xdf\x7f\xdc\x3a\xf6\x66\xc2\xb9\x73\xeb\xe5\x7d\x3d\xe7\xd6\xff\x2c\xd8\x3f\xe3\x1c\xcc\xc9\xcb\x86\xaa\xe4\xbe\x8a\xf3\x2b\x00\x00\xff\xff\x2b\x01\x97\x2b\xd0\x04\x00\x00") +var _manifests00ClusterRoleYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x92\x31\x8f\xdb\x30\x0c\x85\x77\xff\x0a\x21\xb7\x15\x88\x83\x6e\x85\xd7\x0e\x9d\xba\x74\xe8\xce\xc8\xcf\x09\x1b\x5b\x14\x48\x2a\xd7\xf6\xd7\x17\x72\x9c\x16\x75\x92\x43\x8b\xc3\x4d\x26\x69\x8a\xfc\xf4\x9e\x9e\xc2\xc7\xb1\x98\x43\x83\xca\x88\x30\x88\x06\x3f\x22\x48\x86\x92\x8b\x06\x76\xc3\x38\xb4\xcd\x89\x53\xdf\x5d\x7b\xbf\xc8\x88\x86\x32\x7f\x85\x1a\x4b\xea\x82\xee\x29\xb6\x54\xfc\x28\xca\x3f\xc9\x59\x52\x7b\xfa\x60\x2d\xcb\xee\xfc\xbe\x99\xe0\xd4\x93\x53\xd7\x84\x90\x68\x42\x57\xa7\x27\x3b\xf2\xe0\x5b\x4e\x07\x85\xd9\xf6\xba\xaf\xd1\x32\xc2\xba\x66\x1b\x28\xf3\x27\x95\x92\xad\x1e\xdb\x86\xcd\xa6\x09\x41\x61\x52\x34\x62\xa9\x45\x49\x03\x1f\x26\xca\x36\xa7\x75\xb6\x65\x8a\xb8\xa4\x06\x3d\x73\x04\xc5\x28\x25\xf9\x5f\xb5\x9a\x9c\xa1\xfb\xeb\x1c\x05\x39\xe6\xf0\x00\x9f\xbf\x23\xdb\x25\x78\x26\x8f\xc7\x39\xea\x31\xc2\xd1\xdc\xa2\x51\x5e\x00\xf0\xdd\x91\xaa\x20\x76\xcb\xda\x13\x26\x49\x06\x5f\xed\xde\xbc\xdb\xdc\x19\xf9\x50\xcf\x3b\x22\x5c\x2c\xa9\xee\xd9\xba\xb0\xe7\xd4\x73\x3a\x3c\xbe\xee\xea\x9a\xb7\x20\x8b\x3f\xed\x6f\xc7\x5e\x62\x58\x9a\xd7\xf2\xae\x97\x3c\x85\xcf\xac\x2a\x8a\x3e\x0c\x2a\x53\x20\xab\xb2\xec\x54\x8a\x43\x77\xcb\xac\x6d\xe5\x6f\x7f\xd0\x34\xfe\xdb\x5b\x40\xea\xb3\xf0\x1d\x9f\x57\xef\xe2\x31\xd7\xab\xb1\xaa\x5f\x48\xce\xf1\x65\xc3\x5c\x4e\x48\x8a\x33\xe3\x79\x81\x2d\xfb\x6f\x88\x4e\x31\xc2\xec\xcf\x8f\x5b\xc7\x5e\x4d\x38\x77\xae\xbd\xbc\xaf\xe7\xdc\xfa\xc6\x82\xfd\x37\xce\xce\x9c\xbc\xac\xa8\x4a\xee\xab\x38\xbf\x02\x00\x00\xff\xff\x7e\x49\x4c\x32\xc9\x04\x00\x00") func manifests00ClusterRoleYamlBytes() ([]byte, error) { return bindataRead( @@ -238,7 +238,7 @@ func manifests00ClusterRoleYaml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "manifests/00-cluster-role.yaml", size: 1232, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "manifests/00-cluster-role.yaml", size: 1225, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } @@ -263,7 +263,7 @@ func manifests00CustomResourceDefinitionYaml() (*asset, error) { return a, nil } -var _manifests00NamespaceYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x3c\x8d\xbb\x6e\xc3\x30\x0c\x45\x77\x7d\xc5\x45\x3a\xbb\x8f\x55\x1f\xd1\xb1\x3b\x13\xdd\x26\x44\x64\x52\x10\x69\x7f\x7f\xe1\x22\xf0\x7a\x1f\xe7\x3c\xd5\x5a\xc5\xb7\xac\x8c\x21\x37\x16\x19\xfa\xc3\x19\xea\x56\xb1\x7f\x95\x95\x29\x4d\x52\x6a\x01\x4c\x56\x56\xf8\xa0\xc5\x43\x7f\x73\xb9\xf5\x2d\x92\x73\x51\xbb\x4f\x46\x2c\x3e\x38\x25\x7d\x16\xa0\xcb\x95\x3d\x8e\x13\xf0\x86\x60\x62\x97\xbe\x11\xe9\x90\xdd\xb5\xa1\x71\xd0\x9a\xda\x1d\x6e\x78\x6e\x57\x42\xda\xaa\x71\x78\x91\x0f\xc9\xd7\x20\x8e\xfa\x34\x42\x86\xc6\x3f\xf3\x8c\xde\xd5\x3f\xe6\x66\x4b\xe7\xce\x5e\x71\xf9\xbc\x94\xbf\x00\x00\x00\xff\xff\xd9\x55\x35\x18\xd2\x00\x00\x00") +var _manifests00NamespaceYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x3c\x8d\x3b\x6e\x03\x31\x0c\x44\x7b\x9d\x62\xe0\xd4\x9b\x4f\xab\x43\xa4\x4c\x4f\x47\x13\x9b\xb0\x96\x14\x44\xae\xce\x1f\x6c\x10\xb8\x9d\x79\x78\xef\xa1\xd6\x2a\x3e\x65\x67\x0c\xf9\x66\x91\xa1\x5f\x9c\xa1\x6e\x15\xeb\xa3\xec\x4c\x69\x92\x52\x0b\x60\xb2\xb3\xc2\x07\x2d\xee\xfa\x93\x9b\xda\x6d\x32\x62\xf3\xc1\x29\xe9\xb3\x00\x5d\xae\xec\x71\xc2\xc0\x0b\x82\x89\x25\xfd\x20\xd2\x21\xcb\xb5\xa1\x71\xd0\x9a\xda\x0d\x6e\x78\x1c\x57\x42\xda\xae\x71\xf6\x90\x77\xc9\x7f\x20\xce\xfb\x59\x82\x0c\x8d\x3f\xe7\x73\x7a\x55\x7f\x9b\x87\x6d\x9d\x8b\xbd\xe2\xf2\x7e\x29\xbf\x01\x00\x00\xff\xff\xb1\xc8\x1a\xc1\xca\x00\x00\x00") func manifests00NamespaceYamlBytes() ([]byte, error) { return bindataRead( @@ -278,12 +278,12 @@ func manifests00NamespaceYaml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "manifests/00-namespace.yaml", size: 210, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "manifests/00-namespace.yaml", size: 202, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } -var _manifests01ClusterRoleBindingYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x94\x90\x31\x4f\xc4\x30\x0c\x46\xf7\xfc\x0a\x4b\xcc\x2d\x62\x43\xd9\x80\x81\xfd\x90\xd8\x7d\xa9\xef\x6a\xae\x67\x47\xb6\x73\x03\xbf\x1e\x45\x6d\x27\x04\x88\x2d\xc3\xd3\x97\xf7\x7c\x07\xcf\x2c\x93\x43\xcc\x04\x5a\xc9\x30\xd4\xa0\x2c\xcd\x83\x0c\x4c\x17\x82\x50\xe0\x70\x78\x23\xbb\x71\x21\x78\x2a\x45\x9b\xc4\x98\x2e\x2c\x53\x86\x97\x15\x3d\xe8\x42\x7d\x88\xe5\x9c\xb0\xf2\x3b\x99\xb3\x4a\x06\x3b\x62\x19\xb1\xc5\xac\xc6\x9f\x18\xac\x32\x5e\x1e\x7d\x64\xbd\xbf\x3d\xa4\x2b\x05\x4e\x18\x98\x13\x80\xe0\x95\xf2\xfe\xf1\xc0\x72\x36\x72\x1f\x76\xa3\xbc\x3f\x92\xb7\xe3\x07\x95\xf0\x9c\x06\x58\x0d\x36\xb1\xcd\xeb\xcf\xa9\x0d\xf0\x8a\x85\x72\x4f\x16\x9f\xf9\x14\xc3\x8f\x7c\x3f\xc2\x81\x4e\x5d\xf2\x5b\x72\x02\xc0\xca\xaf\xa6\xad\xfe\xd2\xfa\x8f\xbc\xaf\x00\x00\x00\xff\xff\x5b\xfd\x39\x77\x8f\x01\x00\x00") +var _manifests01ClusterRoleBindingYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x8c\x8f\x31\x4f\x03\x31\x0c\x85\xf7\xfc\x0a\x4b\xcc\x17\xc4\x86\xb2\x01\x03\x7b\x91\xd8\xdd\x9c\xdb\x33\xbd\xda\x91\xed\x74\xe0\xd7\xa3\xe8\x0a\x4b\xa5\x8a\xd9\x7e\xef\x7d\xdf\x03\xbc\xb2\xcc\x0e\xb1\x10\x68\x23\xc3\x50\x83\xba\x76\x0f\x32\x30\x5d\x09\x42\x81\xc3\xe1\x83\xec\xc2\x95\xe0\xa5\x56\xed\x12\x39\x9d\x58\xe6\x02\x6f\xdb\xeb\x4e\x57\x1a\x45\x2c\xc7\x84\x8d\x3f\xc9\x9c\x55\x0a\xd8\x1e\x6b\xc6\x1e\x8b\x1a\x7f\x63\xb0\x4a\x3e\x3d\x7b\x66\x7d\xbc\x3c\xa5\x33\x05\xce\x18\x58\x12\x80\xe0\x99\xca\x20\x10\x5f\xf8\x10\x13\xcb\xd1\xc8\x7d\xfa\x65\x4a\xde\xf7\x5f\x54\xc3\x4b\x9a\x60\x9b\xbe\x12\x5d\x81\xfe\x3a\x6e\x92\xdb\xc1\x1b\xd6\xfb\x0b\xc3\x76\x47\x87\x41\x73\xe3\x96\x00\xb0\xf1\xbb\x69\x6f\x77\xa4\xfe\xe3\xf1\x13\x00\x00\xff\xff\x5e\x3a\x23\xb1\x71\x01\x00\x00") func manifests01ClusterRoleBindingYamlBytes() ([]byte, error) { return bindataRead( @@ -298,12 +298,12 @@ func manifests01ClusterRoleBindingYaml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "manifests/01-cluster-role-binding.yaml", size: 399, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "manifests/01-cluster-role-binding.yaml", size: 369, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } -var _manifests01RoleBindingYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\xd0\xb1\x4e\x03\x31\x0c\xc6\xf1\x3d\x4f\x61\x89\xf9\x82\xd8\x50\x36\x58\xd8\x8b\xc4\xee\xe6\xdc\x9e\xe9\xd5\x8e\x6c\xe7\x06\x9e\x1e\x45\x1c\x62\x02\x96\xee\x5f\x94\x9f\xff\x77\xf0\xcc\x32\x3b\xc4\x42\xa0\x8d\x0c\x43\x0d\x4c\x57\x82\x50\xe0\x70\x78\x25\xdb\xb8\x12\x3c\xd5\xaa\x5d\x22\xa7\x0b\xcb\x5c\xe0\xa0\x2b\x8d\x97\x2c\xe7\x84\x8d\xdf\xc8\x9c\x55\x0a\xd8\x11\x6b\xc6\x1e\x8b\x1a\x7f\x60\xb0\x4a\xbe\x3c\x7a\x66\xbd\xdf\x1e\xd2\x95\x02\x67\x0c\x2c\x09\x40\xf0\x4a\x05\xea\xda\x3d\xc8\x26\x96\xb3\x91\xfb\xf4\x4d\xd8\x07\xde\xb0\x52\x19\x30\xf1\x85\x4f\x31\xfd\xba\xf7\x7e\x7c\xa7\x1a\x5e\xd2\x04\x5f\xc2\x1d\xbe\xbb\x6f\xff\xe3\x88\x74\xa0\xd3\xb8\xe5\x27\x49\x02\xc0\xc6\x2f\xa6\xbd\xfd\xd1\xe2\x7f\xcc\x67\x00\x00\x00\xff\xff\x4a\x32\x57\x38\x97\x01\x00\x00") +var _manifests01RoleBindingYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xa4\xd0\x31\x4f\xc3\x40\x0c\x05\xe0\xfd\x7e\xc5\x93\x98\x13\xc4\x86\x6e\x83\x85\xbd\x48\xec\xee\xc5\x6d\x4c\x5b\xfb\x64\x3b\x1d\xf8\xf5\x28\x22\x88\x01\xc1\xd2\xd9\xb6\xde\xf7\x7c\x87\x67\xd1\x29\x90\x33\xc3\x3a\x3b\xa5\x39\xdc\xce\x8c\x34\x48\x06\x5e\xd9\xaf\xd2\x18\x4f\xad\xd9\xa2\x39\x96\x93\xe8\x54\xb1\xb3\x33\xaf\x97\xa2\xc7\x42\x5d\xde\xd8\x43\x4c\x2b\x7c\x4f\x6d\xa4\x25\x67\x73\xf9\xa0\x14\xd3\xf1\xf4\x18\xa3\xd8\xfd\xf5\xa1\x5c\x38\x69\xa2\xa4\x5a\x00\xa5\x0b\x57\x88\x1e\x9d\x23\x86\xef\xe8\x6d\x10\x9d\x1a\xd7\x15\xa4\x31\xcb\x21\x87\x5f\x7b\xb1\xec\xdf\xb9\x65\xd4\x32\xe0\x4b\xb4\x41\x37\xe7\xed\x09\xeb\x13\x76\x7c\x58\xad\x3f\x95\x0b\x40\x5d\x5e\xdc\x96\xfe\x4f\xd7\xbf\xc3\x3f\x03\x00\x00\xff\xff\x1f\x8f\x27\xc8\x6f\x01\x00\x00") func manifests01RoleBindingYamlBytes() ([]byte, error) { return bindataRead( @@ -318,12 +318,12 @@ func manifests01RoleBindingYaml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "manifests/01-role-binding.yaml", size: 407, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "manifests/01-role-binding.yaml", size: 367, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } -var _manifests01RoleYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x84\x90\xc1\x4e\xf4\x30\x0c\x84\xef\x79\x0a\xab\xff\xed\x97\x5a\xc4\x0d\xf5\x05\xb8\x73\xe0\xee\x4d\xdd\x5d\x6b\x93\x38\xb2\x9d\x4a\xf0\xf4\x68\xbb\xdd\x0a\x58\x10\xb7\x4c\xfc\x79\x66\xe4\x7f\xf0\x22\x89\x60\x16\x05\x3f\x11\x48\x25\x45\x17\x05\x76\xa3\x34\x0f\xe1\xcc\x65\x1a\x57\x26\x60\xe5\x57\x52\x63\x29\x23\xe8\x01\xe3\x80\xcd\x4f\xa2\xfc\x8e\xce\x52\x86\xf3\x93\x0d\x2c\x0f\xcb\x63\xc8\xe4\x38\xa1\xe3\x18\x00\x0a\x66\x1a\x21\xa6\x66\x4e\xda\x73\x39\x2a\x99\xf5\xb7\x98\x0d\xb0\x8a\x91\xc6\x4b\x78\xb1\x13\xcf\xde\xff\xca\x6b\x4b\x64\x63\xe8\x01\x2b\x3f\xab\xb4\x6a\x97\x90\x1e\x36\x70\xd8\x2d\x06\x96\x00\xa0\x64\xd2\x34\xd2\x46\x75\xff\xbb\x00\xb0\x90\x1e\x3e\x7d\xdc\x79\x75\xdd\xfd\x66\x95\xc9\xd6\x87\x91\x2e\x1c\xe9\x2a\xa8\x4c\x55\xb8\xf8\x55\xd5\xcb\x71\xcc\xa9\xf8\x22\xa9\x65\x8a\x09\x39\x6f\xe0\x42\x37\x2a\x4a\x99\xf9\x98\xb1\xde\xfc\xa2\xd2\x3a\xfa\xab\x16\xd6\x75\xe5\x5b\xb1\x89\x6a\x92\xb7\xbc\xdb\x7f\xe9\x37\x21\x65\x29\x46\xdb\x4c\xa9\x26\x8e\xb8\x6b\x73\x74\x9a\x5b\xb2\x1f\x0b\x7c\x04\x00\x00\xff\xff\xc0\x1c\xe2\xa9\x1a\x02\x00\x00") +var _manifests01RoleYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x84\x90\xc1\x4e\xc3\x30\x10\x44\xef\xfe\x8a\x55\xb8\x21\x25\x88\x1b\xca\x0f\x70\xe7\xc0\x7d\xeb\x6c\xda\x55\x6d\xaf\xb5\xbb\x8e\x04\x5f\x8f\x9a\x26\x15\x50\x24\x6e\x1e\xcf\xcc\xf3\xc8\x0f\xf0\x26\x89\x60\x16\x05\x3f\x11\x48\x25\x45\x17\x05\x76\xa3\x34\x0f\xe1\xcc\x65\x1a\xd7\x4c\xc0\xca\xef\xa4\xc6\x52\x46\xd0\x03\xc6\x01\x9b\x9f\x44\xf9\x13\x9d\xa5\x0c\xe7\x17\x1b\x58\x9e\x96\xe7\x90\xc9\x71\x42\xc7\x31\x00\x14\xcc\x34\x02\x97\xa3\x92\x59\xbf\xe3\x37\xc3\x2a\x46\x1a\x2f\x8f\x16\x3b\xf1\xec\xfd\x5d\x4e\x5b\x22\x1b\x43\x0f\x58\xf9\x55\xa5\x55\xbb\x40\xfb\x1d\x38\xdc\xaa\x03\x4b\x00\x50\x32\x69\x1a\x69\x4b\x75\x8f\x5d\x00\x58\x48\x0f\xdf\x2e\xee\x58\x5d\x77\xdf\xac\x32\xd9\x7a\x30\xd2\x85\x23\x5d\x05\x95\xa9\x0a\x17\xbf\xaa\x7a\xf9\x0c\x73\x2a\xbe\x48\x6a\x99\x62\x42\xce\x5b\x70\xa1\x3d\x15\xa5\xcc\x7c\xcc\x58\x77\x5e\x54\x5a\xad\xff\x66\x61\x5d\x2b\xbf\x86\x4d\x54\x93\x7c\xe4\x1b\xfe\xc7\xbe\x09\x29\x4b\x31\xda\x3c\xa5\x9a\x38\xe2\x4d\x9b\xa3\xd3\xdc\x92\xfd\x39\xe0\x2b\x00\x00\xff\xff\x78\x51\x95\xad\x0a\x02\x00\x00") func manifests01RoleYamlBytes() ([]byte, error) { return bindataRead( @@ -338,12 +338,12 @@ func manifests01RoleYaml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "manifests/01-role.yaml", size: 538, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "manifests/01-role.yaml", size: 522, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } -var _manifests01ServiceAccountYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x74\xce\x31\x6e\x85\x30\x10\x84\xe1\xde\xa7\x18\x89\x1a\xa4\xb4\xee\x52\xa6\x8e\x94\xde\xb2\x87\xb0\x0a\xd8\xce\xee\x9a\xf3\x47\x20\x52\xbe\xfe\xd3\xcc\x3f\xe1\x3d\xe7\x36\xaa\x63\x6d\x0a\xdf\x88\xd6\xa9\xc9\x9b\x42\xdc\xb8\xaf\x0b\x3e\x1c\xb6\xb5\xb1\x17\x28\x7f\x87\x28\x51\xd3\x41\xeb\x29\x13\x96\x5b\x67\x09\x13\x3a\xf5\x10\x33\x69\xd5\x96\xf0\x23\xb5\x44\x7c\x52\x4f\xc9\x7c\xf6\x43\xea\xf2\x45\xbd\x44\xc4\xf9\x16\x0e\x7a\x2a\xc9\x53\x0c\xb8\xf7\x22\xf2\x3e\xcc\xa9\xb3\xd4\x6f\xa5\xd9\xfc\x1f\xf2\x80\xfb\x30\x5e\x79\xd5\x36\x59\x7d\x7e\xe9\xff\x02\x00\x00\xff\xff\xfb\xf3\x0f\x99\xd4\x00\x00\x00") +var _manifests01ServiceAccountYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x64\x8e\xb1\x6e\x84\x30\x10\x44\x7b\x7f\xc5\x48\xd4\x20\xa5\x75\x97\x32\x75\xa4\xf4\x96\x3d\x84\xd5\x81\xed\xdb\x5d\xf8\xfe\x13\x88\xab\xae\x9e\xa7\x37\x6f\xc0\x77\xce\x6d\xaf\x8e\xb9\x29\x7c\x21\x5a\xa7\x26\x6f\x0a\x71\xe3\x3a\x4f\xf8\x71\xd8\xd2\xf6\xb5\x40\xf9\xdc\x45\x89\x9a\x36\x5a\x4f\x99\xb0\xdc\x3a\x4b\x18\xd0\xa9\x9b\x98\x49\xab\x36\x85\x87\xd4\x12\xf1\x4b\x3d\x24\xf3\xf6\x87\xd4\xe5\x8f\x7a\x12\x11\xc7\x57\xd8\xe8\xa9\x24\x4f\x31\xe0\xf2\x45\x48\xfd\x57\x9a\x8d\xef\x80\x7b\xb8\x8e\xe2\x99\x55\x6d\x91\xd9\xc7\x0f\xee\x15\x00\x00\xff\xff\xe5\x09\x18\x74\xc4\x00\x00\x00") func manifests01ServiceAccountYamlBytes() ([]byte, error) { return bindataRead( @@ -358,12 +358,12 @@ func manifests01ServiceAccountYaml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "manifests/01-service-account.yaml", size: 212, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "manifests/01-service-account.yaml", size: 196, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } -var _manifests02DeploymentYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x8c\x92\xbf\x6e\xf2\x40\x10\xc4\x7b\x3f\xc5\x8a\xde\x1f\xa6\xf9\x8a\xeb\x2c\x42\x94\x22\x01\x8b\xa0\xa4\x8c\x36\xe7\x05\x4e\xb9\x7f\xba\x5d\x2c\xe5\xed\x23\x07\x83\x0e\x02\x09\x5b\x7a\x46\xbf\x9d\xd9\x33\x46\xf3\x42\x89\x4d\xf0\x0a\x30\x46\x1e\x77\x93\xe2\xc3\xf8\x56\xc1\x1d\x45\x1b\x3e\x1d\x79\x29\x1c\x09\xb6\x28\xa8\x0a\x00\x8f\x8e\x14\x68\xbb\x63\xa1\x54\x1a\xbf\x49\xc4\x5c\x86\x48\x09\x25\xa4\xc1\xc0\x11\x35\x29\x08\x91\x3c\x6f\xcd\x5a\xca\xab\x7e\x8e\xa4\x7b\x6c\xa2\x68\x8d\x46\x56\x30\x29\x00\x98\x2c\x69\x09\xa9\x57\x00\x1c\x8a\xde\x3e\xe2\x3b\x59\xde\x7f\xb8\x21\x85\x90\x8b\x16\x85\x06\x42\x56\xa0\x1f\x7b\x02\xbb\x01\x07\x70\x08\xda\x8f\x0e\x5e\xd0\x78\x4a\x19\xa2\xbc\x05\xb2\x1f\xe3\x70\x93\x5f\x67\x1c\x92\xd9\x18\x7f\xf5\x48\xaa\x2f\xc2\x92\x11\x62\x48\x92\xed\xee\xb7\x1f\x33\x35\x21\x89\x82\xff\x55\x55\x55\x99\xe1\xd0\xd1\x91\x24\xa3\x39\x53\x74\x70\x0e\x7d\x7b\x46\xfb\xbb\x05\xf9\x4e\x9d\x2c\x38\x5c\xe0\xb5\x5e\x4d\x1f\xde\xe6\xf5\xd3\xec\xb9\xa9\xa7\xb3\x13\x0f\x40\x87\x76\x47\xf7\x29\x38\x75\x26\x00\xac\x0d\xd9\x76\x49\xeb\x9f\xca\xa0\x35\x28\x5b\x75\x7c\xcc\x7f\xc7\x3f\xed\x62\x8c\x45\x33\x5b\xd6\xab\xc5\xf2\x3b\xc9\xa5\x10\x0a\x46\xd7\x6a\x8e\x06\x3f\x53\xea\x8c\xa6\x5a\xeb\xb0\xf3\x32\xff\xfd\x81\xbf\x02\x00\x00\xff\xff\xef\x91\x77\x04\x4b\x03\x00\x00") +var _manifests02DeploymentYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x7c\x92\xcb\x6e\xdb\x40\x0c\x45\xf7\xfa\x0a\xfe\x80\x6a\x79\xd3\xc5\xec\x04\xd7\x45\x17\xad\x2d\xb8\x46\xb2\x0c\x98\x11\x6d\x0f\x32\x2f\x90\xb4\x80\xfc\x7d\xa0\xf8\x81\xf1\x93\x4b\x5d\xf2\xde\x43\x71\x30\xbb\x17\x62\x71\x29\x1a\xc0\x9c\x65\x32\x4c\xab\x0f\x17\x7b\x03\xbf\x28\xfb\xf4\x19\x28\x6a\x15\x48\xb1\x47\x45\x53\x01\x44\x0c\x64\xc0\xc5\x2d\x93\x48\x9d\x32\x31\x6a\xe2\xa3\x20\x19\x2d\x19\x48\x99\xa2\xec\xdc\x46\xeb\x9b\x3e\xc9\x64\x47\x1b\xa6\xec\x9d\x45\x31\x30\xad\x00\x84\x3c\x59\x4d\x3c\x2a\x00\x01\xd5\xee\xfe\xe2\x3b\x79\x39\x7c\x78\x92\xaa\x14\xb2\x47\xa5\xe3\x64\x01\x3a\x96\xbf\x30\x79\x62\x03\x70\x02\x1b\xcb\xa6\xa8\xe8\x22\x71\x31\x5a\x3f\x1b\x3e\x94\x0b\xb8\x2d\xb7\x9f\x24\x76\x5b\x17\x6b\xeb\xf7\xa2\xc4\x37\x3f\xc3\x8c\xe0\xa2\x85\x43\x4e\xac\x45\xe6\x98\x7a\x66\xe9\x12\xab\x81\x9f\x4d\xd3\x34\x45\xc3\x69\xa7\x40\xca\xce\x4a\xa1\xd8\x14\x02\xc6\xfe\xca\xed\x01\x4a\xd1\x44\x71\x30\x17\x01\xa7\xcd\x5f\xdb\xf5\xec\xcf\xdb\xa2\xfd\x37\xff\xdf\xb5\xb3\xf9\x45\x0f\xc0\x80\x7e\x4f\xbf\x39\x05\x73\x25\x00\x6c\x1c\xf9\x7e\x45\x9b\x5b\xe5\xa8\x75\xa8\x3b\x73\x3e\xde\x8f\xf3\x4b\xba\x8b\xb1\xec\xe6\xab\x76\xbd\x5c\x7d\x93\xdc\x83\x78\x78\x23\x21\x1e\x9c\xa5\xd6\xda\xb4\x8f\xba\xb8\x7f\xce\xaf\x00\x00\x00\xff\xff\x32\x48\x2c\xcb\x11\x03\x00\x00") func manifests02DeploymentYamlBytes() ([]byte, error) { return bindataRead( @@ -378,7 +378,7 @@ func manifests02DeploymentYaml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "manifests/02-deployment.yaml", size: 843, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "manifests/02-deployment.yaml", size: 785, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/test/assets/app-ingress/namespace.yaml b/test/assets/app-ingress/namespace.yaml index 933524169f..ab52585f5e 100644 --- a/test/assets/app-ingress/namespace.yaml +++ b/test/assets/app-ingress/namespace.yaml @@ -3,4 +3,4 @@ apiVersion: v1 metadata: name: cluster-ingress-test labels: - openshift.io/cluster-ingress-operator-test: "" + ingress.openshift.io/operator-test: "" diff --git a/test/integration/test_ingress.go b/test/integration/test_ingress.go index 806abf9eef..b304ec6da3 100644 --- a/test/integration/test_ingress.go +++ b/test/integration/test_ingress.go @@ -56,7 +56,7 @@ func testDefaultIngress(t *testing.T, tc TestConfig) { }, ObjectMeta: metav1.ObjectMeta{ Name: "router-default", - Namespace: "openshift-cluster-ingress-router", + Namespace: "openshift-ingress", }, } diff --git a/test/manifests/bindata.go b/test/manifests/bindata.go index d394f44734..ba9c87309a 100644 --- a/test/manifests/bindata.go +++ b/test/manifests/bindata.go @@ -91,7 +91,7 @@ func testAssetsAppIngressDeploymentYaml() (*asset, error) { return a, nil } -var _testAssetsAppIngressNamespaceYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x5c\xcb\x31\x0e\xc2\x30\x0c\x05\xd0\x3d\xa7\xf8\xea\x5e\x10\x6b\x0e\xc1\xc8\x6e\xda\x0f\x58\x24\x71\x64\x1b\xce\x8f\x60\x64\x7f\xef\xa9\x63\xaf\x38\x4b\x67\x4c\xd9\x58\x64\xea\x85\x1e\x6a\xa3\xe2\x7d\x2a\x9d\x29\xbb\xa4\xd4\x02\x0c\xe9\xac\xd8\xda\x2b\x92\xbe\xea\xb8\x3b\x23\xd6\x64\x64\x01\x9a\x5c\xd9\xe2\xcb\x00\x9b\x1c\xf1\xd0\x5b\x1e\xd4\x8e\xff\xde\x26\x5d\xd2\xfc\x17\x2b\x96\xa5\x7c\x02\x00\x00\xff\xff\x58\xf4\xa2\x5e\x83\x00\x00\x00") +var _testAssetsAppIngressNamespaceYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x2c\xcb\x31\xae\x02\x31\x0c\x45\xd1\x3e\xab\x78\x9a\x7e\xe6\xeb\xb7\x59\x04\x25\xbd\x99\x79\x80\x45\x12\x47\xb6\x61\xfd\x08\x44\x7d\xef\x79\xe8\x38\x2a\x4e\xd2\x19\x53\x76\x16\x99\x7a\xa6\x87\xda\xa8\x78\xfd\x97\xce\x94\x43\x52\x6a\x01\x86\x74\x56\xec\xed\x19\x49\x5f\x75\xdc\x9c\x11\x6b\x32\xb2\x00\x4d\x2e\x6c\xf1\xd9\x80\x5f\xda\x6c\x72\xc4\x5d\xaf\xb9\xa9\xfd\xd9\xa4\x4b\x9a\x7f\x41\xc5\xb2\x94\x77\x00\x00\x00\xff\xff\x15\x0b\x51\x43\x7b\x00\x00\x00") func testAssetsAppIngressNamespaceYamlBytes() ([]byte, error) { return bindataRead( @@ -106,7 +106,7 @@ func testAssetsAppIngressNamespaceYaml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "test/assets/app-ingress/namespace.yaml", size: 131, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "test/assets/app-ingress/namespace.yaml", size: 123, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil }