Skip to content

K
k3s
Unverified Commit 4966faab authored by k8s-ci-robot's avatar k8s-ci-robot Committed by GitHub
Browse files
Options

Merge pull request #69522 from wojtek-t/fix_env_setup

Fix overwriting env variables in kube-apiserver manifest
parents 9ba74cb5 3fdb5b92
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
cluster/gce/gci/configure-helper.sh
View file @ 4966faab
...@@ -1763,16 +1763,16 @@ function start-kube-apiserver { ...@@ -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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment