C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

lint and cleanup local_volume_provisioner

Browse source
This commit is contained in:
Wong Hoi Sing Edison 2018-02-01 14:14:18 +08:00
parent f7d52564aa
commit fd80013917
9 changed files with 75 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
inventory/group_vars/k8s-cluster.yml
View file

@ -159,7 +159,7 @@ helm_enabled: false
istio_enabled: false
# Local volume provisioner deployment
local_volumes_enabled: false
local_volume_provisioner_enabled: false
# Add Persistent Volumes Storage Class for corresponding cloud provider ( OpenStack is only supported now )
persistent_volumes_enabled: false

4
roles/kubernetes-apps/local_volume_provisioner/defaults/main.yml
View file

@ -1,6 +1,6 @@
---
local_volume_provisioner_bootstrap_image_repo: quay.io/external_storage/local-volume-provisioner-bootstrap
local_volume_provisioner_bootstrap_image_tag: v1.0.0
local_volume_provisioner_bootstrap_image_tag: v1.0.1
local_volume_provisioner_image_repo: quay.io/external_storage/local-volume-provisioner
local_volume_provisioner_image_tag: v1.0.0
local_volume_provisioner_image_tag: v1.0.1

7
roles/kubernetes-apps/local_volume_provisioner/tasks/main.yml
View file

@ -23,9 +23,10 @@
src: "{{ item.file }}.j2"
dest: "{{ kube_config_dir }}/addons/local_volume_provisioner/{{ item.file }}"
with_items:
- {name: local-storage-provisioner-pv-binding, file: provisioner-admin-account.yml, type: clusterrolebinding}
- {name: local-volume-config, file: volume-config.yml, type: configmap}
- {name: local-volume-provisioner, file: provisioner-ds.yml, type: daemonset}
- { name: local-volume-serviceaccount, file: serviceaccount.yml, type, serviceaccount }
- { name: local-volume-clusterrolebinding, file: clusterrolebinding.yml, type, clusterrolebinding }
- { name: local-volume-configmap, file: configmap.yml, type, configmap }
- { name: local-volume-daemonset, file: daemonset.yml, type, daemonset }
register: local_volume_manifests
when: inventory_hostname == groups['kube-master'][0]

10
roles/kubernetes-apps/local_volume_provisioner/templates/provisioner-admin-account.yml.j2 → roles/kubernetes-apps/local_volume_provisioner/templates/clusterrolebinding.yml.j2
View file

@ -1,11 +1,6 @@
---
apiVersion: v1
kind: ServiceAccount
metadata:
name: local-storage-admin
---
apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1beta1
metadata:
name: local-storage-provisioner-pv-binding
namespace: {{ system_namespace }}
@ -18,8 +13,8 @@ roleRef:
name: system:persistent-volume-provisioner
apiGroup: rbac.authorization.k8s.io
---
apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1beta1
metadata:
name: local-storage-provisioner-node-binding
namespace: {{ system_namespace }}
@ -31,4 +26,3 @@ roleRef:
kind: ClusterRole
name: system:node
apiGroup: rbac.authorization.k8s.io

3
roles/kubernetes-apps/local_volume_provisioner/templates/volume-config.yml.j2 → roles/kubernetes-apps/local_volume_provisioner/templates/configmap.yml.j2
View file

@ -1,7 +1,8 @@
---
# The config map is used to configure local volume discovery for Local SSDs on GCE and GKE.
# It is a map from storage class to its mount configuration.
apiVersion: v1
kind: ConfigMap
apiVersion: v1
metadata:
name: local-volume-config
namespace: {{ system_namespace }}

43
roles/kubernetes-apps/local_volume_provisioner/templates/daemonset.yml.j2 Normal file
View file

@ -0,0 +1,43 @@
---
kind: DaemonSet
apiVersion: extensions/v1beta1
metadata:
name: local-volume-provisioner
namespace: "{{ system_namespace }}"
spec:
template:
metadata:
labels:
app: local-volume-provisioner
spec:
containers:
- name: provisioner
image: {{ local_volume_provisioner_image_repo }}:{{ local_volume_provisioner_image_tag }}
imagePullPolicy: {{ k8s_image_pull_policy }}
securityContext:
privileged: true
volumeMounts:
- name: discovery-vol
mountPath: "/local-disks"
- name: local-volume-config
mountPath: /etc/provisioner/config/
env:
- name: MY_NODE_NAME
valueFrom:
fieldRef:
apiVersion: v1
fieldPath: spec.nodeName
- name: MY_NAMESPACE
valueFrom:
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
volumes:
- name: discovery-vol
hostPath:
path: "{{ local_volume_base_dir }}"
- configMap:
defaultMode: 420
name: local-volume-config
name: local-volume-config
serviceAccount: local-storage-admin

42
roles/kubernetes-apps/local_volume_provisioner/templates/provisioner-ds.yml.j2
View file

@ -1,42 +0,0 @@
apiVersion: extensions/v1beta1
kind: DaemonSet
metadata:
name: local-volume-provisioner
namespace: "{{ system_namespace }}"
spec:
template:
metadata:
labels:
app: local-volume-provisioner
spec:
containers:
- name: provisioner
image: {{ local_volume_provisioner_image_repo }}:{{ local_volume_provisioner_image_tag }}
imagePullPolicy: {{ k8s_image_pull_policy }}
securityContext:
privileged: true
volumeMounts:
- name: discovery-vol
mountPath: "/local-disks"
- name: local-volume-config
mountPath: /etc/provisioner/config/
env:
- name: MY_NODE_NAME
valueFrom:
fieldRef:
apiVersion: v1
fieldPath: spec.nodeName
- name: MY_NAMESPACE
valueFrom:
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
volumes:
- name: discovery-vol
hostPath:
path: "{{ local_volume_base_dir }}"
- configMap:
defaultMode: 420
name: local-volume-config
name: local-volume-config
serviceAccount: local-storage-admin

5
roles/kubernetes-apps/local_volume_provisioner/templates/serviceaccount.yml.j2 Normal file
View file

@ -0,0 +1,5 @@
---
kind: ServiceAccount
apiVersion: v1
metadata:
name: local-storage-admin

5
roles/kubernetes-apps/meta/main.yml
View file

@ -20,12 +20,14 @@ dependencies:
tags:
- apps
- helm
- role: kubernetes-apps/local_volume_provisioner
when: local_volumes_enabled
when: local_volume_provisioner_enabled
tags:
- apps
- local_volume_provisioner
- storage
# istio role should be last because it takes a long time to initialize and
# will cause timeouts trying to start other addons.
- role: kubernetes-apps/istio
@ -33,6 +35,7 @@ dependencies:
tags:
- apps
- istio
- role: kubernetes-apps/persistent_volumes
when: persistent_volumes_enabled
tags: