Rollback attempted support for multiple instances

gian-reto · Nov 15, 2022 · d20e548 · d20e548
1 parent e0a660a
commit d20e548
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 19 deletions.
diff --git a/charts/csi-rclone/Chart.yaml b/charts/csi-rclone/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v2
 appVersion: "1.0"
 description: CSI plugin for rclone mount
 name: csi-rclone
-version: 0.1.0
+version: 0.2.0
diff --git a/charts/csi-rclone/templates/1.13-csi-controller-rbac.yaml b/charts/csi-rclone/templates/1.13-csi-controller-rbac.yaml
@@ -8,7 +8,7 @@ metadata:
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: external-controller-rclone-{{ .Release.Namespace }}
+  name: external-controller-rclone
 rules:
   - apiGroups: [""]
     resources: ["persistentvolumes"]
@@ -22,24 +22,25 @@ rules:
   - apiGroups: ["storage.k8s.io"]
     resources: ["volumeattachments"]
     verbs: ["get", "list", "watch", "update"]
+
 ---
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: csi-attacher-role-rclone-{{ .Release.Namespace }}
+  name: csi-attacher-role-rclone
 subjects:
   - kind: ServiceAccount
     name: csi-controller-rclone
     namespace: {{ .Release.Namespace }}
 roleRef:
   kind: ClusterRole
-  name: external-controller-rclone-{{ .Release.Namespace }}
+  name: external-controller-rclone
   apiGroup: rbac.authorization.k8s.io
 ---
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: csi-cluster-driver-registrar-role-{{ .Release.Namespace }}
+  name: csi-cluster-driver-registrar-role
 rules:
   - apiGroups: ["csi.storage.k8s.io"]
     resources: ["csidrivers"]
@@ -52,13 +53,13 @@ rules:
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: csi-cluster-driver-registrar-binding-{{ .Release.Namespace }}
+  name: csi-cluster-driver-registrar-binding
 subjects:
   - kind: ServiceAccount
     name: csi-controller-rclone
     namespace: {{ .Release.Namespace }}
 roleRef:
   kind: ClusterRole
-  name: csi-cluster-driver-registrar-role-{{ .Release.Namespace }}
+  name: csi-cluster-driver-registrar-role
   apiGroup: rbac.authorization.k8s.io
 {{- end }}
diff --git a/charts/csi-rclone/templates/1.13-csi-nodeplugin-rbac.yaml b/charts/csi-rclone/templates/1.13-csi-nodeplugin-rbac.yaml
@@ -8,7 +8,7 @@ metadata:
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: csi-nodeplugin-rclone-{{ .Release.Namespace }}
+  name: csi-nodeplugin-rclone
 rules:
   - apiGroups: [""]
     resources: ["persistentvolumes"]
@@ -29,13 +29,13 @@ rules:
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: csi-nodeplugin-rclone-{{ .Release.Namespace }}
+  name: csi-nodeplugin-rclone
 subjects:
   - kind: ServiceAccount
     name: csi-nodeplugin-rclone
     namespace: {{ .Release.Namespace }}
 roleRef:
   kind: ClusterRole
-  name: csi-nodeplugin-rclone-{{ .Release.Namespace }}
+  name: csi-nodeplugin-rclone
   apiGroup: rbac.authorization.k8s.io
 {{- end }}
diff --git a/charts/csi-rclone/templates/1.19-csi-controller-rbac.yaml b/charts/csi-rclone/templates/1.19-csi-controller-rbac.yaml
@@ -8,7 +8,7 @@ metadata:
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: external-controller-rclone-{{ .Release.Namespace }}
+  name: external-controller-rclone
 rules:
   - apiGroups: [""]
     resources: ["persistentvolumes"]
@@ -35,13 +35,13 @@ rules:
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: csi-attacher-role-rclone-{{ .Release.Namespace }}
+  name: csi-attacher-role-rclone
 subjects:
   - kind: ServiceAccount
     name: csi-controller-rclone
     namespace: {{ .Release.Namespace }}
 roleRef:
   kind: ClusterRole
-  name: external-controller-rclone-{{ .Release.Namespace }}
+  name: external-controller-rclone
   apiGroup: rbac.authorization.k8s.io
 {{- end }}
diff --git a/charts/csi-rclone/templates/1.19-csi-driver.yaml b/charts/csi-rclone/templates/1.19-csi-driver.yaml
@@ -3,7 +3,7 @@
 apiVersion: storage.k8s.io/v1
 kind: CSIDriver
 metadata:
-  name: csi-rclone-{{ .Release.Namespace }}
+  name: csi-rclone
 spec:
   attachRequired: true
   podInfoOnMount: false

diff --git a/charts/csi-rclone/templates/1.19-csi-nodeplugin-rbac.yaml b/charts/csi-rclone/templates/1.19-csi-nodeplugin-rbac.yaml
@@ -9,7 +9,7 @@ metadata:
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: csi-nodeplugin-rclone-{{ .Release.Namespace }}
+  name: csi-nodeplugin-rclone
 rules:
   - apiGroups: [""]
     resources: ["persistentvolumes"]
@@ -30,13 +30,13 @@ rules:
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: csi-nodeplugin-rclone-{{ .Release.Namespace }}
+  name: csi-nodeplugin-rclone
 subjects:
   - kind: ServiceAccount
     name: csi-nodeplugin-rclone
     namespace: {{ .Release.Namespace }}
 roleRef:
   kind: ClusterRole
-  name: csi-nodeplugin-rclone-{{ .Release.Namespace }}
+  name: csi-nodeplugin-rclone
   apiGroup: rbac.authorization.k8s.io
 {{- end }}
diff --git a/charts/csi-rclone/values.yaml b/charts/csi-rclone/values.yaml
@@ -4,10 +4,10 @@ storageClass:
   name: "rclone"
 
 # rclone CSI plugin image release version. https://cloud.docker.com/u/wunderio/repository/docker/wunderio/csi-rclone
-version: v1.3.0
+version: v1.3.1
 
 # use default parameters. You might want set this to false when using as subchart.
-defaultParams: true
+defaultParams: false
 
 # Pod priority
 priorityClassName: ""