Allow AWS and Azure as platforms that support dual-stack on Day-0

1. Added AWS and Azure as platforms that support DualStack on Day-0
2. Created another set of platforms that support DualStack on Day-2
3. Updated Render logic to take enabled featuregates into consideration
to determine supported DualStack platforms
4. Updated tests to reflect the newly supported platforms and when
they support DualStack.

Author: sadasu

pkg/network/cluster_config_test.go

@@ -371,8 +371,11 @@ func TestValidateClusterConfigDualStack(t *testing.T) {
 	err = ValidateClusterConfig(&configv1.Network{Spec: cc}, client)
 	g.Expect(err).NotTo(HaveOccurred())
 
-	// You can't use dual-stack if this is anything else but BareMetal or NonePlatformType
-	infrastructure.Status.PlatformStatus.Type = configv1.AzurePlatformType
+	// You can't use dual-stack if enabled on an unsupported platform
+	infrastructure.Status.PlatformStatus.Type = configv1.GCPPlatformType
+	infrastructure.Status.PlatformStatus.GCP = &configv1.GCPPlatformStatus{
+		Region: "us-west1",
+	}
 	client = fake.NewFakeClient(infrastructure)
 	err = createProxy(client)
 	g.Expect(err).NotTo(HaveOccurred())

pkg/network/render.go

@@ -38,6 +38,12 @@ var dualStackPlatforms = sets.NewString(
 	string(configv1.OpenStackPlatformType),
 )
 
+var conversionToDualStackPlatforms = sets.NewString(
+	string(configv1.BareMetalPlatformType),
+	string(configv1.NonePlatformType),
+	string(configv1.VSpherePlatformType),
+)
+
 const (
 	pluginName = "networking-console-plugin"
 )
@@ -47,6 +53,9 @@ func Render(operConf *operv1.NetworkSpec, clusterConf *configv1.NetworkSpec, man
 	var progressing bool
 	objs := []*uns.Unstructured{}
 
+	// Update the list of supported DualStack platforms based on enabled feature gates.
+	updateDualStackPlatforms(featureGates)
+
 	// render cloud network config controller **before** the network plugin.
 	// the network plugin is dependent upon having the cloud network CRD
 	// defined as to initialize its watcher, otherwise it will error and crash
@@ -400,13 +409,13 @@ func isNetworkChangeSafe(prev, next *operv1.NetworkSpec, infraRes *bootstrap.Inf
 		return isClusterNetworkChangeSafe(prev, next)
 	}
 
-	// Validate that this is either a BareMetal or None PlatformType. For all other
-	// PlatformTypes, migration to DualStack is prohibited
+	// Validate that this is a platform that supports DualStack. If it does, then check if
+	// migration to DualStack on day-2 is allowed.
 	if len(prev.ServiceNetwork) < len(next.ServiceNetwork) {
 		if !isSupportedDualStackPlatform(infraRes.PlatformType) {
 			return errors.Errorf("%s is not one of the supported platforms for dual stack (%s)", infraRes.PlatformType,
 				strings.Join(dualStackPlatforms.List(), ", "))
-		} else if string(configv1.OpenStackPlatformType) == string(infraRes.PlatformType) {
+		} else if !isConversionSupportedDualStackPlatform(infraRes.PlatformType) {
 			return errors.Errorf("%s does not allow conversion to dual-stack cluster", infraRes.PlatformType)
 		}
 	}
@@ -977,6 +986,10 @@ func isSupportedDualStackPlatform(platformType configv1.PlatformType) bool {
 	return dualStackPlatforms.Has(string(platformType))
 }
 
+func isConversionSupportedDualStackPlatform(platformType configv1.PlatformType) bool {
+	return conversionToDualStackPlatforms.Has(string(platformType))
+}
+
 func renderAdditionalRoutingCapabilities(conf *operv1.NetworkSpec, manifestDir string) ([]*uns.Unstructured, error) {
 	if conf == nil || conf.AdditionalRoutingCapabilities == nil {
 		return nil, nil
@@ -999,3 +1012,16 @@ func renderAdditionalRoutingCapabilities(conf *operv1.NetworkSpec, manifestDir s
 
 	return out, nil
 }
+
+// updateDualStackPlatforms checks for enabled feature gates and adds to the list
+// of platforms that support DualStack on Day-0. Currently the 2 platforms added here
+// donot support conversion to DualStack on Day-2. When that happens, we will need to
+// update `conversionToDualStackPlatforms` too.
+func updateDualStackPlatforms(featureGates featuregates.FeatureGate) {
+	if featureGates.Enabled(apifeatures.FeatureGateAWSDualStackInstall) {
+		dualStackPlatforms.Insert(string(configv1.AWSPlatformType))
+	}
+	if featureGates.Enabled(apifeatures.FeatureGateAzureDualStackInstall) {
+		dualStackPlatforms.Insert(string(configv1.AzurePlatformType))
+	}
+}

pkg/network/render_test.go

@@ -15,6 +15,7 @@ import (
 	"testing"
 
 	configv1 "github.com/openshift/api/config/v1"
+	apifeatures "github.com/openshift/api/features"
 	operv1 "github.com/openshift/api/operator/v1"
 	"github.com/openshift/cluster-network-operator/pkg/bootstrap"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -234,19 +235,19 @@ func TestDisallowMultipleClusterNetworksOfOldIPFamily(t *testing.T) {
 	g.Expect(err).To(MatchError(ContainSubstring("cannot add additional ClusterNetwork values of original IP family when migrating to dual stack")))
 }
 
-func TestAllowMigrationOnlyForBareMetalOrNoneType(t *testing.T) {
+func TestAllowMigrationOnlyForSupportedTypes(t *testing.T) {
 	g, infra, prev, next := setupTestInfraAndBasicRenderConfigs(t, OVNKubernetesConfig, OVNKubernetesConfig)
 
-	// You can't migrate from single-stack to dual-stack if this is anything else but
-	// BareMetal or NonePlatformType
-	infra.PlatformType = configv1.AzurePlatformType
-
 	next.ServiceNetwork = append(next.ServiceNetwork, "fd02::/112")
 	next.ClusterNetwork = append(next.ClusterNetwork, operv1.ClusterNetworkEntry{
 		CIDR:       "fd01::/48",
 		HostPrefix: 64,
 	},
 	)
+	// You can't migrate from single-stack to dual-stack if this is anything else but
+	// BareMetal, NonePlatformType, and VSphere
+	infra.PlatformType = configv1.GCPPlatformType
+
 	err := IsChangeSafe(prev, next, infra)
 	g.Expect(err).To(MatchError(ContainSubstring(fmt.Sprintf("%s is not one of the supported platforms for dual stack (%s)", infra.PlatformType,
 		strings.Join(dualStackPlatforms.List(), ", ")))))
@@ -401,7 +402,7 @@ func TestRenderUnknownNetwork(t *testing.T) {
 	bootstrapResult, err := Bootstrap(&config, client)
 	g.Expect(err).NotTo(HaveOccurred())
 
-	featureGatesCNO := featuregates.NewFeatureGate([]configv1.FeatureGateName{}, []configv1.FeatureGateName{})
+	featureGatesCNO := featuregates.NewFeatureGate([]configv1.FeatureGateName{apifeatures.FeatureGateAWSDualStackInstall, apifeatures.FeatureGateAzureDualStackInstall}, []configv1.FeatureGateName{})
 
 	objs, _, err := Render(prev, &configv1.NetworkSpec{}, manifestDir, client, featureGatesCNO, bootstrapResult)
 	g.Expect(err).NotTo(HaveOccurred())