diff --git a/cluster/aws/coreos/util.sh b/cluster/aws/coreos/util.sh index c58144bb02c..602cb5e2514 100644 --- a/cluster/aws/coreos/util.sh +++ b/cluster/aws/coreos/util.sh @@ -53,6 +53,3 @@ function check-minion() { echo "working" } -function yaml-quote { - echo "'$(echo "${@}" | sed -e "s/'/''/g")'" -} diff --git a/cluster/common.sh b/cluster/common.sh index 1e059c790d0..895e51ee0a7 100755 --- a/cluster/common.sh +++ b/cluster/common.sh @@ -410,3 +410,12 @@ function stage-images() { rm -rf "${temp_dir}" 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")'" +} diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh index 3e4c7061abb..8da57ef6866 100755 --- a/cluster/gce/util.sh +++ b/cluster/gce/util.sh @@ -465,15 +465,6 @@ function add-instance-metadata-from-file { 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 { # If the user requested that the master be part of the cluster, set the # environment variable to program the master kubelet to register itself.