Merge pull request #978 from mandre/mapo-image

Bug 2040620: Rename MAPO image

install/0000_30_machine-api-operator_01_images.configmap.yaml

@@ -15,7 +15,7 @@ data:
       "clusterAPIControllerAWS": "registry.svc.ci.openshift.org/openshift:aws-machine-controllers",
       "clusterAPIControllerAlibaba": "registry.svc.ci.openshift.org/openshift:alibaba-machine-controllers",
       "clusterAPIControllerOpenStack": "registry.svc.ci.openshift.org/openshift:openstack-machine-controllers",
-      "clusterAPIControllerMAPO": "quay.io/openshift/origin-machine-api-provider-openstack",
+      "clusterAPIControllerMAPO": "quay.io/openshift/origin-openstack-machine-api-provider",
       "clusterAPIControllerLibvirt": "registry.svc.ci.openshift.org/openshift:libvirt-machine-controllers",
       "clusterAPIControllerBareMetal": "registry.svc.ci.openshift.org/openshift:baremetal-machine-controllers",
       "clusterAPIControllerAzure": "registry.svc.ci.openshift.org/openshift:azure-machine-controllers",

install/image-references

@@ -14,6 +14,10 @@ spec:
     from:
       kind: DockerImage
       name: registry.svc.ci.openshift.org/openshift:openstack-machine-controllers
+  - name: openstack-machine-api-provider
+    from:
+      kind: DockerImage
+      name: quay.io/openshift/origin-openstack-machine-api-provider
   - name: libvirt-machine-controllers
     from:
       kind: DockerImage

pkg/operator/config_test.go

@@ -12,7 +12,7 @@ var (
 	expectedAlibabaImage            = "docker.io/openshift/origin-alibaba-machine-controllers:v4.0.0"
 	expectedLibvirtImage            = "docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0"
 	expectedOpenstackImage          = "docker.io/openshift/origin-openstack-machine-controllers:v4.0.0"
-	expectedMAPOImage               = "quay.io/openshift/origin-machine-api-provider-openstack:v4.0.0"
+	expectedMAPOImage               = "quay.io/openshift/origin-openstack-machine-api-provider:v4.0.0"
 	expectedMachineAPIOperatorImage = "docker.io/openshift/origin-machine-api-operator:v4.0.0"
 	expectedKubeRBACProxyImage      = "docker.io/openshift/origin-kube-rbac-proxy:v4.0.0"
 	expectedBareMetalImage          = "quay.io/openshift/origin-baremetal-machine-controllers:v4.0.0"

pkg/operator/fixtures/images.json

@@ -2,7 +2,7 @@
   "clusterAPIControllerAWS": "docker.io/openshift/origin-aws-machine-controllers:v4.0.0",
   "clusterAPIControllerAlibaba": "docker.io/openshift/origin-alibaba-machine-controllers:v4.0.0",
   "clusterAPIControllerOpenStack": "docker.io/openshift/origin-openstack-machine-controllers:v4.0.0",
-  "clusterAPIControllerMAPO": "quay.io/openshift/origin-machine-api-provider-openstack:v4.0.0",
+  "clusterAPIControllerMAPO": "quay.io/openshift/origin-openstack-machine-api-provider:v4.0.0",
   "clusterAPIControllerLibvirt": "docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0",
   "machineAPIOperator": "docker.io/openshift/origin-machine-api-operator:v4.0.0",
   "clusterAPIControllerBareMetal": "quay.io/openshift/origin-baremetal-machine-controllers:v4.0.0",