Merge pull request #2274 from mirwan/local_volume_provisioner_configmap_in_daemonset
Local volume provisioner fixes
This commit is contained in:
commit
275b1d6897
3 changed files with 10 additions and 5 deletions
|
@ -7,7 +7,8 @@ metadata:
|
||||||
name: local-volume-config
|
name: local-volume-config
|
||||||
namespace: {{ system_namespace }}
|
namespace: {{ system_namespace }}
|
||||||
data:
|
data:
|
||||||
storageClassMap: |
|
"{{ local_volume_storage_class }}": |
|
||||||
local-storage:
|
{
|
||||||
hostDir: "{{ local_volume_base_dir }}"
|
"hostDir": "{{ local_volume_base_dir }}",
|
||||||
mountDir: "/mnt/local-storage/"
|
"mountDir": "{{ local_volume_mount_dir }}"
|
||||||
|
}
|
||||||
|
|
|
@ -18,7 +18,7 @@ spec:
|
||||||
privileged: true
|
privileged: true
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: discovery-vol
|
- name: discovery-vol
|
||||||
mountPath: "/local-disks"
|
mountPath: "{{ local_volume_mount_dir }}"
|
||||||
- name: local-volume-config
|
- name: local-volume-config
|
||||||
mountPath: /etc/provisioner/config/
|
mountPath: /etc/provisioner/config/
|
||||||
env:
|
env:
|
||||||
|
@ -32,6 +32,8 @@ spec:
|
||||||
fieldRef:
|
fieldRef:
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
fieldPath: metadata.namespace
|
fieldPath: metadata.namespace
|
||||||
|
- name: VOLUME_CONFIG_NAME
|
||||||
|
value: "local-volume-config"
|
||||||
volumes:
|
volumes:
|
||||||
- name: discovery-vol
|
- name: discovery-vol
|
||||||
hostPath:
|
hostPath:
|
||||||
|
|
|
@ -172,6 +172,8 @@ persistent_volumes_enabled: false
|
||||||
|
|
||||||
# Base path for local volume provisioner addon
|
# Base path for local volume provisioner addon
|
||||||
local_volume_base_dir: /mnt/disks
|
local_volume_base_dir: /mnt/disks
|
||||||
|
local_volume_mount_dir: /local-disks
|
||||||
|
local_volume_storage_class: local-storage
|
||||||
|
|
||||||
## When OpenStack is used, Cinder version can be explicitly specified if autodetection fails (Fixed in 1.9: https://github.com/kubernetes/kubernetes/issues/50461)
|
## When OpenStack is used, Cinder version can be explicitly specified if autodetection fails (Fixed in 1.9: https://github.com/kubernetes/kubernetes/issues/50461)
|
||||||
# openstack_blockstorage_version: "v1/v2/auto (default)"
|
# openstack_blockstorage_version: "v1/v2/auto (default)"
|
||||||
|
|
Loading…
Reference in a new issue