fix k8s orchestration

opencurve · Aug 31, 2020 · a3ceb49 · a3ceb49
1 parent 7ba728c
commit a3ceb49
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 7 deletions.
diff --git a/charts/curve-csi/templates/controllerplugin-rbac.yaml b/charts/curve-csi/templates/controllerplugin-rbac.yaml
@@ -35,10 +35,13 @@ rules:
   verbs: ["list", "watch", "create", "update", "patch"]
 - apiGroups: [""]
   resources: ["persistentvolumes"]
-  verbs: ["get", "list", "watch", "create", "update", "delete"]
+  verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
 - apiGroups: [""]
   resources: ["persistentvolumeclaims"]
-  verbs: ["get", "list", "watch", "update"]
+  verbs: ["get", "list", "watch", "update", "patch"]
+- apiGroups: [""]
+  resources: ["persistentvolumeclaims/status"]
+  verbs: ["update", "patch"]
 - apiGroups: ["storage.k8s.io"]
   resources: ["storageclasses"]
   verbs: ["get", "list", "watch"]

diff --git a/charts/curve-csi/templates/statefulset.yaml b/charts/curve-csi/templates/statefulset.yaml
@@ -41,6 +41,9 @@ spec:
                 - {{ include "curve-csi.name" . }}-controllerplugin
             topologyKey: kubernetes.io/hostname
       serviceAccount: curve-csi-provisioner
+      hostNetwork: true
+      hostPID: true
+      dnsPolicy: ClusterFirstWithHostNet
       containers:
       - name: csi-provisioner
         image: "{{ .Values.controllerplugin.provisioner.image.repository }}:{{ .Values.controllerplugin.provisioner.image.tag }}"

diff --git a/deploy/kubernetes/v1.13/provisioner-rbac.yaml b/deploy/kubernetes/v1.13/provisioner-rbac.yaml
@@ -35,10 +35,13 @@ rules:
   verbs: ["list", "watch", "create", "update", "patch"]
 - apiGroups: [""]
   resources: ["persistentvolumes"]
-  verbs: ["get", "list", "watch", "create", "update", "delete"]
+  verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
 - apiGroups: [""]
   resources: ["persistentvolumeclaims"]
-  verbs: ["get", "list", "watch", "update"]
+  verbs: ["get", "list", "watch", "update", "patch"]
+- apiGroups: [""]
+  resources: ["persistentvolumeclaims/status"]
+  verbs: ["update", "patch"]
 - apiGroups: ["storage.k8s.io"]
   resources: ["storageclasses"]
   verbs: ["get", "list", "watch"]

diff --git a/deploy/kubernetes/v1.13/provisioner-sts.yaml b/deploy/kubernetes/v1.13/provisioner-sts.yaml
@@ -40,6 +40,9 @@ spec:
                 - csi-curve-plugin-provisioner
             topologyKey: kubernetes.io/hostname
       serviceAccount: curve-csi-provisioner
+      hostNetwork: true
+      hostPID: true
+      dnsPolicy: ClusterFirstWithHostNet
       containers:
       - name: csi-provisioner
         image: quay.io/k8scsi/csi-provisioner:v1.3.0

diff --git a/deploy/kubernetes/v1.14+/provisioner-deploy.yaml b/deploy/kubernetes/v1.14+/provisioner-deploy.yaml
@@ -25,6 +25,9 @@ spec:
                 - csi-curve-plugin-provisioner
             topologyKey: kubernetes.io/hostname
       serviceAccount: curve-csi-provisioner
+      hostNetwork: true
+      hostPID: true
+      dnsPolicy: ClusterFirstWithHostNet
       containers:
       - name: csi-provisioner
         image: quay.io/k8scsi/csi-provisioner:v1.3.0

diff --git a/deploy/kubernetes/v1.14+/provisioner-rbac.yaml b/deploy/kubernetes/v1.14+/provisioner-rbac.yaml
@@ -35,10 +35,13 @@ rules:
   verbs: ["list", "watch", "create", "update", "patch"]
 - apiGroups: [""]
   resources: ["persistentvolumes"]
-  verbs: ["get", "list", "watch", "create", "update", "delete"]
+  verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
 - apiGroups: [""]
   resources: ["persistentvolumeclaims"]
-  verbs: ["get", "list", "watch", "update"]
+  verbs: ["get", "list", "watch", "update", "patch"]
+- apiGroups: [""]
+  resources: ["persistentvolumeclaims/status"]
+  verbs: ["update", "patch"]
 - apiGroups: ["storage.k8s.io"]
   resources: ["storageclasses"]
   verbs: ["get", "list", "watch"]

diff --git a/images/Dockerfile b/images/Dockerfile
@@ -14,4 +14,4 @@ ADD curve-csi /bin/curve-csi
 RUN chmod +x /bin/curve-csi && \
     clean-install ca-certificates e2fsprogs mount xfsprogs udev
 
-CMD ["/bin/curve-csi"]
+ENTRYPOINT ["/bin/curve-csi"]