github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #37562 from roberthbailey/node-upgrade 

Automatic merge from submit-queue

Use gsed on the mac.

**What this PR does / why we need it**: Fixes node upgrades when run from a mac

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #37474

**Special notes for your reviewer**:
pull/6/head
Kubernetes Submit Queue 2016-11-29 16:27:37 -08:00 committed by GitHub
parent ea576b7c53 2df08ccdf5
commit 987cb799db
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cluster/gce/util.sh
View File

@ -1913,5 +1913,14 @@ function prepare-e2e() {
# limits the size of metadata fields to 32K, and stripping comments is the # limits the size of metadata fields to 32K, and stripping comments is the
# easiest way to buy us a little more room. # easiest way to buy us a little more room.
function prepare-startup-script() { function prepare-startup-script() {
sed '/^\s*#\([^!].*\)*$/ d' ${KUBE_ROOT}/cluster/gce/configure-vm.sh > ${KUBE_TEMP}/configure-vm.sh # Find a standard sed instance (and ensure that the command works as expected on a Mac).
SED=sed
if which gsed &>/dev/null; then
SED=gsed
fi
if ! ($SED --version 2>&1 | grep -q GNU); then
echo "!!! GNU sed is required. If on OS X, use 'brew install gnu-sed'."
exit 1
fi
$SED '/^\s*#\([^!].*\)*$/ d' ${KUBE_ROOT}/cluster/gce/configure-vm.sh > ${KUBE_TEMP}/configure-vm.sh
} }