Merge pull request #47562 from verult/VolumeDirFlag

Automatic merge from submit-queue (batch tested with PRs 47562, 47605) Adding option in node start script to add "volume-plugin-dir" flag to kubelet. **What this PR does / why we need it**: Adds a variable to allow specifying FlexVolume driver directory through cluster/kube-up.sh. Without this, the process of setting up FlexVolume in a non-default directory is very manual. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #47561

Merge pull request #47562 from verult/VolumeDirFlag
c8dc08ea · Kubernetes Submit Queue · GitHub · 8e1cf60a · 6eecd3fb · c8dc08ea
Commit c8dc08ea authored Jun 15, 2017 by Kubernetes Submit Queue Committed by GitHub Jun 15, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

configure-helper.sh cluster/gce/gci/configure-helper.sh +4 -0

No files found.
--- a/cluster/gce/gci/configure-helper.sh
+++ b/cluster/gce/gci/configure-helper.sh
@@ -911,6 +911,10 @@ function start-kubelet {
  if [[ -n "${NON_MASQUERADE_CIDR:-}" ]]; then
    flags+=" --non-masquerade-cidr=${NON_MASQUERADE_CIDR}"
  fi
+  # FlexVolume plugin
+  if [[ -n "${VOLUME_PLUGIN_DIR:-}" ]]; then
+    flags+=" --volume-plugin-dir=${VOLUME_PLUGIN_DIR}"
+  fi
  if [[ "${ENABLE_MANIFEST_URL:-}" == "true" ]]; then
    flags+=" --manifest-url=${MANIFEST_URL}"
    flags+=" --manifest-url-header=${MANIFEST_URL_HEADER}"