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**:

Merge pull request #37562 from roberthbailey/node-upgrade
987cb799 · Kubernetes Submit Queue · GitHub · ea576b7c · 2df08ccd · 987cb799
Commit 987cb799 authored Nov 29, 2016 by Kubernetes Submit Queue Committed by GitHub Nov 29, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 1 deletion

util.sh cluster/gce/util.sh +10 -1

No files found.
--- a/cluster/gce/util.sh
+++ b/cluster/gce/util.sh
@@ -1913,5 +1913,14 @@ function prepare-e2e() {
 # limits the size of metadata fields to 32K, and stripping comments is the
 # easiest way to buy us a little more room.
 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
 }