From 425ac3dee7ef557bc5f229eca7c831007bcb857c Mon Sep 17 00:00:00 2001 From: Mike Fedosin Date: Wed, 13 Feb 2019 16:38:17 +0100 Subject: [PATCH] Update machines namespace for OpenStack PR https://github.com/openshift/installer/pull/1215 changed namespaces for machines and machinesets for all providers, except OpenStack. This commit fixes the remaining parts. --- pkg/asset/machines/openstack/machines.go | 2 +- pkg/asset/machines/openstack/machinesets.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/asset/machines/openstack/machines.go b/pkg/asset/machines/openstack/machines.go index 44969435c8a..32819d5f73a 100644 --- a/pkg/asset/machines/openstack/machines.go +++ b/pkg/asset/machines/openstack/machines.go @@ -56,7 +56,7 @@ func Machines(clusterID string, config *types.InstallConfig, pool *types.Machine Kind: "Machine", }, ObjectMeta: metav1.ObjectMeta{ - Namespace: "openshift-cluster-api", + Namespace: "openshift-machine-api", Name: fmt.Sprintf("%s-%s-%d", clustername, pool.Name, idx), Labels: map[string]string{ "sigs.k8s.io/cluster-api-cluster": clustername, diff --git a/pkg/asset/machines/openstack/machinesets.go b/pkg/asset/machines/openstack/machinesets.go index 0063ddaf8cc..3046107af2f 100644 --- a/pkg/asset/machines/openstack/machinesets.go +++ b/pkg/asset/machines/openstack/machinesets.go @@ -46,7 +46,7 @@ func MachineSets(clusterID string, config *types.InstallConfig, pool *types.Mach Kind: "MachineSet", }, ObjectMeta: metav1.ObjectMeta{ - Namespace: "openshift-cluster-api", + Namespace: "openshift-machine-api", Name: name, Labels: map[string]string{ "sigs.k8s.io/cluster-api-cluster": clustername,