deprecate global HostSubnetLength

openshift · Jul 7, 2017 · 366baeb · 366baeb
1 parent 30cfdbd
commit 366baeb
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/pkg/cmd/server/api/types.go b/pkg/cmd/server/api/types.go
@@ -614,7 +614,7 @@ type MasterNetworkConfig struct {
 	NetworkPluginName    string
 	DeprecatedClusterNetworkCIDR   string
 	ClusterNetworks []ClusterNetworkEntry
-	HostSubnetLength     uint32
+	DeprecatedHostSubnetLength     uint32
 	ServiceNetworkCIDR   string
 	// ExternalIPNetworkCIDRs controls what values are acceptable for the service external IP field. If empty, no externalIP
 	// may be set. It may contain a list of CIDRs which are checked for access. If a CIDR is prefixed with !, IPs in that

diff --git a/pkg/cmd/server/api/v1/conversions.go b/pkg/cmd/server/api/v1/conversions.go
@@ -79,7 +79,7 @@ func addDefaultingFuncs(scheme *runtime.Scheme) error {
 			setDefault_ClientConnectionOverrides(obj.MasterClients.ExternalKubernetesClientConnectionOverrides)
 
 			if len(obj.NetworkConfig.ClusterNetworks) == 0 {
-				obj.NetworkConfig.ClusterNetworks = []ClusterNetworkEntry{{CIDR: obj.NetworkConfig.DeprecatedClusterNetworkCIDR}}
+				obj.NetworkConfig.ClusterNetworks = []ClusterNetworkEntry{{CIDR: obj.NetworkConfig.DeprecatedClusterNetworkCIDR, HostSubnetLength: obj.NetworkConfig.DeprecatedHostSubnetLength}}
 			}
 			// Populate the new NetworkConfig.ServiceNetworkCIDR field from the KubernetesMasterConfig.ServicesSubnet field if needed
 			if len(obj.NetworkConfig.ServiceNetworkCIDR) == 0 {

diff --git a/pkg/cmd/server/api/v1/types.go b/pkg/cmd/server/api/v1/types.go
@@ -499,8 +499,8 @@ type MasterNetworkConfig struct {
 	DeprecatedClusterNetworkCIDR string `json:"clusterNetworkCIDR,omitempty`
 	// ClusterNetworks is a list of cluster networks that defines the global overlay network's L3 space
 	ClusterNetworks []ClusterNetworkEntry `json:"clusterNetworks"`
-	// HostSubnetLength is the number of bits to allocate to each host's subnet e.g. 8 would mean a /24 network on the host
-	HostSubnetLength uint32 `json:"hostSubnetLength"`
+	// DeprecatedHostSubnetLength and maintined for backwards compatibility
+	DeprecatedHostSubnetLength uint32 `json:"hostSubnetLength, omitempty"`
 	// ServiceNetwork is the CIDR string to specify the service networks
 	ServiceNetworkCIDR string `json:"serviceNetworkCIDR"`
 	// ExternalIPNetworkCIDRs controls what values are acceptable for the service external IP field. If empty, no externalIP

diff --git a/pkg/cmd/server/start/master_args.go b/pkg/cmd/server/start/master_args.go
@@ -282,7 +282,6 @@ func (args MasterArgs) BuildSerializeableMasterConfig() (*configapi.MasterConfig
 		NetworkConfig: configapi.MasterNetworkConfig{
 			NetworkPluginName:    args.NetworkArgs.NetworkPluginName,
 			ClusterNetworks: clusterNetworkConfig,
-			HostSubnetLength:     args.NetworkArgs.HostSubnetLength,
 			ServiceNetworkCIDR:   args.NetworkArgs.ServiceNetworkCIDR,
 		},
 

diff --git a/pkg/sdn/plugin/master.go b/pkg/sdn/plugin/master.go
@@ -63,7 +63,7 @@ func StartMaster(networkConfig osconfigapi.MasterNetworkConfig, osClient *osclie
 
 		//		Network:          networkConfig.ClusterNetworkCIDR,
 		ClusterNetworks:       clusterNetworkEntries,
-		HostSubnetLength: networkConfig.HostSubnetLength,
+		//HostSubnetLength: networkConfig.HostSubnetLength,
 		ServiceNetwork:   networkConfig.ServiceNetworkCIDR,
 		PluginName:       networkConfig.NetworkPluginName,
 	}