From 1df6ecb9781505f755d9516077a4a9f3368f20bb Mon Sep 17 00:00:00 2001
From: Antonio Ojea <antonio.ojea.garcia@gmail.com>
Date: Tue, 28 Apr 2020 23:46:11 +0200
Subject: [PATCH] set the feature gate if dual stack

---
 hack/ci/e2e-k8s.sh                    |  6 ------
 pkg/internal/apis/config/default.go   |  2 ++
 site/content/docs/user/quick-start.md | 12 +-----------
 3 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/hack/ci/e2e-k8s.sh b/hack/ci/e2e-k8s.sh
index f06955bbc8..c1c5a7ae37 100755
--- a/hack/ci/e2e-k8s.sh
+++ b/hack/ci/e2e-k8s.sh
@@ -114,10 +114,6 @@ create_cluster() {
     ;;
   esac
 
-if [ "${IP_FAMILY}" = "DualStack" ]; then
-      kubeadm_feature_gates='IPv6DualStack: true'
-      feature_gates='{"IPv6DualStack":true}'
-fi
   # create the config file
   cat <<EOF > "${ARTIFACTS}/kind-config.yaml"
 # config for 1 control plane node and 2 workers (necessary for conformance)
@@ -135,8 +131,6 @@ kubeadmConfigPatches:
   kind: ClusterConfiguration
   metadata:
     name: config
-  featureGates:
-    ${kubeadm_feature_gates:-}
   apiServer:
     extraArgs:
       "runtime-config": "${runtime_config}"
diff --git a/pkg/internal/apis/config/default.go b/pkg/internal/apis/config/default.go
index 17b857b9b5..c7e7728a5c 100644
--- a/pkg/internal/apis/config/default.go
+++ b/pkg/internal/apis/config/default.go
@@ -42,6 +42,8 @@ func SetDefaultsCluster(obj *Cluster) {
 	}
 	if obj.Networking.IPFamily == "" {
 		obj.Networking.IPFamily = IPv4Family
+	} else if obj.Networking.IPFamily == DualStackFamily {
+		obj.FeatureGates["IPv6DualStack"] = true
 	}
 	// default to listening on 127.0.0.1:randomPort on ipv4
 	// and [::1]:randomPort on ipv6
diff --git a/site/content/docs/user/quick-start.md b/site/content/docs/user/quick-start.md
index d59a7a5fe6..203c1b7085 100644
--- a/site/content/docs/user/quick-start.md
+++ b/site/content/docs/user/quick-start.md
@@ -378,7 +378,7 @@ networking:
 ```
 
 #### Dual Stack clusters
-You can run dual stack clusters using `kind`, on kubernetes versions +1.16
+You can run dual stack clusters using `kind`, on kubernetes versions +1.17
 but first you need to [enable ipv6 in your docker daemon][docker enable ipv6].
 
 ```yaml
@@ -391,16 +391,6 @@ nodes:
 - role: control-plane
 - role: worker
 - role: worker
-featureGates:
-  IPv6DualStack: true
-kubeadmConfigPatches:
-- |
-  apiVersion: kubeadm.k8s.io/v1beta2
-  kind: ClusterConfiguration
-  metadata:
-    name: config
-  featureGates:
-    IPv6DualStack: true
 ```
 
 ### Configure kind to use a proxy