Rework of helm charts

Signed-off-by: wilmardo <info@wilmardenouden.nl>
2025-06-13 18:43:34 +00:00 · 2019-07-29 12:36:24 +02:00
parent 20d336fca3
commit ca5fbc180c
48 changed files with 254 additions and 261 deletions
--- a/deploy/rbd/kubernetes/v1.14+/helm/templates/csidriver-crd.yaml
+++ b/deploy/rbd/kubernetes/v1.14+/helm/templates/csidriver-crd.yaml
@ -1,9 +1,10 @@
 ---
-{{ if not .Values.attacher.enabled }}
+{{ if not .Values.provisioner.attacher.enabled }}
 apiVersion: storage.k8s.io/v1beta1
 kind: CSIDriver
 metadata:
  name: {{ .Values.driverName }}
+  namespace: {{ .Release.Namespace }}
 spec:
  attachRequired: false
  podInfoOnMount: false
--- a/deploy/rbd/kubernetes/v1.14+/helm/templates/csiplugin-configmap.yaml
+++ b/deploy/rbd/kubernetes/v1.14+/helm/templates/csiplugin-configmap.yaml
@ -3,6 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
  name: {{ .Values.configMapName | quote }}
+  namespace: {{ .Release.Namespace }}
  labels:
    app: {{ include "ceph-csi-rbd.name" . }}
    chart: {{ include "ceph-csi-rbd.chart" . }}
--- a/deploy/rbd/kubernetes/v1.14+/helm/templates/nodeplugin-clusterrolebinding.yaml
+++ b/deploy/rbd/kubernetes/v1.14+/helm/templates/nodeplugin-clusterrolebinding.yaml
@ -16,5 +16,5 @@ subjects:
 roleRef:
  kind: ClusterRole
  name: {{ include "ceph-csi-rbd.nodeplugin.fullname" . }}
-  apiGroup: rbac.authorization.k8s.io          
+  apiGroup: rbac.authorization.k8s.io
 {{- end -}}
--- a/deploy/rbd/kubernetes/v1.14+/helm/templates/nodeplugin-daemonset.yaml
+++ b/deploy/rbd/kubernetes/v1.14+/helm/templates/nodeplugin-daemonset.yaml
@ -2,6 +2,7 @@ kind: DaemonSet
 apiVersion: apps/v1
 metadata:
  name: {{ include "ceph-csi-rbd.nodeplugin.fullname" . }}
+  namespace: {{ .Release.Namespace }}
  labels:
    app: {{ include "ceph-csi-rbd.name" . }}
    chart: {{ include "ceph-csi-rbd.chart" . }}
@ -43,8 +44,8 @@ spec:
              exec:
                  command: [
                    "/bin/sh", "-c",
-                    'rm -rf /registration/{{ .Values.driverName }} 
-                  /registration/{{ .Values.driverName }}-reg.sock'
+                    'rm -rf /registration/{{ .Values.driverName }}
+                    /registration/{{ .Values.driverName }}-reg.sock'
                  ]
          env:
            - name: KUBE_NODE_NAME
@ -89,7 +90,7 @@ spec:
            - name: plugin-dir
              mountPath: {{ .Values.pluginDir }}
              mountPropagation: "Bidirectional"
-            - name: mointpoint-dir
+            - name: mountpoint-dir
              mountPath: /var/lib/kubelet/pods
              mountPropagation: "Bidirectional"
            - mountPath: /dev
@ -143,15 +144,15 @@ spec:
          emptyDir: {
            medium: "Memory"
          }
-    {{- if .Values.nodeplugin.affinity -}}
+{{- if .Values.nodeplugin.affinity }}
      affinity:
-{{ toYaml .Values.nodeplugin.affinity . | indent 8 }}
-    {{- end -}}
-    {{- if .Values.nodeplugin.nodeSelector -}}
+{{ toYaml .Values.nodeplugin.affinity . | indent 8 -}}
+{{- end -}}
+{{- if .Values.nodeplugin.nodeSelector }}
      nodeSelector:
