Merge pull request #873 from frobware/handle-external-platform-type

NE-1124: Add support for External platform to CIO

go.mod

@@ -15,7 +15,7 @@ require (
 	github.com/go-logr/zapr v1.2.3
 	github.com/google/go-cmp v0.5.8
 	github.com/kevinburke/go-bindata v3.11.0+incompatible
-	github.com/openshift/api v0.0.0-20221108231433-20f563788aff
+	github.com/openshift/api v0.0.0-20221216185748-4beb701aa75b
 	github.com/openshift/client-go v0.0.0-20220831193253-4950ae70c8ea
 	github.com/openshift/library-go v0.0.0-20220920133651-093893cf326b
 	github.com/pkg/errors v0.9.1

go.sum

@@ -541,8 +541,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.10.5/go.mod h1:gza4q3jKQJijlu05nKWRCW/GavJumGt8aNRxWg7mt48=
 github.com/onsi/gomega v1.20.1 h1:PA/3qinGoukvymdIDV8pii6tiZgC8kbmJO6Z5+b002Q=
-github.com/openshift/api v0.0.0-20221108231433-20f563788aff h1:kODFdmoirVGQ46qugmYguGJZivUG8AwXnKquc3n35HU=
-github.com/openshift/api v0.0.0-20221108231433-20f563788aff/go.mod h1:aQ6LDasvHMvHZXqLHnX2GRmnfTWCF/iIwz8EMTTIE9A=
+github.com/openshift/api v0.0.0-20221216185748-4beb701aa75b h1:IVaKarQWuJF673+gxnpuI3itXU5bEfeIewKEal63abs=
+github.com/openshift/api v0.0.0-20221216185748-4beb701aa75b/go.mod h1:OW9hi5XDXOQWm/kRqUww6RVxZSf0nqrS4heerSmHBC4=
 github.com/openshift/client-go v0.0.0-20220831193253-4950ae70c8ea h1:7JbjIzWt3Q75ErY1PAZ+gCA+bErI6HSlpffHFmMMzqM=
 github.com/openshift/client-go v0.0.0-20220831193253-4950ae70c8ea/go.mod h1:+J8DqZC60acCdpYkwVy/KH4cudgWiFZRNOBeghCzdGA=
 github.com/openshift/library-go v0.0.0-20220920133651-093893cf326b h1:LWwB7uN91G/JsMnZFd0+q6ZzAXlB4/oUOfpZWA585gw=

pkg/operator/controller/ingress/controller_test.go

@@ -289,6 +289,12 @@ func TestSetDefaultPublishingStrategySetsPlatformDefaults(t *testing.T) {
 			expectedIC:              ingressControllerWithHostNetwork,
 			domainMatchesBaseDomain: true,
 		},
+		{
+			name:                    "External platform",
+			platformStatus:          makePlatformStatus(configv1.ExternalPlatformType),
+			expectedIC:              ingressControllerWithHostNetwork,
+			domainMatchesBaseDomain: true,
+		},
 		{
 			name:                    "OpenStack",
 			platformStatus:          makePlatformStatus(configv1.OpenStackPlatformType),

pkg/operator/controller/ingress/dns_test.go

@@ -223,6 +223,13 @@ func TestManageDNSForDomain(t *testing.T) {
 			platformType: configv1.NonePlatformType,
 			expected:     true,
 		},
+		{
+			name:         "domain does not match the baseDomain on external platform",
+			domain:       "test.local",
+			baseDomain:   "openshift.example.com",
+			platformType: configv1.ExternalPlatformType,
+			expected:     true,
+		},
 	}
 
 	for _, tc := range tests {

pkg/operator/controller/ingress/load_balancer_service.go

@@ -167,7 +167,8 @@ var (
 		configv1.OpenStackPlatformType: {
 			openstackInternalLBAnnotation: "true",
 		},
-		configv1.NonePlatformType: nil,
+		configv1.NonePlatformType:     nil,
+		configv1.ExternalPlatformType: nil,
 		// vSphere does not support load balancers as of 2019-06-17.
 		configv1.VSpherePlatformType: nil,
 		configv1.IBMCloudPlatformType: {

pkg/operator/operator.go

@@ -321,7 +321,7 @@ func (o *Operator) handleSingleNode4Dot11Upgrade() error {
 	if len(nodes.Items) == 1 &&
 		infraConfig.Status.ControlPlaneTopology == configv1.SingleReplicaTopologyMode &&
 		infraConfig.Status.InfrastructureTopology == configv1.SingleReplicaTopologyMode &&
-		infraConfig.Status.PlatformStatus.Type == configv1.NonePlatformType {
+		(infraConfig.Status.PlatformStatus.Type == configv1.NonePlatformType || infraConfig.Status.PlatformStatus.Type == configv1.ExternalPlatformType) {
 		desiredDefaultPlacement = configv1.DefaultPlacementControlPlane
 	}