Merge pull request #12305 from hakman/node_ip_families

Make AWS CCM NodeIPFamilies configurable

k8s/crds/kops.k8s.io_clusters.yaml

@@ -343,6 +343,12 @@ spec:
                   multizone:
                     description: GCE cloud-config options
                     type: boolean
+                  nodeIPFamilies:
+                    description: NodeIPFamilies controls the IP families reported
+                      for each node (AWS only).
+                    items:
+                      type: string
+                    type: array
                   nodeInstancePrefix:
                     type: string
                   nodeTags:

nodeup/pkg/model/cloudconfig.go

@@ -102,8 +102,8 @@ func (b *CloudConfigBuilder) Build(c *fi.ModelBuilderContext) error {
 		if cloudConfig.ElbSecurityGroup != nil {
 			lines = append(lines, "ElbSecurityGroup = "+*cloudConfig.ElbSecurityGroup)
 		}
-		if b.Cluster.Spec.IsIPv6Only() {
+		for _, family := range cloudConfig.NodeIPFamilies {
-			lines = append(lines, "NodeIPFamilies = ipv6")
+			lines = append(lines, "NodeIPFamilies = "+family)
 		}
 	case "openstack":
 		osc := cloudConfig.Openstack

nodeup/pkg/model/cloudconfig_test.go

@@ -24,6 +24,7 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/kops/pkg/apis/kops"
+	"k8s.io/kops/pkg/diff"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/nodeup/nodetasks"
 )
@@ -110,3 +111,58 @@ func TestBuildAzure(t *testing.T) {
 		t.Errorf("expected %+v, but got %+v", expected, actual)
 	}
 }
+
+func TestBuildAWSCustomNodeIPFamilies(t *testing.T) {
+	cluster := &kops.Cluster{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "testcluster.test.com",
+		},
+		Spec: kops.ClusterSpec{
+			CloudProvider: string(kops.CloudProviderAWS),
+			CloudConfig: &kops.CloudConfiguration{
+				NodeIPFamilies: []string{"ipv6"},
+			},
+			ExternalCloudControllerManager: &kops.CloudControllerManagerConfig{
+				CloudProvider: string(kops.CloudProviderAWS),
+			},
+			NonMasqueradeCIDR: "fd00:10:96::/64",
+		},
+	}
+
+	b := &CloudConfigBuilder{
+		NodeupModelContext: &NodeupModelContext{
+			Cluster: cluster,
+		},
+	}
+	ctx := &fi.ModelBuilderContext{
+		Tasks: map[string]fi.Task{},
+	}
+	if err := b.Build(ctx); err != nil {
+		t.Fatalf("unexpected error: %s", err)
+	}
+	var task *nodetasks.File
+	for _, v := range ctx.Tasks {
+		if f, ok := v.(*nodetasks.File); ok {
+			task = f
+			break
+		}
+	}
+	if task == nil {
+		t.Errorf("no File task found")
+	}
+	r, err := task.Contents.Open()
+	if err != nil {
+		t.Fatalf("unexpected error: %s", err)
+	}
+	awsCloudConfig, err := ioutil.ReadAll(r)
+	if err != nil {
+		t.Fatalf("unexpected error: %s", err)
+	}
+
+	actual := string(awsCloudConfig)
+	expected := "[global]\nNodeIPFamilies = ipv6\n"
+	if actual != expected {
+		diffString := diff.FormatDiff(expected, actual)
+		t.Errorf("actual did not match expected:\n%s\n", diffString)
+	}
+}

pkg/apis/kops/componentconfig.go