-{{ toYaml .Values.nodeplugin.nodeSelector | indent 8 }}
-    {{- end -}}
-    {{- if .Values.nodeplugin.tolerations -}}
+{{ toYaml .Values.nodeplugin.nodeSelector | indent 8 -}}
+{{- end -}}
+{{- if .Values.nodeplugin.tolerations }}
      tolerations:
-{{ toYaml .Values.nodeplugin.tolerations | indent 8 }}
-    {{- end -}}
+{{ toYaml .Values.nodeplugin.tolerations | indent 8 -}}
+{{- end -}}
--- a/deploy/rbd/kubernetes/v1.14+/helm/templates/nodeplugin-serviceaccount.yaml
+++ b/deploy/rbd/kubernetes/v1.14+/helm/templates/nodeplugin-serviceaccount.yaml
@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
  name: {{ include "ceph-csi-rbd.serviceAccountName.nodeplugin" . }}
+  namespace: {{ .Release.Namespace }}
  labels:
    app: {{ include "ceph-csi-rbd.name" . }}
    chart: {{ include "ceph-csi-rbd.chart" . }}
--- a/deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-deployment.yaml
+++ b/deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-deployment.yaml
@ -2,6 +2,7 @@ kind: Deployment
 apiVersion: apps/v1
 metadata:
  name: {{ include "ceph-csi-rbd.provisioner.fullname" . }}
+  namespace: {{ .Release.Namespace }}
  labels:
    app: {{ include "ceph-csi-rbd.name" . }}
    chart: {{ include "ceph-csi-rbd.chart" . }}
@ -9,7 +10,7 @@ metadata:
    release: {{ .Release.Name }}
    heritage: {{ .Release.Service }}
 spec:
-  replicas: {{ .Values.provisioner.replicas }}
+  replicas: {{ .Values.provisioner.replicaCount }}
  selector:
    matchLabels:
      app: {{ include "ceph-csi-rbd.name" . }}
@ -27,7 +28,8 @@ spec:
      serviceAccountName: {{ include "ceph-csi-rbd.serviceAccountName.provisioner" . }}
      containers:
        - name: csi-provisioner
-          image: "{{ .Values.provisioner.image.repository }}:{{ .Values.provisioner.image.tag }}"
+          image: "{{ .Values.provisioner.provisioner.image.repository }}:{{ .Values.provisioner.provisioner.image.tag }}"
+          imagePullPolicy: {{ .Values.provisioner.provisioner.image.pullPolicy }}
          args:
            - "--csi-address=$(ADDRESS)"
            - "--v=5"
@ -38,15 +40,14 @@ spec:
          env:
            - name: ADDRESS
              value: "{{ .Values.socketDir }}/{{ .Values.socketFile }}"
-          imagePullPolicy: {{ .Values.provisioner.image.pullPolicy }}
          volumeMounts:
            - name: socket-dir
              mountPath: {{ .Values.socketDir }}
          resources:
-{{ toYaml .Values.provisioner.resources | indent 12 }}
+{{ toYaml .Values.provisioner.provisioner.resources | indent 12 }}
        - name: csi-snapshotter
-          image: {{ .Values.snapshotter.image.repository }}:{{ .Values.snapshotter.image.tag }}
-          imagePullPolicy: {{ .Values.nodeplugin.plugin.image.pullPolicy }}
+          image: {{ .Values.provisioner.snapshotter.image.repository }}:{{ .Values.provisioner.snapshotter.image.tag }}
+          imagePullPolicy: {{ .Values.provisioner.snapshotter.image.pullPolicy }}
          args:
            - "--csi-address=$(ADDRESS)"
            - "--v=5"
@ -61,10 +62,11 @@ spec:
            - name: socket-dir
              mountPath: {{ .Values.socketDir }}
          resources:
-{{ toYaml .Values.snapshotter.resources | indent 12 }}
-        {{ if .Values.attacher.enabled }}
+{{ toYaml .Values.provisioner.snapshotter.resources | indent 12 }}
+{{- if .Values.provisioner.attacher.enabled }}
        - name: csi-attacher
-          image: "{{ .Values.attacher.image.repository }}:{{ .Values.attacher.image.tag }}"
+          image: "{{ .Values.provisioner.attacher.image.repository }}:{{ .Values.provisioner.attacher.image.tag }}"
+          imagePullPolicy: {{ .Values.provisioner.attacher.image.pullPolicy }}
          args:
            - "--v=5"
            - "--csi-address=$(ADDRESS)"
@ -73,11 +75,12 @@ spec:
          env:
            - name: ADDRESS
              value: "{{ .Values.socketDir }}/{{ .Values.socketFile }}"
-          imagePullPolicy: {{ .Values.attacher.image.pullPolicy }}
          volumeMounts:
            - name: socket-dir
              mountPath: {{ .Values.socketDir }}
-        {{ end }}
+          resources:
+{{ toYaml .Values.provisioner.attacher.resources | indent 12 }}
+{{- end }}
        - name: csi-rbdplugin
          securityContext:
            privileged: true
@ -85,6 +88,7 @@ spec:
              add: ["SYS_ADMIN"]
            allowPrivilegeEscalation: true
          image: "{{ .Values.nodeplugin.plugin.image.repository }}:{{ .Values.nodeplugin.plugin.image.tag }}"
+          imagePullPolicy: {{ .Values.nodeplugin.plugin.image.pullPolicy }}
          args :
            - "--nodeid=$(NODE_ID)"
            - "--type=rbd"
@ -102,7 +106,6 @@ spec:
                  fieldPath: spec.nodeName
            - name: CSI_ENDPOINT
              value: "unix:/{{ .Values.socketDir }}/{{ .Values.socketFile }}"
-          imagePullPolicy: {{ .Values.nodeplugin.plugin.image.pullPolicy }}
          volumeMounts:
            - name: socket-dir
              mountPath: {{ .Values.socketDir }}
@ -128,15 +131,15 @@ spec:
          emptyDir: {
            medium: "Memory"
          }
-    {{- if .Values.provisioner.affinity -}}
+{{- if .Values.provisioner.affinity }}
      affinity:
-{{ toYaml .Values.provisioner.affinity . | indent 8 }}
-    {{- end -}}
-    {{- if .Values.provisioner.nodeSelector -}}
+{{ toYaml .Values.provisioner.affinity . | indent 8 -}}
+{{- end -}}
+{{- if .Values.provisioner.nodeSelector }}
      nodeSelector:
-{{ toYaml .Values.provisioner.nodeSelector | indent 8 }}
-    {{- end -}}
-    {{- if .Values.provisioner.tolerations -}}
+{{ toYaml .Values.provisioner.nodeSelector | indent 8 -}}
+{{- end -}}
+{{- if .Values.provisioner.tolerations }}
      tolerations:
-{{ toYaml .Values.provisioner.tolerations | indent 8 }}
-    {{- end -}}
+{{ toYaml .Values.provisioner.tolerations | indent 8 -}}
+{{- end -}}
--- a/deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-role.yaml
+++ b/deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-role.yaml
@ -3,6 +3,7 @@ kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
  name: {{ include "ceph-csi-rbd.provisioner.fullname" . }}
+  namespace: {{ .Release.Namespace }}
  labels:
    app: {{ include "ceph-csi-rbd.name" . }}
    chart: {{ include "ceph-csi-rbd.chart" . }}
--- a/deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-rolebinding.yaml
+++ b/deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-rolebinding.yaml
@ -3,6 +3,7 @@ kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
  name: {{ include "ceph-csi-rbd.provisioner.fullname" . }}
+  namespace: {{ .Release.Namespace }}
  labels:
    app: {{ include "ceph-csi-rbd.name" . }}
    chart: {{ include "ceph-csi-rbd.chart" . }}
