diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index 95cc6a576cc..b393e848c60 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -349,6 +349,9 @@ STORAGE_BACKEND=${STORAGE_BACKEND:-} # Networking plugin specific settings. NETWORK_PROVIDER="${NETWORK_PROVIDER:-kubenet}" # none, kubenet +# Optional: Enable netd. +ENABLE_NETD="${KUBE_ENABLE_NETD:-false}" + # Network Policy plugin specific settings. NETWORK_POLICY_PROVIDER="${NETWORK_POLICY_PROVIDER:-none}" # calico diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index bbc1c6e8dc0..9d533533906 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -359,6 +359,9 @@ STORAGE_MEDIA_TYPE=${STORAGE_MEDIA_TYPE:-} NETWORK_PROVIDER="${NETWORK_PROVIDER:-kubenet}" # none, kubenet +# Optional: Enable netd. +ENABLE_NETD="${KUBE_ENABLE_NETD:-false}" + # Network Policy plugin specific settings. NETWORK_POLICY_PROVIDER="${NETWORK_POLICY_PROVIDER:-none}" # calico diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh index 515bb2d22ee..3ab47122802 100644 --- a/cluster/gce/gci/configure-helper.sh +++ b/cluster/gce/gci/configure-helper.sh @@ -2235,6 +2235,19 @@ EOF fi } +# Sets up the manifests of netd for k8s addons. +function setup-netd-manifest { + local -r netd_file="${dst_dir}/netd/netd.yaml" + mkdir -p "${dst_dir}/netd" + touch "${netd_file}" + if [ -n "${CUSTOM_NETD_YAML:-}" ]; then + # Replace with custom GKE netd deployment. + cat > "${netd_file}" <