External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-21 02:47:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1919 from mattymo/fix_rkt_local_vols

Browse Source 
Fix local volume provisioner mount point for rkt
This commit is contained in:
Spencer Smith
2017-11-02 11:32:30 -04:00
committed by GitHub
parent 9872b594bf 520103df78
commit 7a77b5c419
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
roles/kubernetes-apps/local_volume_provisioner/templates/provisioner-admin-account.yml.j2
View File

@@ -8,11 +8,11 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRoleBinding kind: ClusterRoleBinding
metadata: metadata:
name: local-storage-provisioner-pv-binding name: local-storage-provisioner-pv-binding
namespace: default namespace: {{ system_namespace }}
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: local-storage-admin name: local-storage-admin
namespace: default namespace: {{ system_namespace }}
roleRef: roleRef:
kind: ClusterRole kind: ClusterRole
name: system:persistent-volume-provisioner name: system:persistent-volume-provisioner
@@ -22,11 +22,11 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRoleBinding kind: ClusterRoleBinding
metadata: metadata:
name: local-storage-provisioner-node-binding name: local-storage-provisioner-node-binding
namespace: default namespace: {{ system_namespace }}
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: local-storage-admin name: local-storage-admin
namespace: default namespace: {{ system_namespace }}
roleRef: roleRef:
kind: ClusterRole kind: ClusterRole
name: system:node name: system:node

2
roles/kubernetes/node/templates/kubelet.rkt.service.j2
View File

@@ -32,7 +32,7 @@ ExecStart=/usr/bin/rkt run \
--volume etc-cni,kind=host,source=/etc/cni,readOnly=true \ --volume etc-cni,kind=host,source=/etc/cni,readOnly=true \
--volume opt-cni,kind=host,source=/opt/cni,readOnly=true \ --volume opt-cni,kind=host,source=/opt/cni,readOnly=true \
--volume var-lib-cni,kind=host,source=/var/lib/cni,readOnly=false \ --volume var-lib-cni,kind=host,source=/var/lib/cni,readOnly=false \
--volume local-volume-base-dir,target {{ local_volume_base_dir }},readOnly=false,recursive=true \ --volume local-volume-base-dir,kind=host,source={{ local_volume_base_dir }},readOnly=false,recursive=true \
--mount volume=etc-cni,target=/etc/cni \ --mount volume=etc-cni,target=/etc/cni \
--mount volume=opt-cni,target=/opt/cni \ --mount volume=opt-cni,target=/opt/cni \
--mount volume=var-lib-cni,target=/var/lib/cni \ --mount volume=var-lib-cni,target=/var/lib/cni \

1
roles/kubernetes/preinstall/tasks/main.yml
View File

@@ -60,6 +60,7 @@
- "{{ kube_config_dir }}/ssl" - "{{ kube_config_dir }}/ssl"
- "{{ kube_manifest_dir }}" - "{{ kube_manifest_dir }}"
- "{{ kube_script_dir }}" - "{{ kube_script_dir }}"
- "{{ local_volume_base_dir }}"
- name: check cloud_provider value - name: check cloud_provider value
fail: fail: