Merge pull request #16649 from smarterclayton/clusternetwork

Automatic merge from submit-queue (batch tested with PRs 16644, 16649, 16656, 16651, 16663).

Switch from defaulting to converting clusterNetworkCIDR

Fixes break. On disk, deprecated fields override the first value in
the clusterNetworks array if specified. When writing out, the deprecated
fields are set to the first value of the network CIDR.

Fixes #16627

This fixes oc cluster up. @csrwng @JacobTanenbaum

Author: openshift-merge-robot

pkg/cmd/server/api/serialization_test.go

@@ -112,14 +112,22 @@ func fuzzInternalObject(t *testing.T, forVersion schema.GroupVersion, item runti
 					obj.NetworkConfig.ServiceNetworkCIDR = "10.0.0.0/24"
 				}
 			}
-			if len(obj.NetworkConfig.ClusterNetworks) == 0 {
-				clusterNetwork := []configapi.ClusterNetworkEntry{
-					{
-						CIDR:             "10.128.0.0/14",
-						HostSubnetLength: 9,
-					},
+			if c.RandBool() {
+				if len(obj.NetworkConfig.ClusterNetworks) == 0 {
+					clusterNetwork := []configapi.ClusterNetworkEntry{
+						{
+							CIDR:             "10.128.0.0/14",
+							HostSubnetLength: 9,
+						},
+					}
+					obj.NetworkConfig.ClusterNetworks = clusterNetwork
 				}
-				obj.NetworkConfig.ClusterNetworks = clusterNetwork
+				obj.NetworkConfig.DeprecatedClusterNetworkCIDR = obj.NetworkConfig.ClusterNetworks[0].CIDR
+				obj.NetworkConfig.DeprecatedHostSubnetLength = obj.NetworkConfig.ClusterNetworks[0].HostSubnetLength
+			} else {
+				obj.NetworkConfig.ClusterNetworks = nil
+				obj.NetworkConfig.DeprecatedClusterNetworkCIDR = ""
+				obj.NetworkConfig.DeprecatedHostSubnetLength = 0
 			}
 
 			// TODO stop duplicating the conversion in the test.

pkg/cmd/server/api/v1/conversions.go

@@ -90,12 +90,6 @@ func SetDefaults_MasterConfig(obj *MasterConfig) {
 			obj.NetworkConfig.ServiceNetworkCIDR = "10.0.0.0/24"
 		}
 	}
-	if len(obj.NetworkConfig.ClusterNetworks) == 0 {
-		obj.NetworkConfig.ClusterNetworks = []ClusterNetworkEntry{{CIDR: obj.NetworkConfig.DeprecatedClusterNetworkCIDR, HostSubnetLength: obj.NetworkConfig.DeprecatedHostSubnetLength}}
-
-		obj.NetworkConfig.DeprecatedClusterNetworkCIDR = ""
-		obj.NetworkConfig.DeprecatedHostSubnetLength = 0
-	}
 
 	// TODO Detect cloud provider when not using built-in kubernetes
 	kubeConfig := obj.KubernetesMasterConfig
@@ -371,6 +365,35 @@ func addConversionFuncs(scheme *runtime.Scheme) error {
 			out.DynamicProvisioningEnabled = &enabled
 			return nil
 		},
+		func(in *MasterNetworkConfig, out *internal.MasterNetworkConfig, s conversion.Scope) error {
+			if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
+				return err
+			}
+			if len(in.DeprecatedClusterNetworkCIDR) > 0 || in.DeprecatedHostSubnetLength > 0 {
+				if len(out.ClusterNetworks) > 0 {
+					out.ClusterNetworks[0].CIDR = in.DeprecatedClusterNetworkCIDR
+					out.ClusterNetworks[0].HostSubnetLength = in.DeprecatedHostSubnetLength
+				} else {
+					out.ClusterNetworks = []internal.ClusterNetworkEntry{
+						{
+							CIDR:             in.DeprecatedClusterNetworkCIDR,
+							HostSubnetLength: in.DeprecatedHostSubnetLength,
+						},
+					}
+				}
+			}
+			return nil
+		},
+		func(in *internal.MasterNetworkConfig, out *MasterNetworkConfig, s conversion.Scope) error {
+			if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
+				return err
+			}
+			if len(in.ClusterNetworks) > 0 {
+				out.DeprecatedHostSubnetLength = in.ClusterNetworks[0].HostSubnetLength
+				out.DeprecatedClusterNetworkCIDR = in.ClusterNetworks[0].CIDR
+			}
+			return nil
+		},
 
 		metav1.Convert_resource_Quantity_To_resource_Quantity,
 		metav1.Convert_bool_To_Pointer_bool,

pkg/cmd/server/api/validation/master.go

@@ -849,10 +849,10 @@ func ValidateIngressIPNetworkCIDR(config *api.MasterConfig, fldPath *field.Path)
 func ValidateDeprecatedClusterNetworkConfig(config *api.MasterConfig, fldPath *field.Path) ValidationResults {
 	validationResults := ValidationResults{}
 
-	if len(config.NetworkConfig.ClusterNetworks) > 0 && config.NetworkConfig.DeprecatedHostSubnetLength != 0 {
+	if len(config.NetworkConfig.ClusterNetworks) > 0 && config.NetworkConfig.DeprecatedHostSubnetLength != config.NetworkConfig.ClusterNetworks[0].HostSubnetLength {
 		validationResults.AddErrors(field.Invalid(fldPath.Child("hostSubnetLength"), config.NetworkConfig.DeprecatedHostSubnetLength, "cannot set hostSubnetLength and clusterNetworks, please use clusterNetworks"))
 	}
-	if len(config.NetworkConfig.ClusterNetworks) > 0 && config.NetworkConfig.DeprecatedClusterNetworkCIDR != "" {
+	if len(config.NetworkConfig.ClusterNetworks) > 0 && config.NetworkConfig.DeprecatedClusterNetworkCIDR != config.NetworkConfig.ClusterNetworks[0].CIDR {
 		validationResults.AddErrors(field.Invalid(fldPath.Child("clusterNetworkCIDR"), config.NetworkConfig.DeprecatedClusterNetworkCIDR, "cannot set clusterNetworkCIDR and clusterNetworks, please use clusterNetworks"))
 	}
 	return validationResults