Merge pull request #275 from russellb/baremetal-api

openshift-merge-robot · web-flow · commit fac430da94b6 · 2019-05-03T14:58:04.000+02:00
Use BareMetal platform constant from openshift/api
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/pkg/operator/config.go b/pkg/operator/config.go
@@ -16,7 +16,6 @@ const (
 	clusterAPIControllerKubemark = "docker.io/gofed/kubemark-machine-controllers:v1.0"
 	clusterAPIControllerNoOp     = "no-op"
 	kubemarkPlatform             = configv1.PlatformType("kubemark")
-	bareMetalPlatform            = configv1.PlatformType("BareMetal")
 )
 
 type Provider string
@@ -74,7 +73,7 @@ func getProviderControllerFromImages(platform configv1.PlatformType, images Imag
 		return images.ClusterAPIControllerOpenStack, nil
 	case configv1.AzurePlatformType:
 		return images.ClusterAPIControllerAzure, nil
-	case bareMetalPlatform:
+	case configv1.BareMetalPlatformType:
 		return images.ClusterAPIControllerBareMetal, nil
 	case kubemarkPlatform:
 		return clusterAPIControllerKubemark, nil
diff --git a/pkg/operator/config_test.go b/pkg/operator/config_test.go
@@ -52,10 +52,10 @@ func TestGetProviderFromInfrastructure(t *testing.T) {
 	}, {
 		infra: &configv1.Infrastructure{
 			Status: configv1.InfrastructureStatus{
-				Platform: bareMetalPlatform,
+				Platform: configv1.BareMetalPlatformType,
 			},
 		},
-		expected: bareMetalPlatform,
+		expected: configv1.BareMetalPlatformType,
 	}, {
 		infra: &configv1.Infrastructure{
 			Status: configv1.InfrastructureStatus{
@@ -129,7 +129,7 @@ func TestGetProviderControllerFromImages(t *testing.T) {
 			expectedImage: expectedOpenstackImage,
 		},
 		{
-			provider:      bareMetalPlatform,
+			provider:      configv1.BareMetalPlatformType,
 			expectedImage: expectedBareMetalImage,
 		},
 		{
diff --git a/pkg/operator/operator_test.go b/pkg/operator/operator_test.go
@@ -50,7 +50,7 @@ func TestOperatorSync_NoOp(t *testing.T) {
 			expectedNoop: false,
 		},
 		{
-			platform:     bareMetalPlatform,
+			platform:     configv1.BareMetalPlatformType,
 			expectedNoop: false,
 		},
 		{

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ func TestOperatorSync_NoOp(t *testing.T) {`
`50`	`50`	`expectedNoop: false,`
`51`	`51`	`},`
`52`	`52`	`{`
`53`		`- platform: bareMetalPlatform,`
	`53`	`+ platform: configv1.BareMetalPlatformType,`
`54`	`54`	`expectedNoop: false,`
`55`	`55`	`},`
`56`	`56`	`{`