Skip to content

Commit 07834b8

Browse files
author
Kubernetes Submit Queue
authored
Merge pull request kubernetes#49968 from mikedanese/automated-cherry-pick-of-#49897-kubernetes#49898-release-1.7
Automatic merge from submit-queue Automated cherry pick of kubernetes#49897 kubernetes#49898 release 1.7 Cherrypick of kubernetes#49897 kubernetes#49898 Part of kubernetes#49895 ```release-note In GCE, add measures to prevent corruption of known_tokens.csv ```
2 parents ae8e383 + c5a3343 commit 07834b8

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

cluster/gce/gci/configure-helper.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,10 +239,13 @@ function append_or_replace_prefixed_line {
239239
local -r file="${1:-}"
240240
local -r prefix="${2:-}"
241241
local -r suffix="${3:-}"
242+
local -r dirname="$(dirname ${file})"
243+
local -r tmpfile="$(mktemp -t filtered.XXXX --tmpdir=${dirname})"
242244

243245
touch "${file}"
244-
awk "substr(\$0,0,length(\"${prefix}\")) != \"${prefix}\" { print }" "${file}" > "${file}.filtered" && mv "${file}.filtered" "${file}"
245-
echo "${prefix}${suffix}" >> "${file}"
246+
awk "substr(\$0,0,length(\"${prefix}\")) != \"${prefix}\" { print }" "${file}" > "${tmpfile}"
247+
echo "${prefix}${suffix}" >> "${tmpfile}"
248+
mv "${tmpfile}" "${file}"
246249
}
247250

248251
function create-node-pki {
@@ -356,7 +359,11 @@ function create-master-auth {
356359
fi
357360
append_or_replace_prefixed_line "${basic_auth_csv}" "${KUBE_PASSWORD},${KUBE_USER}," "admin,system:masters"
358361
fi
362+
359363
local -r known_tokens_csv="${auth_dir}/known_tokens.csv"
364+
if [[ -e "${known_tokens_csv}" && "${METADATA_CLOBBERS_CONFIG:-false}" == "true" ]]; then
365+
rm "${known_tokens_csv}"
366+
fi
360367
if [[ -n "${KUBE_BEARER_TOKEN:-}" ]]; then
361368
append_or_replace_prefixed_line "${known_tokens_csv}" "${KUBE_BEARER_TOKEN}," "admin,admin,system:masters"
362369
fi

0 commit comments

Comments
 (0)