Deploy comoponents into openshift-machine-api namespace

enxebre · enxebre · commit f3f174a23b83 · 2019-02-08T10:57:34.000+01:00
diff --git a/cmd/machine-api-operator/main.go b/cmd/machine-api-operator/main.go
@@ -9,7 +9,7 @@ import (
 
 const (
 	componentName      = "machine-api-operator"
-	componentNamespace = "openshift-cluster-api"
+	componentNamespace = "openshift-machine-api"
 )
 
 var (
diff --git a/install/0000_30_machine-api-operator_00_namespace.yaml b/install/0000_30_machine-api-operator_00_namespace.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: openshift-cluster-api
+  name: openshift-machine-api
   labels:
-    name: openshift-cluster-api
+    name: openshift-machine-api
     openshift.io/run-level: "1"
diff --git a/install/0000_30_machine-api-operator_00_namespace_cluster-api.yaml b/install/0000_30_machine-api-operator_00_namespace_cluster-api.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: openshift-cluster-api
+  labels:
+    name: openshift-cluster-api
+    openshift.io/run-level: "1"
diff --git a/install/0000_30_machine-api-operator_01_images.configmap.yaml b/install/0000_30_machine-api-operator_01_images.configmap.yaml
@@ -2,6 +2,6 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: machine-api-operator-images
-  namespace: openshift-cluster-api
+  namespace: openshift-machine-api
 data:
   images.json: '{"machineAPIOperator": "docker.io/openshift/origin-machine-api-operator:v4.0.0", "clusterAPIControllerAWS": "docker.io/openshift/origin-aws-machine-controllers:v4.0.0", "clusterAPIControllerOpenStack": "docker.io/openshift/origin-openstack-machine-controllers:v4.0.0", "clusterAPIControllerLibvirt": "docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0"}'
diff --git a/install/0000_30_machine-api-operator_13_rbac.yaml b/install/0000_30_machine-api-operator_13_rbac.yaml
@@ -2,11 +2,11 @@
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
-  name: default-account-openshift-cluster-api
+  name: default-account-openshift-machine-api
 subjects:
 - kind: ServiceAccount
   name: default
-  namespace: openshift-cluster-api
+  namespace: openshift-machine-api
 roleRef:
   kind: ClusterRole
   name: cluster-admin
diff --git a/install/0000_30_machine-api-operator_14_deployment.yaml b/install/0000_30_machine-api-operator_14_deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   name: machine-api-operator
-  namespace: openshift-cluster-api
+  namespace: openshift-machine-api
   labels:
     k8s-app: machine-api-operator
 spec:
diff --git a/test/e2e/operator_expectations.go b/test/e2e/operator_expectations.go
@@ -139,7 +139,7 @@ func (tc *testConfig) ExpectAllMachinesLinkedToANode() error {
 
 func (tc *testConfig) ExpectReconcileControllersDeployment() error {
 	key := types.NamespacedName{
-		Namespace: namespace,
+		Namespace: "openshift-machine-api",
 		Name:      "clusterapi-manager-controllers",
 	}
 	d := &kappsapi.Deployment{}
diff --git a/test/integration/generate.sh b/test/integration/generate.sh
@@ -7,7 +7,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: aws-credentials-secret
-  namespace: openshift-cluster-api
+  namespace: openshift-machine-api
 type: Opaque
 data:
   awsAccessKeyId: $(echo -n $(aws configure get aws_access_key_id) | base64)
diff --git a/test/integration/main.go b/test/integration/main.go
@@ -38,7 +38,7 @@ const (
 	timeoutPoolMachineSetRunningInterval    = 10 * time.Minute
 
 	defaultLogLevel          = "info"
-	targetNamespace          = "openshift-cluster-api"
+	targetNamespace          = "openshift-machine-api"
 	awsCredentialsSecretName = "aws-credentials-secret"
 	region                   = "us-east-1"
 	machineSetReplicas       = 2
diff --git a/test/integration/manifests/cluster.yaml b/test/integration/manifests/cluster.yaml
@@ -2,7 +2,7 @@ apiVersion: machine.openshift.io/v1beta1
 kind: Cluster
 metadata:
   name: {{ .ClusterID }}
-  namespace: openshift-cluster-api
+  namespace: openshift-machine-api
 spec:
   clusterNetwork:
     pods:
diff --git a/test/integration/manifests/ign-config.yaml b/test/integration/manifests/ign-config.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: ignition-worker
-  namespace: openshift-cluster-api
+  namespace: openshift-machine-api
 type: Opaque
 data:
   userData: ""
diff --git a/test/integration/manifests/images.configmap.yaml b/test/integration/manifests/images.configmap.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: machine-api-operator-images
-  namespace: openshift-cluster-api
+  namespace: openshift-machine-api
 data:
   images.json: '{
 	"clusterAPIControllerAWS": "docker.io/openshift/origin-aws-machine-controllers:v4.0.0",
diff --git a/test/integration/manifests/machineset.yaml b/test/integration/manifests/machineset.yaml
@@ -6,7 +6,7 @@ metadata:
     sigs.k8s.io/cluster-api-machine-role: worker
     sigs.k8s.io/cluster-api-machine-type: worker
   name: worker
-  namespace: openshift-cluster-api
+  namespace: openshift-machine-api
 spec:
   replicas: 2
   selector:
diff --git a/test/integration/manifests/operator-deployment.yaml b/test/integration/manifests/operator-deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1beta2
 kind: Deployment
 metadata:
   name: machine-api-operator
-  namespace: openshift-cluster-api
+  namespace: openshift-machine-api
   labels:
     k8s-app: machine-api-operator
 spec:
diff --git a/test/integration/manifests/rbac.yaml b/test/integration/manifests/rbac.yaml
@@ -2,11 +2,11 @@
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
-  name: default-account-openshift-cluster-api
+  name: default-account-openshift-machine-api
 subjects:
 - kind: ServiceAccount
   name: default
-  namespace: openshift-cluster-api
+  namespace: openshift-machine-api
 roleRef:
   kind: ClusterRole
   name: cluster-admin

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`
`10`	`10`	`const (`
`11`	`11`	`componentName = "machine-api-operator"`
`12`		`- componentNamespace = "openshift-cluster-api"`
	`12`	`+ componentNamespace = "openshift-machine-api"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`var (`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ func (tc *testConfig) ExpectAllMachinesLinkedToANode() error {`
`139`	`139`
`140`	`140`	`func (tc *testConfig) ExpectReconcileControllersDeployment() error {`
`141`	`141`	`key := types.NamespacedName{`
`142`		`- Namespace: namespace,`
	`142`	`+ Namespace: "openshift-machine-api",`
`143`	`143`	`Name: "clusterapi-manager-controllers",`
`144`	`144`	`}`
`145`	`145`	`d := &kappsapi.Deployment{}`