Dualstack support with AWS CCM (kubermatic#1466)

Signed-off-by: Sachin Tiptur <[email protected]> Signed-off-by: Sachin Tiptur <[email protected]>
mate4st · Mar 13, 2023 · 0703a68 · 0703a68
1 parent 052a8fe
commit 0703a68
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/pkg/cloudprovider/provider/aws/types/cloudconfig.go b/pkg/cloudprovider/provider/aws/types/cloudconfig.go
@@ -37,6 +37,9 @@ KubernetesClusterID={{ .Global.KubernetesClusterID | iniEscape }}
 DisableSecurityGroupIngress={{ .Global.DisableSecurityGroupIngress }}
 ElbSecurityGroup={{ .Global.ElbSecurityGroup | iniEscape }}
 DisableStrictZoneCheck={{ .Global.DisableStrictZoneCheck }}
+{{- range .Global.NodeIPFamilies }}
+NodeIPFamilies={{ . | iniEscape}}
+{{- end }}
 `
 )
 
@@ -55,6 +58,7 @@ type GlobalOpts struct {
 	ElbSecurityGroup            string
 	DisableSecurityGroupIngress bool
 	DisableStrictZoneCheck      bool
+	NodeIPFamilies              []string
 }
 
 func CloudConfigToString(c *CloudConfig) (string, error) {

diff --git a/pkg/cloudprovider/provider/aws/types/cloudconfig_test.go b/pkg/cloudprovider/provider/aws/types/cloudconfig_test.go
@@ -46,6 +46,7 @@ func TestCloudConfigToString(t *testing.T) {
 					KubernetesClusterTag:        "some-tag",
 					RoleARN:                     "some-arn",
 					RouteTableID:                "some-rt",
+					NodeIPFamilies:              []string{"ipv4", "ipv6"},
 				},
 			},
 		},

diff --git a/pkg/cloudprovider/provider/aws/types/testdata/simple-config.golden b/pkg/cloudprovider/provider/aws/types/testdata/simple-config.golden
@@ -8,3 +8,5 @@ KubernetesClusterID="some-tag"
 DisableSecurityGroupIngress=true
 ElbSecurityGroup="some-sg"
 DisableStrictZoneCheck=true
+NodeIPFamilies="ipv4"
+NodeIPFamilies="ipv6"