@@ -839,6 +839,8 @@ type CloudConfiguration struct {
 	Multizone          *bool   `json:"multizone,omitempty"`
 	NodeTags           *string `json:"nodeTags,omitempty"`
 	NodeInstancePrefix *string `json:"nodeInstancePrefix,omitempty"`
+	// NodeIPFamilies controls the IP families reported for each node (AWS only).
+	NodeIPFamilies []string `json:"nodeIPFamilies,omitempty"`
 	// GCEServiceAccount specifies the service account with which the GCE VM runs
 	GCEServiceAccount string `json:"gceServiceAccount,omitempty"`
 	// AWS cloud-config options

pkg/apis/kops/v1alpha2/componentconfig.go

@@ -838,6 +838,8 @@ type CloudConfiguration struct {
 	Multizone          *bool   `json:"multizone,omitempty"`
 	NodeTags           *string `json:"nodeTags,omitempty"`
 	NodeInstancePrefix *string `json:"nodeInstancePrefix,omitempty"`
+	// NodeIPFamilies controls the IP families reported for each node (AWS only).
+	NodeIPFamilies []string `json:"nodeIPFamilies,omitempty"`
 	// GCEServiceAccount specifies the service account with which the GCE VM runs
 	GCEServiceAccount string `json:"gceServiceAccount,omitempty"`
 	// AWS cloud-config options

pkg/apis/kops/v1alpha2/zz_generated.conversion.go

@@ -2031,6 +2031,7 @@ func autoConvert_v1alpha2_CloudConfiguration_To_kops_CloudConfiguration(in *Clou
 	out.Multizone = in.Multizone
 	out.NodeTags = in.NodeTags
 	out.NodeInstancePrefix = in.NodeInstancePrefix
+	out.NodeIPFamilies = in.NodeIPFamilies
 	out.GCEServiceAccount = in.GCEServiceAccount
 	out.DisableSecurityGroupIngress = in.DisableSecurityGroupIngress
 	out.ElbSecurityGroup = in.ElbSecurityGroup
@@ -2083,6 +2084,7 @@ func autoConvert_kops_CloudConfiguration_To_v1alpha2_CloudConfiguration(in *kops
 	out.Multizone = in.Multizone
 	out.NodeTags = in.NodeTags
 	out.NodeInstancePrefix = in.NodeInstancePrefix
+	out.NodeIPFamilies = in.NodeIPFamilies
 	out.GCEServiceAccount = in.GCEServiceAccount
 	out.DisableSecurityGroupIngress = in.DisableSecurityGroupIngress
 	out.ElbSecurityGroup = in.ElbSecurityGroup

pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go

@@ -624,6 +624,11 @@ func (in *CloudConfiguration) DeepCopyInto(out *CloudConfiguration) {
 		*out = new(string)
 		**out = **in
 	}
+	if in.NodeIPFamilies != nil {
+		in, out := &in.NodeIPFamilies, &out.NodeIPFamilies
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
 	if in.DisableSecurityGroupIngress != nil {
 		in, out := &in.DisableSecurityGroupIngress, &out.DisableSecurityGroupIngress
 		*out = new(bool)

pkg/apis/kops/zz_generated.deepcopy.go

@@ -708,6 +708,11 @@ func (in *CloudConfiguration) DeepCopyInto(out *CloudConfiguration) {
 		*out = new(string)
 		**out = **in
 	}
+	if in.NodeIPFamilies != nil {
+		in, out := &in.NodeIPFamilies, &out.NodeIPFamilies
+		*out = make([]string, len(*in))
+		copy(*out, *in)
+	}
 	if in.DisableSecurityGroupIngress != nil {
 		in, out := &in.DisableSecurityGroupIngress, &out.DisableSecurityGroupIngress
 		*out = new(bool)

pkg/model/components/cloudconfiguration.go

@@ -52,5 +52,9 @@ func (b *CloudConfigurationOptionsBuilder) BuildOptions(o interface{}) error {
 		c.ManageStorageClasses = manage
 	}
 
+	if clusterSpec.IsIPv6Only() && len(c.NodeIPFamilies) == 0 {
+		c.NodeIPFamilies = []string{"ipv6", "ipv4"}
+	}
+
 	return nil
 }