Merge pull request openshift#7223 from bfournie/network-override

AGENT-624: Allow override of networkType

Author: openshift-merge-robot

pkg/asset/agent/manifests/agentclusterinstall.go

@@ -77,6 +77,8 @@ type agentClusterInstallInstallConfigOverrides struct {
 	Capabilities *types.Capabilities `json:"capabilities,omitempty"`
 	// AdditionalTrustBundle must be set here when mirroring not configured
 	AdditionalTrustBundle string `json:"additionalTrustBundle,omitempty"`
+	// Allow override of network type
+	Networking *types.Networking `json:"networking,omitempty"`
 }
 
 var _ asset.WritableAsset = (*AgentClusterInstall)(nil)
@@ -190,7 +192,11 @@ func (a *AgentClusterInstall) Generate(dependencies asset.Parents) error {
 			agentClusterInstall.Spec.IngressVIP = installConfig.Config.Platform.VSphere.IngressVIPs[0]
 		}
 
-		setNetworkType(agentClusterInstall, installConfig.Config, "NetworkType is not specified in InstallConfig.")
+		networkOverridden := setNetworkType(agentClusterInstall, installConfig.Config, "NetworkType is not specified in InstallConfig.")
+		if networkOverridden {
+			icOverridden = true
+			icOverrides.Networking = installConfig.Config.Networking
+		}
 
 		if installConfig.Config.Capabilities != nil {
 			icOverrides.Capabilities = installConfig.Config.Capabilities
@@ -296,23 +302,29 @@ func (a *AgentClusterInstall) finish() error {
 }
 
 // Sets the default network type to OVNKubernetes if it is unspecified in the
-// AgentClusterInstall or InstallConfig
+// AgentClusterInstall or InstallConfig.
 func setNetworkType(aci *hiveext.AgentClusterInstall, installConfig *types.InstallConfig,
-	warningMessage string) {
-
+	warningMessage string) bool {
 	if aci.Spec.Networking.NetworkType != "" {
-		return
+		return false
 	}
 
 	if installConfig != nil && installConfig.Networking != nil &&
 		installConfig.Networking.NetworkType != "" {
-		aci.Spec.Networking.NetworkType = installConfig.NetworkType
-		return
+		if installConfig.Networking.NetworkType == string(operv1.NetworkTypeOVNKubernetes) || installConfig.Networking.NetworkType == string(operv1.NetworkTypeOpenShiftSDN) {
+			aci.Spec.Networking.NetworkType = installConfig.NetworkType
+			return false
+		}
+
+		// Set OVNKubernetes in AgentClusterInstall and return true to indicate InstallConfigOverride should be used
+		aci.Spec.Networking.NetworkType = string(operv1.NetworkTypeOVNKubernetes)
+		return true
 	}
 
 	defaults.SetInstallConfigDefaults(installConfig)
 	logrus.Infof("%s Defaulting NetworkType to %s.", warningMessage, installConfig.NetworkType)
 	aci.Spec.Networking.NetworkType = installConfig.NetworkType
+	return false
 }
 
 func isIPv6(ipAddress net.IP) bool {

pkg/asset/agent/manifests/agentclusterinstall_test.go

@@ -66,6 +66,14 @@ func TestAgentClusterInstall_Generate(t *testing.T) {
 		installConfigOverrides: `{"additionalTrustBundle":"-----BEGIN CERTIFICATE-----MIIDZTCCAk2gAwIBAgIURbA8lR+5xlJZUoOXK66AHFWd3uswDQYJKoZIhvcNAQELBQAwQjELMAkGA1UEBhMCWFgxFTATBgNVBAcMDERlZmF1bHQgQ2l0eTEcMBoGA1UECgwTRGVmYXVsdCBDb21wYW55IEx0ZDAeFw0yMjA3MDgxOTUzMTVaFw0yMjA4MDcxOTUzMTVaMEIxCzAJBgNVBAYTAlhYMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkxHDAaBgNVBAoME0RlZmF1bHQgQ29tcGFueSBMdGQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCroH9c2PLWI0O/nBrmKtS2IuReyWaR0DOMJY7C/vc12l9zlH0DxTOUfEtdqRktjVsUn1vIIiFakxd0QLIPcMyKplmbavIBUQp+MZr0pNVX+lwcctbA7FVHEnbWYNVepoV7kZkTVvMXAqFylMXU4gDmuZzIxhVMMxjialJNED+3ngqvX4w34q4KSk1ytaHGwjREIErwPJjv5PK48KVJL2nlCuA+tbxu1r8eVkOUvZlxAuNNXk/Umf3QX5EiUlTtsmRAct6fIUT3jkrsHSS/tZ66EYJ9Q0OBoX2lL/Msmi27OQvA7uYnuqYlwJzU43tCsiip9E9z/UrLcMYyXx3oPJyPAgMBAAGjUzBRMB0GA1UdDgQWBBTIahE8DDT4T1vta6cXVVaRjnel0zAfBgNVHSMEGDAWgBTIahE8DDT4T1vta6cXVVaRjnel0zAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCQbsMtPFkqPxwOAIds3IoupuyIKmsF32ECEH/OlS+7Sj7MUJnGTQrwgjrsVS5sl8AmnGx4hPdLVX98nEcKMNkph3Hkvh4EvgjSfmYGUXuJBcYU5jqNQrlrGv37rEf5FnvdHV1F3MG8A0Mj0TLtcTdtaJFoOrnQuD/k0/1d+cMiYGTSaT5XK/unARqGEMd4BlWPh5P3SflV/Vy2hHlMpv7OcZ8yaAI3htENZLus+L5kjHWKu6dxlPHKu6ef5k64su2LTNE07Vr9S655uiFW5AX2wDVUcQEDCOiEn6SI9DTt5oQjWPMxPf+rEyfQ2f1QwVez7cyr6Qc5OIUk31HnM/Fj-----END CERTIFICATE-----"}`,
 	})
 
+	installConfigWithNetworkOverride := getValidOptionalInstallConfig()
+	installConfigWithNetworkOverride.Config.Networking.NetworkType = "CustomNetworkType"
+
+	goodNetworkOverrideACI := getGoodACI()
+	goodNetworkOverrideACI.SetAnnotations(map[string]string{
+		installConfigOverrides: `{"networking":{"networkType":"CustomNetworkType","machineNetwork":[{"cidr":"10.10.11.0/24"}],"clusterNetwork":[{"cidr":"192.168.111.0/24","hostPrefix":23}],"serviceNetwork":["172.30.0.0/16"]}}`,
+	})
+
 	cases := []struct {
 		name           string
 		dependencies   []asset.Asset
@@ -135,6 +143,13 @@ func TestAgentClusterInstall_Generate(t *testing.T) {
 			},
 			expectedConfig: goodAdditionalTrustBundleACI,
 		},
+		{
+			name: "valid configuration with custom network type",
+			dependencies: []asset.Asset{
+				installConfigWithNetworkOverride,
+			},
+			expectedConfig: goodNetworkOverrideACI,
+		},
 	}
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {