Merge pull request #315 from gnufied/change-kubelet-config

openshift-merge-robot · web-flow · commit 5b9350460f74 · 2019-01-19T04:09:12.000+01:00
Provide a writable location for flexvolume plugins
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/pkg/controller/template/test_data/templates/master/00-master/aws/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy b/pkg/controller/template/test_data/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/pkg/controller/template/test_data/templates/master/00-master/libvirt/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy b/pkg/controller/template/test_data/templates/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/pkg/controller/template/test_data/templates/master/00-master/none/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy b/pkg/controller/template/test_data/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/pkg/controller/template/test_data/templates/master/00-master/openstack/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy b/pkg/controller/template/test_data/templates/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/pkg/controller/template/test_data/templates/master/01-master-kubelet/aws/units/kubelet.service b/pkg/controller/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/pkg/controller/template/test_data/templates/master/01-master-kubelet/libvirt/units/kubelet.service b/pkg/controller/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/pkg/controller/template/test_data/templates/master/01-master-kubelet/none/units/kubelet.service b/pkg/controller/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/pkg/controller/template/test_data/templates/worker/00-worker/aws/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy b/pkg/controller/template/test_data/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/pkg/controller/template/test_data/templates/worker/00-worker/libvirt/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy b/pkg/controller/template/test_data/templates/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/pkg/controller/template/test_data/templates/worker/00-worker/none/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy b/pkg/controller/template/test_data/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/pkg/controller/template/test_data/templates/worker/00-worker/openstack/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy b/pkg/controller/template/test_data/templates/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/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/aws/units/kubelet.service b/pkg/controller/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/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/libvirt/units/kubelet.service b/pkg/controller/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/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/none/units/kubelet.service b/pkg/controller/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 -}} \

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ contents: \|`
`22`	`22`	`--minimum-container-ttl-duration=6m0s \`
`23`	`23`	`--client-ca-file=/etc/kubernetes/ca.crt \`
`24`	`24`	`--cloud-provider=aws \`
	`25`	`+ --volume-plugin-dir=/etc/kubernetes/kubelet-plugins/volume/exec \`
`25`	`26`	`\`
`26`	`27`	`--anonymous-auth=false \`
`27`	`28`	`--register-with-taints=node-role.kubernetes.io/master=:NoSchedule \`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ contents: \|`
`19`	`19`	`--allow-privileged \`
`20`	`20`	`--node-labels=node-role.kubernetes.io/worker \`
`21`	`21`	`--minimum-container-ttl-duration=6m0s \`
	`22`	`+ --volume-plugin-dir=/etc/kubernetes/kubelet-plugins/volume/exec \`
`22`	`23`	`--client-ca-file=/etc/kubernetes/ca.crt \`
`23`	`24`	`--cloud-provider=aws \`
`24`	`25`	`\`