Provide a writable location for flexvolume plugins

Fix tests and add a note about how to update testdata
openshift · Jan 18, 2019 · c94174c · c94174c
1 parent f9ca131
commit c94174c
Show file tree

Hide file tree

Showing 19 changed files with 73 additions and 0 deletions.
diff --git a/pkg/controller/template/test_data/README.md b/pkg/controller/template/test_data/README.md
@@ -0,0 +1,7 @@
+## Updating test data after making changes to original
+
+test data templates can be updated via:
+
+```
+go test ./pkg/controller/template/... -u
+```
diff --git a/...a/templates/master/00-master/aws/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy b/...a/templates/master/00-master/aws/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy
@@ -0,0 +1,6 @@
+contents:
+  source: data:,
+  verification: {}
+filesystem: root
+mode: 493
+path: /etc/kubernetes/kubelet-plugins/volume/exec/.dummy
diff --git a/...mplates/master/00-master/libvirt/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy b/...mplates/master/00-master/libvirt/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy
@@ -0,0 +1,6 @@
+contents:
+  source: data:,
+  verification: {}
+filesystem: root
+mode: 493
+path: /etc/kubernetes/kubelet-plugins/volume/exec/.dummy
diff --git a/.../templates/master/00-master/none/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy b/.../templates/master/00-master/none/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy
@@ -0,0 +1,6 @@
+contents:
+  source: data:,
+  verification: {}
+filesystem: root
+mode: 493
+path: /etc/kubernetes/kubelet-plugins/volume/exec/.dummy
diff --git a/...lates/master/00-master/openstack/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy b/...lates/master/00-master/openstack/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy
@@ -0,0 +1,6 @@
+contents:
+  source: data:,
+  verification: {}
+filesystem: root
+mode: 493
+path: /etc/kubernetes/kubelet-plugins/volume/exec/.dummy
diff --git a/...ontroller/template/test_data/templates/master/01-master-kubelet/aws/units/kubelet.service b/...ontroller/template/test_data/templates/master/01-master-kubelet/aws/units/kubelet.service
@@ -22,6 +22,7 @@ contents: |
         --minimum-container-ttl-duration=6m0s \
         --client-ca-file=/etc/kubernetes/ca.crt \
         --cloud-provider=aws \
+        --volume-plugin-dir=/etc/kubernetes/kubelet-plugins/volume/exec \
         \
         --anonymous-auth=false \
         --register-with-taints=node-role.kubernetes.io/master=:NoSchedule \

diff --git a/...oller/template/test_data/templates/master/01-master-kubelet/libvirt/units/kubelet.service b/...oller/template/test_data/templates/master/01-master-kubelet/libvirt/units/kubelet.service
@@ -22,6 +22,7 @@ contents: |
         --minimum-container-ttl-duration=6m0s \
         --client-ca-file=/etc/kubernetes/ca.crt \
         --cloud-provider= \
+        --volume-plugin-dir=/etc/kubernetes/kubelet-plugins/volume/exec \
         \
         --anonymous-auth=false \
         --register-with-taints=node-role.kubernetes.io/master=:NoSchedule \

diff --git a/...ntroller/template/test_data/templates/master/01-master-kubelet/none/units/kubelet.service b/...ntroller/template/test_data/templates/master/01-master-kubelet/none/units/kubelet.service
@@ -22,6 +22,7 @@ contents: |
         --minimum-container-ttl-duration=6m0s \
         --client-ca-file=/etc/kubernetes/ca.crt \
         --cloud-provider= \
+        --volume-plugin-dir=/etc/kubernetes/kubelet-plugins/volume/exec \
         \
         --anonymous-auth=false \
         --register-with-taints=node-role.kubernetes.io/master=:NoSchedule \

