Skip to content

Commit da50ed0

Browse files
Jeff Bornemannk8s-ci-robot
authored andcommitted
move flexvolume plugin directory creation to preinstall (#4999)
* move flexvolume plugin directory creation to preinstall * changes per pr feedback
1 parent fbbfff3 commit da50ed0

File tree

6 files changed

+15
-3
lines changed

6 files changed

+15
-3
lines changed

inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,9 @@ podsecuritypolicy_enabled: false
191191
# Acceptable options are 'pods', 'system-reserved', 'kube-reserved' and ''. Default is "".
192192
# kubelet_enforce_node_allocatable: pods
193193

194+
# An alternative flexvolume plugin directory
195+
# kubelet_flexvolumes_plugins_dir: /usr/libexec/kubernetes/kubelet-plugins/volume/exec
196+
194197
## Supplementary addresses that can be added in kubernetes ssl keys.
195198
## That can be useful for example to setup a keepalived virtual IP
196199
# supplementary_addresses_in_ssl_keys: [10.0.0.1, 10.0.0.2, 10.0.0.3]

roles/kubernetes/node/defaults/main.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ loadbalancer_apiserver_cpu_requests: 25m
5050
# - extensions/v1beta1/daemonsets=true
5151
# - extensions/v1beta1/deployments=true
5252

53-
kubelet_flexvolumes_plugins_dir: /usr/libexec/kubernetes/kubelet-plugins/volume/exec
54-
5553
# A port range to reserve for services with NodePort visibility.
5654
# Inclusive at both ends of the range.
5755
kube_apiserver_node_port_range: "30000-32767"

roles/kubernetes/node/templates/kubelet.service.j2

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ Wants=docker.socket
77
[Service]
88
User=root
99
EnvironmentFile=-{{ kube_config_dir }}/kubelet.env
10-
ExecStartPre=-/bin/mkdir -p {{ kubelet_flexvolumes_plugins_dir }}
1110
ExecStart={{ bin_dir }}/kubelet \
1211
$KUBE_LOGTOSTDERR \
1312
$KUBE_LOG_LEVEL \

roles/kubernetes/preinstall/defaults/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ kube_cert_group: kube-cert
2525
kube_config_dir: /etc/kubernetes
2626
kube_cert_dir: "{{ kube_config_dir }}/ssl"
2727
kube_cert_compat_dir: /etc/kubernetes/pki
28+
kubelet_flexvolumes_plugins_dir: /usr/libexec/kubernetes/kubelet-plugins/volume/exec
2829

2930
# Container Linux by CoreOS cloud init config file to define /etc/resolv.conf content
3031
# for hostnet pods and infra needs

roles/kubernetes/preinstall/tasks/0040-set_facts.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,3 +178,13 @@
178178
etcd_deployment_type: host
179179
when:
180180
- etcd_kubeadm_enabled
181+
182+
- name: check /usr readonly
183+
stat:
184+
path: "/usr"
185+
register: usr
186+
187+
- name: set alternate flexvolume path
188+
set_fact:
189+
kubelet_flexvolumes_plugins_dir: /var/lib/kubelet/volumeplugins
190+
when: not usr.stat.writeable

roles/kubernetes/preinstall/tasks/0050-create_directories.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
- "{{ kube_cert_dir }}"
2323
- "{{ kube_manifest_dir }}"
2424
- "{{ kube_script_dir }}"
25+
- "{{ kubelet_flexvolumes_plugins_dir }}"
2526

2627
- name: Check if kubernetes kubeadm compat cert dir exists
2728
stat:

0 commit comments

Comments
 (0)