Merge pull request #365 from andrewsykim/preferred-cidrs

add preferred apiserver CIDRs to network devices

Author: k8s-ci-robot

config/crds/vsphereproviderconfig_v1alpha1_vspheremachineproviderconfig.yaml

@@ -395,6 +395,10 @@ spec:
                     - networkName
                     type: object
                   type: array
+                preferredAPIServerCidr:
+                  description: PreferredAPIServeCIDR is the preferred CIDR for the
+                    Kubernetes API server endpoint on this machine
+                  type: string
                 routes:
                   description: Routes is a list of optional, static routes applied
                     to the virtual machine.

pkg/apis/vsphereproviderconfig/v1alpha1/vspheremachineproviderconfig_types.go

@@ -89,6 +89,11 @@ type NetworkSpec struct {
 	// machine.
 	// +optional
 	Routes []NetworkRouteSpec `json:"routes,omitempty"`
+
+	// PreferredAPIServeCIDR is the preferred CIDR for the Kubernetes API
+	// server endpoint on this machine
+	// +optional
+	PreferredAPIServerCIDR string `json:"preferredAPIServerCidr,omitempty"`
 }
 
 // NetworkDeviceSpec defines the network configuration for a virtual machine's

pkg/cloud/vsphere/context/machine_context.go

@@ -174,11 +174,33 @@ func (c *MachineContext) IPAddr() string {
 	if c.Machine == nil {
 		return ""
 	}
+
+	var err error
+	var preferredAPIServerCIDR *net.IPNet
+	if c.MachineConfig.MachineSpec.Network.PreferredAPIServerCIDR != "" {
+		_, preferredAPIServerCIDR, err = net.ParseCIDR(c.MachineConfig.MachineSpec.Network.PreferredAPIServerCIDR)
+		if err != nil {
+			c.Logger.Error(err, "error parsing preferred apiserver CIDR")
+			return ""
+		}
+
+		c.Logger.V(4).Info("detected preferred apiserver CIDR", "preferredAPIServerCIDR", preferredAPIServerCIDR)
+	}
+
 	for _, nodeAddr := range c.Machine.Status.Addresses {
-		if nodeAddr.Type == corev1.NodeInternalIP {
+		if nodeAddr.Type != corev1.NodeInternalIP {
+			continue
+		}
+
+		if preferredAPIServerCIDR == nil {
+			return nodeAddr.Address
+		}
+
+		if preferredAPIServerCIDR.Contains(net.ParseIP(nodeAddr.Address)) {
 			return nodeAddr.Address
 		}
 	}
+
 	return ""
 }
 

scripts/e2e/bootstrap_job/spec/provider-components.template

@@ -845,6 +845,10 @@ spec:
                     - networkName
                     type: object
                   type: array
+                preferredAPIServerCidr:
+                  description: PreferredAPIServeCIDR is the preferred CIDR for the
+                    Kubernetes API server endpoint on this machine
+                  type: string
                 routes:
                   description: Routes is a list of optional, static routes applied
                     to the virtual machine.