diff --git a/cluster/gce/gci/configure-kubeapiserver.sh b/cluster/gce/gci/configure-kubeapiserver.sh index 87d9f3126f5..aaf68112e56 100644 --- a/cluster/gce/gci/configure-kubeapiserver.sh +++ b/cluster/gce/gci/configure-kubeapiserver.sh @@ -343,6 +343,12 @@ function start-kube-apiserver { fi container_env+="{\"name\": \"KUBE_PATCH_CONVERSION_DETECTOR\", \"value\": \"${ENABLE_PATCH_CONVERSION_DETECTOR}\"}" fi + if [[ -n "${KUBE_APISERVER_GODEBUG:-}" ]]; then + if [[ -n "${container_env}" ]]; then + container_env="${container_env}, " + fi + container_env+="{\"name\": \"GODEBUG\", \"value\": \"${KUBE_APISERVER_GODEBUG}\"}" + fi if [[ -n "${container_env}" ]]; then container_env="\"env\":[${container_env}]," fi diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh index cf8f5502dfd..7c16093f01a 100755 --- a/cluster/gce/util.sh +++ b/cluster/gce/util.sh @@ -1320,6 +1320,12 @@ EOF if [ -n "${KUBE_APISERVER_REQUEST_TIMEOUT_SEC:-}" ]; then cat >>"$file" <>"$file" <