Merge pull request #51166 from verult/COSFlexDir

Automatic merge from submit-queue (batch tested with PRs 51113, 46597, 50397, 51052, 51166) Changing Flexvolume plugin directory to a location reachable by containerized k8s components. **What this PR does / why we need it**: Testing Flexvolume requires plugins to be installed at a location which is accessible by containerized k8s components (such as controller-manager). **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #51123 ```release-note NONE ``` /assign @wongma7 @msau42 /release-note-none /sig storage

Merge pull request #51166 from verult/COSFlexDir
b2f32440 · Kubernetes Submit Queue · GitHub · 7cc582f9 · 94c667b7 · b2f32440
Commit b2f32440 authored Aug 23, 2017 by Kubernetes Submit Queue Committed by GitHub Aug 23, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

common.sh cluster/common.sh +1 -1

No files found.
--- a/cluster/common.sh
+++ b/cluster/common.sh
@@ -752,7 +752,7 @@ EOF
  if [[ "${master}" == "true" && "${MASTER_OS_DISTRIBUTION}" == "gci" ]] ||
     [[ "${master}" == "false" && "${NODE_OS_DISTRIBUTION}" == "gci" ]]; then
    cat >>$file <<EOF
-VOLUME_PLUGIN_DIR: $(yaml-quote ${VOLUME_PLUGIN_DIR:-/home/kubernetes/flexvolume})
+VOLUME_PLUGIN_DIR: $(yaml-quote ${VOLUME_PLUGIN_DIR:-/etc/srv/kubernetes/kubelet-plugins/volume/exec})
 EOF
  fi