@ -17,5 +18,4 @@ roleRef:
  kind: Role
  name: {{ include "ceph-csi-rbd.provisioner.fullname" . }}
  apiGroup: rbac.authorization.k8s.io
-  namespace: {{ .Release.Namespace }}
 {{- end -}}
--- a/deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-rules-clusterrole.yaml
+++ b/deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-rules-clusterrole.yaml
@ -35,11 +35,11 @@ rules:
  - apiGroups: ["snapshot.storage.k8s.io"]
    resources: ["volumesnapshots"]
    verbs: ["get", "list", "watch", "update"]
-  {{ if .Values.attacher.enabled }}
+{{ if .Values.provisioner.attacher.enabled }}
  - apiGroups: ["storage.k8s.io"]
    resources: ["volumeattachments"]
    verbs: ["get", "list", "watch", "update"]
-  {{ end }}
+{{ end }}
  - apiGroups: ["snapshot.storage.k8s.io"]
    resources: ["volumesnapshotcontents"]
    verbs: ["create", "get", "list", "watch", "update", "delete"]
--- a/deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-serviceaccount.yaml
+++ b/deploy/rbd/kubernetes/v1.14+/helm/templates/provisioner-serviceaccount.yaml
@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
  name: {{ include "ceph-csi-rbd.serviceAccountName.provisioner" . }}
+  namespace: {{ .Release.Namespace }}
  labels:
    app: {{ include "ceph-csi-rbd.name" . }}
    chart: {{ include "ceph-csi-rbd.chart" . }}
--- a/deploy/rbd/kubernetes/v1.14+/helm/values.yaml
+++ b/deploy/rbd/kubernetes/v1.14+/helm/values.yaml
@ -20,22 +20,6 @@ pluginDir: /var/lib/kubelet/plugins
 driverName: rbd.csi.ceph.com
 configMapName: ceph-csi-config

-attacher:
-  name: attacher
-  enabled: true
-  image:
-    repository: quay.io/k8scsi/csi-attacher
-    tag: v1.2.0
-    pullPolicy: IfNotPresent
-
-  resources: {}
-
-  nodeSelector: {}
-
-  tolerations: []
-
-  affinity: {}
-
 nodeplugin:
  name: nodeplugin

@ -44,7 +28,6 @@ nodeplugin:
      repository: quay.io/k8scsi/csi-node-driver-registrar
      tag: v1.1.0
      pullPolicy: IfNotPresent
-
    resources: {}

  plugin:
@ -53,7 +36,6 @@ nodeplugin:
      # for stable functionality replace canary with latest release version
      tag: canary
      pullPolicy: IfNotPresent
-
    resources: {}

  nodeSelector: {}
@ -64,26 +46,33 @@ nodeplugin:

 provisioner:
  name: provisioner
-
  replicaCount: 3

-  image:
-    repository: quay.io/k8scsi/csi-provisioner
-    tag: v1.3.0
-    pullPolicy: IfNotPresent
+  provisioner:
+    image:
+      repository: quay.io/k8scsi/csi-provisioner
+      tag: v1.3.0
+      pullPolicy: IfNotPresent
+    resources: {}

-  resources: {}
+  attacher:
+    name: attacher
+    enabled: true
+    image:
+      repository: quay.io/k8scsi/csi-attacher
+      tag: v1.2.0
+      pullPolicy: IfNotPresent
+    resources: {}
+
+  snapshotter:
+    image:
+      repository: quay.io/k8scsi/csi-snapshotter
+      tag: v1.2.0
+      pullPolicy: IfNotPresent
+    resources: {}

  nodeSelector: {}

  tolerations: []

  affinity: {}
-
-snapshotter:
-  image:
-    repository: quay.io/k8scsi/csi-snapshotter
-    tag: v1.2.0
-    pullPolicy: IfNotPresent
-
-  resources: {}