refactoring (#1)

* refactoring

Author: bsctl

Chart.yaml

@@ -0,0 +1,12 @@
+apiVersion: v2
+name: vcloud-csi
+description: |
+  Container Storage Interface (CSI) driver for VMware Cloud Director Named Independent Disks.
+  Source: https://github.com/vmware/cloud-director-named-disk-csi-driver
+type: application
+version: v1.6.0
+appVersion: "1.6.0"
+icon: https://raw.githubusercontent.com/kubernetes/cloud-provider-vsphere/master/docs/vmware_logo.png
+home: https://github.com/clastix/vcloud-csi
+sources: ["https://github.com/clastix/vcloud-csi"]
+

.helmignore charts/vcloud-csi/.helmignore.helmignore renamed to charts/vcloud-csi/.helmignore

@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: csi-vcd-controller-sa
-  namespace: kube-system
+  namespace: {{ .Release.Namespace }}
 
 ---
 # external attacher
@@ -36,7 +36,7 @@ metadata:
 subjects:
   - kind: ServiceAccount
     name: csi-vcd-controller-sa
-    namespace: kube-system
+    namespace: {{ .Release.Namespace }}
 roleRef:
   kind: ClusterRole
   name: csi-attacher-role
@@ -82,7 +82,7 @@ metadata:
 subjects:
   - kind: ServiceAccount
     name: csi-vcd-controller-sa
-    namespace: kube-system
+    namespace: {{ .Release.Namespace }}
 roleRef:
   kind: ClusterRole
   name: csi-provisioner-role
@@ -119,7 +119,7 @@ metadata:
 subjects:
   - kind: ServiceAccount
     name: csi-vcd-controller-sa
-    namespace: kube-system
+    namespace: {{ .Release.Namespace }}
 roleRef:
   kind: ClusterRole
   name: csi-resizer-role
@@ -130,7 +130,7 @@ kind: Deployment
 apiVersion: apps/v1
 metadata:
   name: csi-vcd-controllerplugin
-  namespace: kube-system
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: 1
   selector:
@@ -190,7 +190,7 @@ spec:
             capabilities:
               add: ["SYS_ADMIN"]
             allowPrivilegeEscalation: true
-          image: {{ .Values.csiImage.repository }}:{{ .Values.csiImage.tag }}
+          image: "{{ .Values.csiImage.repository }}:{{ .Values.csiImage.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.csiImage.pullPolicy }}
           command:
             - /opt/vcloud/bin/cloud-director-named-disk-csi-driver
@@ -250,7 +250,7 @@ spec:
             name: vcloud-csi-configmap
         - name: vcloud-basic-auth-volume
           secret:
-            secretName: vcloud-basic-auth
+            secretName: {{ .Values.authentication.credentialsSecret.name }}
         - name: vcloud-capvcd-zones
           configMap:
             name: vcloud-capvcd-zones

charts/vcloud-csi/Chart.yaml

@@ -6,4 +6,4 @@ metadata:
 spec:
   attachRequired: true
   podInfoOnMount: false
----
+

templates/NOTES.txt charts/vcloud-csi/templates/NOTES.txttemplates/NOTES.txt renamed to charts/vcloud-csi/templates/NOTES.txt

@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: csi-vcd-node-sa
-  namespace: kube-system
+  namespace: {{ .Release.Namespace }}
 
 ---
 kind: ClusterRole
@@ -23,7 +23,7 @@ metadata:
 subjects:
   - kind: ServiceAccount
     name: csi-vcd-node-sa
-    namespace: kube-system
+    namespace: {{ .Release.Namespace }}
 roleRef:
   kind: ClusterRole
   name: csi-nodeplugin-role
@@ -34,7 +34,7 @@ kind: DaemonSet
 apiVersion: apps/v1
 metadata:
   name: csi-vcd-nodeplugin
-  namespace: kube-system
+  namespace: {{ .Release.Namespace }}
 spec:
   selector:
     matchLabels:
@@ -92,7 +92,7 @@ spec:
             capabilities:
               add: ["SYS_ADMIN"]
             allowPrivilegeEscalation: true
-          image: {{ .Values.csiImage.repository }}:{{ .Values.csiImage.tag }}
+          image: "{{ .Values.csiImage.repository }}:{{ .Values.csiImage.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.csiImage.pullPolicy }}
           command :
             - /opt/vcloud/bin/cloud-director-named-disk-csi-driver
@@ -157,7 +157,7 @@ spec:
             name: vcloud-csi-configmap
         - name: vcloud-basic-auth-volume
           secret:
-            secretName: vcloud-basic-auth
+            secretName: {{ .Values.authentication.credentialsSecret.name }}
         - name: vcloud-capvcd-zones
           configMap:
             name: vcloud-capvcd-zones

templates/_helpers.tpl charts/vcloud-csi/templates/_helpers.tpltemplates/_helpers.tpl renamed to charts/vcloud-csi/templates/_helpers.tpl

@@ -0,0 +1,13 @@
+{{- if .Values.authentication.credentialsSecret.generate -}}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ .Values.authentication.credentialsSecret.name | default "default-secret-name" | quote }}
+  labels:
+    component: {{ .Chart.Name }}
+  namespace: {{ .Release.Namespace }}
+data:
+  username: {{ .Values.authentication.username | b64enc | quote }}
+  password: {{ .Values.authentication.password | b64enc | quote }}
+  refreshToken: ""
+{{- end -}}