diff --git a/...a/templates/worker/00-worker/aws/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy b/...a/templates/worker/00-worker/aws/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy
@@ -0,0 +1,6 @@
+contents:
+  source: data:,
+  verification: {}
+filesystem: root
+mode: 493
+path: /etc/kubernetes/kubelet-plugins/volume/exec/.dummy
diff --git a/...mplates/worker/00-worker/libvirt/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy b/...mplates/worker/00-worker/libvirt/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy
@@ -0,0 +1,6 @@
+contents:
+  source: data:,
+  verification: {}
+filesystem: root
+mode: 493
+path: /etc/kubernetes/kubelet-plugins/volume/exec/.dummy
diff --git a/.../templates/worker/00-worker/none/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy b/.../templates/worker/00-worker/none/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy
@@ -0,0 +1,6 @@
+contents:
+  source: data:,
+  verification: {}
+filesystem: root
+mode: 493
+path: /etc/kubernetes/kubelet-plugins/volume/exec/.dummy
diff --git a/...lates/worker/00-worker/openstack/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy b/...lates/worker/00-worker/openstack/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy
@@ -0,0 +1,6 @@
+contents:
+  source: data:,
+  verification: {}
+filesystem: root
+mode: 493
+path: /etc/kubernetes/kubelet-plugins/volume/exec/.dummy
diff --git a/...ontroller/template/test_data/templates/worker/01-worker-kubelet/aws/units/kubelet.service b/...ontroller/template/test_data/templates/worker/01-worker-kubelet/aws/units/kubelet.service
@@ -19,6 +19,7 @@ contents: |
         --allow-privileged \
         --node-labels=node-role.kubernetes.io/worker \
         --minimum-container-ttl-duration=6m0s \
+        --volume-plugin-dir=/etc/kubernetes/kubelet-plugins/volume/exec \
         --client-ca-file=/etc/kubernetes/ca.crt \
         --cloud-provider=aws \
         \

diff --git a/...oller/template/test_data/templates/worker/01-worker-kubelet/libvirt/units/kubelet.service b/...oller/template/test_data/templates/worker/01-worker-kubelet/libvirt/units/kubelet.service
@@ -19,6 +19,7 @@ contents: |
         --allow-privileged \
         --node-labels=node-role.kubernetes.io/worker \
         --minimum-container-ttl-duration=6m0s \
+        --volume-plugin-dir=/etc/kubernetes/kubelet-plugins/volume/exec \
         --client-ca-file=/etc/kubernetes/ca.crt \
         --cloud-provider= \
         \

diff --git a/...ntroller/template/test_data/templates/worker/01-worker-kubelet/none/units/kubelet.service b/...ntroller/template/test_data/templates/worker/01-worker-kubelet/none/units/kubelet.service
@@ -19,6 +19,7 @@ contents: |
         --allow-privileged \
         --node-labels=node-role.kubernetes.io/worker \
         --minimum-container-ttl-duration=6m0s \
+        --volume-plugin-dir=/etc/kubernetes/kubelet-plugins/volume/exec \
         --client-ca-file=/etc/kubernetes/ca.crt \
         --cloud-provider= \
         \

diff --git a/templates/master/00-master/_base/files/volume-plugins.yaml b/templates/master/00-master/_base/files/volume-plugins.yaml
@@ -0,0 +1,5 @@
+filesystem: "root"
+mode: 0755
+path: "/etc/kubernetes/kubelet-plugins/volume/exec/.dummy"
+contents:
+  inline: |
diff --git a/templates/master/01-master-kubelet/_base/units/kubelet.yaml b/templates/master/01-master-kubelet/_base/units/kubelet.yaml
@@ -24,6 +24,7 @@ contents: |
         --minimum-container-ttl-duration=6m0s \
         --client-ca-file=/etc/kubernetes/ca.crt \
         --cloud-provider={{cloudProvider .}} \
+        --volume-plugin-dir=/etc/kubernetes/kubelet-plugins/volume/exec \
         {{.CloudProviderConfig -}} \
         --anonymous-auth=false \
         --register-with-taints=node-role.kubernetes.io/master=:NoSchedule \

diff --git a/templates/worker/00-worker/_base/files/volume-plugins.yaml b/templates/worker/00-worker/_base/files/volume-plugins.yaml
@@ -0,0 +1,5 @@
+filesystem: "root"
+mode: 0755
+path: "/etc/kubernetes/kubelet-plugins/volume/exec/.dummy"
+contents:
+  inline: |
diff --git a/templates/worker/01-worker-kubelet/_base/units/kubelet.yaml b/templates/worker/01-worker-kubelet/_base/units/kubelet.yaml
@@ -21,6 +21,7 @@ contents: |
         --allow-privileged \
         --node-labels=node-role.kubernetes.io/worker \
         --minimum-container-ttl-duration=6m0s \
+        --volume-plugin-dir=/etc/kubernetes/kubelet-plugins/volume/exec \
         --client-ca-file=/etc/kubernetes/ca.crt \
         --cloud-provider={{cloudProvider .}} \
         {{.CloudProviderConfig -}} \