github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #38727 from Amey-D/gci-metadata-eof

Browse Source 
Automatic merge from submit-queue

Ensure the GCI metadata files do not have newline at the end

Fixes #36708

@dchen1107 @Random-Liu  can one of you help with the review?

cc @kubernetes/goog-image FYI
This commit is contained in:
Kubernetes Submit Queue 2016-12-13 17:12:01 -08:00 committed by GitHub
commit f826e11cf5
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cluster/gce/gci/helper.sh
View File

@ -21,18 +21,12 @@
# KUBE_TEMP # KUBE_TEMP
function ensure-gci-metadata-files { function ensure-gci-metadata-files {
if [[ ! -f "${KUBE_TEMP}/gci-update.txt" ]]; then if [[ ! -f "${KUBE_TEMP}/gci-update.txt" ]]; then
cat >"${KUBE_TEMP}/gci-update.txt" << EOF echo -n "update_disabled" > "${KUBE_TEMP}/gci-update.txt"
update_disabled
EOF
fi fi
if [[ ! -f "${KUBE_TEMP}/gci-ensure-gke-docker.txt" ]]; then if [[ ! -f "${KUBE_TEMP}/gci-ensure-gke-docker.txt" ]]; then
cat >"${KUBE_TEMP}/gci-ensure-gke-docker.txt" << EOF echo -n "true" > "${KUBE_TEMP}/gci-ensure-gke-docker.txt"
true
EOF
fi fi
if [[ ! -f "${KUBE_TEMP}/gci-docker-version.txt" ]]; then if [[ ! -f "${KUBE_TEMP}/gci-docker-version.txt" ]]; then
cat >"${KUBE_TEMP}/gci-docker-version.txt" << EOF echo -n "${GCI_DOCKER_VERSION:-}" > "${KUBE_TEMP}/gci-docker-version.txt"
${GCI_DOCKER_VERSION:-}
EOF
fi fi
} }