Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Provide a writable location for flexvolume plugins #315

Merged
merged 1 commit into from
Jan 19, 2019
Merged

Provide a writable location for flexvolume plugins #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions pkg/controller/template/test_data/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
```
6 changes: 6 additions & 0 deletions ...a/templates/master/00-master/aws/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
contents:
source: data:,
verification: {}
filesystem: root
mode: 493
path: /etc/kubernetes/kubelet-plugins/volume/exec/.dummy
6 changes: 6 additions & 0 deletions ...mplates/master/00-master/libvirt/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
contents:
source: data:,
verification: {}
filesystem: root
mode: 493
path: /etc/kubernetes/kubelet-plugins/volume/exec/.dummy
6 changes: 6 additions & 0 deletions .../templates/master/00-master/none/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
contents:
source: data:,
verification: {}
filesystem: root
mode: 493
path: /etc/kubernetes/kubelet-plugins/volume/exec/.dummy
6 changes: 6 additions & 0 deletions ...lates/master/00-master/openstack/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
contents:
source: data:,
verification: {}
filesystem: root
mode: 493
path: /etc/kubernetes/kubelet-plugins/volume/exec/.dummy
1 change: 1 addition & 0 deletions ...ontroller/template/test_data/templates/master/01-master-kubelet/aws/units/kubelet.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions ...oller/template/test_data/templates/master/01-master-kubelet/libvirt/units/kubelet.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions ...ntroller/template/test_data/templates/master/01-master-kubelet/none/units/kubelet.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
6 changes: 6 additions & 0 deletions ...a/templates/worker/00-worker/aws/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
contents:
source: data:,
verification: {}
filesystem: root
mode: 493
path: /etc/kubernetes/kubelet-plugins/volume/exec/.dummy
6 changes: 6 additions & 0 deletions ...mplates/worker/00-worker/libvirt/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
contents:
source: data:,
verification: {}
filesystem: root
mode: 493
path: /etc/kubernetes/kubelet-plugins/volume/exec/.dummy
6 changes: 6 additions & 0 deletions .../templates/worker/00-worker/none/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
contents:
source: data:,
verification: {}
filesystem: root
mode: 493
path: /etc/kubernetes/kubelet-plugins/volume/exec/.dummy
6 changes: 6 additions & 0 deletions ...lates/worker/00-worker/openstack/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
contents:
source: data:,
verification: {}
filesystem: root
mode: 493
path: /etc/kubernetes/kubelet-plugins/volume/exec/.dummy
1 change: 1 addition & 0 deletions ...ontroller/template/test_data/templates/worker/01-worker-kubelet/aws/units/kubelet.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
\
Expand Down
1 change: 1 addition & 0 deletions ...oller/template/test_data/templates/worker/01-worker-kubelet/libvirt/units/kubelet.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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= \
\
Expand Down
1 change: 1 addition & 0 deletions ...ntroller/template/test_data/templates/worker/01-worker-kubelet/none/units/kubelet.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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= \
\
Expand Down
5 changes: 5 additions & 0 deletions templates/master/00-master/_base/files/volume-plugins.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
filesystem: "root"
mode: 0755
path: "/etc/kubernetes/kubelet-plugins/volume/exec/.dummy"
contents:
inline: |
1 change: 1 addition & 0 deletions templates/master/01-master-kubelet/_base/units/kubelet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
gnufied marked this conversation as resolved.
Show resolved Hide resolved
{{.CloudProviderConfig -}} \
--anonymous-auth=false \
--register-with-taints=node-role.kubernetes.io/master=:NoSchedule \
Expand Down
5 changes: 5 additions & 0 deletions templates/worker/00-worker/_base/files/volume-plugins.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
filesystem: "root"
mode: 0755
path: "/etc/kubernetes/kubelet-plugins/volume/exec/.dummy"
contents:
inline: |
1 change: 1 addition & 0 deletions templates/worker/01-worker-kubelet/_base/units/kubelet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -}} \
Expand Down