fix 阿里云nas动态pv脚本

c2code · Nov 6, 2018 · 69001e8 · 69001e8
1 parent f4b8a01
commit 69001e8
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 9 deletions.
diff --git a/roles/cluster-storage/tasks/alicloud-nas.yml b/roles/cluster-storage/tasks/alicloud-nas.yml
@@ -1,18 +1,18 @@
 - name: 准备alicloud-nas配置目录
-  file: name={{ base_dir }}/manifests/storage/alicloud-nas state=directory
+  file: name=/opt/kube/kube-system/storage/alicloud-nas state=directory
 
 - name: 生成alicloud-nas动态存储配置
   template:
     src: alicloud-nas/alicloud-nas.yaml.j2
-    dest: "{{ base_dir }}/manifests/storage/alicloud-nas/{{ storage.aliyun_nas.controller_name }}.yaml"
+    dest: "/opt/kube/kube-system/storage/alicloud-nas/{{ storage.aliyun_nas.controller_name }}.yaml"
 
-- name: 复制alicloud-disk配置
-  copy:
-    src: alicloud-disk.yaml
-    dest: "{{ base_dir }}/manifests/storage/alicloud-nas/alicloud-disk.yaml"
+#- name: 复制alicloud-disk配置
+#  copy:
+#    src: alicloud-disk.yaml
+#    dest: "{{ base_dir }}/manifests/storage/alicloud-nas/alicloud-disk.yaml"
 
-- name: 开始部署alicloud-disk存储
-  shell: "{{ bin_dir }}/kubectl apply -f {{ base_dir }}/manifests/storage/alicloud-nas/alicloud-disk.yaml"
+#- name: 开始部署alicloud-disk存储
+#  shell: "{{ bin_dir }}/kubectl apply -f {{ base_dir }}/manifests/storage/alicloud-nas/alicloud-disk.yaml"
 
 - name: 开始部署alicloud-nas动态存储
-  shell: "{{ bin_dir }}/kubectl apply -f {{ base_dir }}/manifests/storage/alicloud-nas/{{ storage.aliyun_nas.controller_name }}.yaml"
+  shell: "{{ bin_dir }}/kubectl apply -f /opt/kube/kube-system/storage/alicloud-nas/{{ storage.aliyun_nas.controller_name }}.yaml"
diff --git a/roles/cluster-storage/templates/alicloud-nas/alicloud-nas.yaml.j2 b/roles/cluster-storage/templates/alicloud-nas/alicloud-nas.yaml.j2
@@ -10,6 +10,24 @@ metadata:
   name: alicloud-nas-controller
   namespace: kube-system
 ---
+kind: ClusterRole
+apiVersion: rbac.authorization.k8s.io/v1beta1
+metadata:
+  name: alicloud-disk-controller-runner
+rules:
+  - apiGroups: [""]
+    resources: ["persistentvolumes"]
+    verbs: ["get", "list", "watch", "create", "delete"]
+  - apiGroups: [""]
+    resources: ["persistentvolumeclaims"]
+    verbs: ["get", "list", "watch", "update"]
+  - apiGroups: ["storage.k8s.io"]
+    resources: ["storageclasses"]
+    verbs: ["get", "list", "watch"]
+  - apiGroups: [""]
+    resources: ["events"]
+    verbs: ["list", "watch", "create", "update", "patch"]
+---
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata: