Add OpenStack deprecated image for transitioning machine API groups

openshift · Feb 4, 2019 · 890f076 · 890f076
1 parent 1bbf62f
commit 890f076
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 15 deletions.
diff --git a/install/0000_50_machine-api-operator_01_images.configmap.yaml b/install/0000_50_machine-api-operator_01_images.configmap.yaml
@@ -4,4 +4,4 @@ metadata:
   name: machine-api-operator-images
   namespace: openshift-cluster-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", "clusterAPIControllerLibvirtDeprecated": "quay.io/coreos/cluster-api-provider-libvirt:origin-v4.0-2019-01-31-041134", "clusterAPIControllerAWSDeprecated": "quay.io/coreos/cluster-api-provider-aws:origin-v4.0-2019-01-31-041134"}'
+  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", "clusterAPIControllerLibvirtDeprecated": "quay.io/coreos/cluster-api-provider-libvirt:origin-v4.0-2019-01-31-041134", "clusterAPIControllerAWSDeprecated": "quay.io/coreos/cluster-api-provider-aws:origin-v4.0-2019-01-31-041134", "clusterAPIControllerOpenStackDeprecated": quay.io/coreos/cluster-api-provider-openstack:origin-v4.0-2019-01-31-041134}'
diff --git a/pkg/operator/config.go b/pkg/operator/config.go
@@ -48,12 +48,13 @@ type Controllers struct {
 
 // Images allows build systems to inject images for MAO components
 type Images struct {
-	MachineAPIOperator                    string `json:"machineAPIOperator"`
-	ClusterAPIControllerAWS               string `json:"clusterAPIControllerAWS"`
-	ClusterAPIControllerAWSDeprecated     string `json:"clusterAPIControllerAWSDeprecated"`
-	ClusterAPIControllerOpenStack         string `json:"clusterAPIControllerOpenStack"`
-	ClusterAPIControllerLibvirt           string `json:"clusterAPIControllerLibvirt"`
-	ClusterAPIControllerLibvirtDeprecated string `json:"clusterAPIControllerLibvirtDeprecated"`
+	MachineAPIOperator                      string `json:"machineAPIOperator"`
+	ClusterAPIControllerAWS                 string `json:"clusterAPIControllerAWS"`
+	ClusterAPIControllerAWSDeprecated       string `json:"clusterAPIControllerAWSDeprecated"`
+	ClusterAPIControllerOpenStack           string `json:"clusterAPIControllerOpenStack"`
+	ClusterAPIControllerLibvirt             string `json:"clusterAPIControllerLibvirt"`
+	ClusterAPIControllerLibvirtDeprecated   string `json:"clusterAPIControllerLibvirtDeprecated"`
+	ClusterAPIControllerOpenStackDeprecated string `json:"clusterAPIControllerOpenStackDeprecated"`
 }
 
 // InstallConfig contains the mao relevant config coming from the install config, i.e provider

diff --git a/pkg/operator/config_test.go b/pkg/operator/config_test.go
@@ -7,13 +7,14 @@ import (
 )
 
 var (
-	imagesJSONFile                  = "fixtures/images.json"
-	expectedAWSImage                = "docker.io/openshift/origin-aws-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"
-	expectedMachineAPIOperatorImage = "docker.io/openshift/origin-machine-api-operator:v4.0.0"
-	expectedAWSImageDeprecated      = "quay.io/coreos/cluster-api-provider-aws:origin-v4.0-2019-01-31-041134"
-	expectedLibvirtImageDeprecated  = "quay.io/coreos/cluster-api-provider-libvirt:origin-v4.0-2019-01-31-041134"
+	imagesJSONFile                   = "fixtures/images.json"
+	expectedAWSImage                 = "docker.io/openshift/origin-aws-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"
+	expectedMachineAPIOperatorImage  = "docker.io/openshift/origin-machine-api-operator:v4.0.0"
+	expectedAWSImageDeprecated       = "quay.io/coreos/cluster-api-provider-aws:origin-v4.0-2019-01-31-041134"
+	expectedLibvirtImageDeprecated   = "quay.io/coreos/cluster-api-provider-libvirt:origin-v4.0-2019-01-31-041134"
+	expectedOpenstackImageDeprecated = "quay.io/coreos/cluster-api-provider-openstack:origin-v4.0-2019-01-31-041134"
 )
 
 func TestInstallConfigFromClusterConfig(t *testing.T) {
@@ -142,6 +143,9 @@ func TestGetImagesFromJSONFile(t *testing.T) {
 	if img.ClusterAPIControllerLibvirtDeprecated != expectedLibvirtImageDeprecated {
 		t.Errorf("failed getImagesFromJSONFile. Expected: %s, got: %s", expectedLibvirtImageDeprecated, img.ClusterAPIControllerLibvirtDeprecated)
 	}
+	if img.ClusterAPIControllerOpenStackDeprecated != expectedOpenstackImageDeprecated {
+		t.Errorf("failed getImagesFromJSONFile. Expected: %s, got: %s", expectedOpenstackImageDeprecated, img.ClusterAPIControllerOpenStackDeprecated)
+	}
 }
 
 func TestGetProviderControllerFromImages(t *testing.T) {

diff --git a/pkg/operator/fixtures/images.json b/pkg/operator/fixtures/images.json
@@ -4,5 +4,6 @@
   "clusterAPIControllerLibvirt": "docker.io/openshift/origin-libvirt-machine-controllers:v4.0.0",
   "machineAPIOperator": "docker.io/openshift/origin-machine-api-operator:v4.0.0",
   "clusterAPIControllerLibvirtDeprecated": "quay.io/coreos/cluster-api-provider-libvirt:origin-v4.0-2019-01-31-041134",
-  "clusterAPIControllerAWSDeprecated": "quay.io/coreos/cluster-api-provider-aws:origin-v4.0-2019-01-31-041134"
+  "clusterAPIControllerAWSDeprecated": "quay.io/coreos/cluster-api-provider-aws:origin-v4.0-2019-01-31-041134",
+  "clusterAPIControllerOpenStackDeprecated": "quay.io/coreos/cluster-api-provider-openstack:origin-v4.0-2019-01-31-041134"
 }
diff --git a/pkg/operator/operator.go b/pkg/operator/operator.go
@@ -217,6 +217,8 @@ func (optr *Operator) maoConfigFromInstallConfig() (*OperatorConfig, error) {
 		providerDreprecatedControllerImage = images.ClusterAPIControllerAWSDeprecated
 	case LibvirtProvider:
 		providerDreprecatedControllerImage = images.ClusterAPIControllerLibvirtDeprecated
+	case OpenStackProvider:
+		providerDreprecatedControllerImage = images.ClusterAPIControllerOpenStackDeprecated
 	}
 
 	return &OperatorConfig{