github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix overwriting env variables in kube-apiserver manifest

pull/58/head
wojtekt 2018-10-08 14:21:37 +02:00
parent a29b093a56
commit 3fdb5b92f4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/gce/gci/configure-helper.sh
View File

@ -1763,16 +1763,16 @@ function start-kube-apiserver {
local container_env="" local container_env=""
if [[ -n "${ENABLE_CACHE_MUTATION_DETECTOR:-}" ]]; then if [[ -n "${ENABLE_CACHE_MUTATION_DETECTOR:-}" ]]; then
container_env="\"name\": \"KUBE_CACHE_MUTATION_DETECTOR\", \"value\": \"${ENABLE_CACHE_MUTATION_DETECTOR}\"" container_env+="{\"name\": \"KUBE_CACHE_MUTATION_DETECTOR\", \"value\": \"${ENABLE_CACHE_MUTATION_DETECTOR}\"}"
fi fi
if [[ -n "${ENABLE_PATCH_CONVERSION_DETECTOR:-}" ]]; then if [[ -n "${ENABLE_PATCH_CONVERSION_DETECTOR:-}" ]]; then
if [[ -n "${container_env}" ]]; then if [[ -n "${container_env}" ]]; then
container_env="${container_env}, " container_env="${container_env}, "
fi fi
container_env="\"name\": \"KUBE_PATCH_CONVERSION_DETECTOR\", \"value\": \"${ENABLE_PATCH_CONVERSION_DETECTOR}\"" container_env+="{\"name\": \"KUBE_PATCH_CONVERSION_DETECTOR\", \"value\": \"${ENABLE_PATCH_CONVERSION_DETECTOR}\"}"
fi fi
if [[ -n "${container_env}" ]]; then if [[ -n "${container_env}" ]]; then
container_env="\"env\":[{${container_env}}]," container_env="\"env\":[${container_env}],"
fi fi
local -r src_file="${src_dir}/kube-apiserver.manifest" local -r src_file="${src_dir}/kube-apiserver.manifest"