github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

kube-up: move yaml-quote from GCE & AWS to common

Browse Source
This commit is contained in:
Justin Santa Barbara 2016-01-17 19:20:34 -05:00
parent 146a9e6075
commit 0df6f5d8c5
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/aws/coreos/util.sh
View File

@ -53,6 +53,3 @@ function check-minion() {
echo "working" echo "working"
} }
function yaml-quote {
echo "'$(echo "${@}" | sed -e "s/'/''/g")'"
}

9
cluster/common.sh
View File

@ -410,3 +410,12 @@ function stage-images() {
rm -rf "${temp_dir}" rm -rf "${temp_dir}"
return 0 return 0
} }
# Quote something appropriate for a yaml string.
#
# TODO(zmerlynn): Note that this function doesn't so much "quote" as
# "strip out quotes", and we really should be using a YAML library for
# this, but PyYAML isn't shipped by default, and *rant rant rant ... SIGH*
function yaml-quote {
echo "'$(echo "${@}" | sed -e "s/'/''/g")'"
}

9
cluster/gce/util.sh
View File

@ -465,15 +465,6 @@ function add-instance-metadata-from-file {
done done
} }
# Quote something appropriate for a yaml string.
#
# TODO(zmerlynn): Note that this function doesn't so much "quote" as
# "strip out quotes", and we really should be using a YAML library for
# this, but PyYAML isn't shipped by default, and *rant rant rant ... SIGH*
function yaml-quote {
echo "'$(echo "${@}" | sed -e "s/'/''/g")'"
}
function write-master-env { function write-master-env {
# If the user requested that the master be part of the cluster, set the # If the user requested that the master be part of the cluster, set the
# environment variable to program the master kubelet to register itself. # environment variable to program the master kubelet to register itself.