Unverified Commit c7e06639 authored by Vitaliy Filippov's avatar Vitaliy Filippov Committed by GitHub
Browse files

Merge pull request #54 from NiklasRosenstein/add-helm-kubeletPath-option 

add a `kubeletPath` option to `values.yaml`
parents 8539ff0a 0fb81f07

deploy/helm/templates/attacher.yaml

+3 −3
Original line number Diff line number Diff line
@@ -89,13 +89,13 @@ spec: 
            - "--csi-address=$(ADDRESS)"

          env:

            - name: ADDRESS

              value: /var/lib/kubelet/plugins/ru.yandex.s3.csi/csi.sock

              value: {{ .Values.kubeletPath }}/plugins/ru.yandex.s3.csi/csi.sock

          imagePullPolicy: "IfNotPresent"

          volumeMounts:

            - name: socket-dir

              mountPath: /var/lib/kubelet/plugins/ru.yandex.s3.csi

              mountPath: {{ .Values.kubeletPath }}/plugins/ru.yandex.s3.csi

      volumes:

        - name: socket-dir

          hostPath:

            path: /var/lib/kubelet/plugins/ru.yandex.s3.csi

            path: {{ .Values.kubeletPath }}/plugins/ru.yandex.s3.csi

            type: DirectoryOrCreate

deploy/helm/templates/csi-s3.yaml

+5 −5
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ spec: 
            - name: ADDRESS

              value: /csi/csi.sock

            - name: DRIVER_REG_SOCK_PATH

              value: /var/lib/kubelet/plugins/ru.yandex.s3.csi/csi.sock

              value: {{ .Values.kubeletPath }}/plugins/ru.yandex.s3.csi/csi.sock

            - name: KUBE_NODE_NAME

              valueFrom:

                fieldRef:
@@ -95,22 +95,22 @@ spec: 
            - name: plugin-dir

              mountPath: /csi

            - name: pods-mount-dir

              mountPath: /var/lib/kubelet/pods

              mountPath: {{ .Values.kubeletPath }}/pods

              mountPropagation: "Bidirectional"

            - name: fuse-device

              mountPath: /dev/fuse

      volumes:

        - name: registration-dir

          hostPath:

            path: /var/lib/kubelet/plugins_registry/

            path: {{ .Values.kubeletPath }}/plugins_registry/

            type: DirectoryOrCreate

        - name: plugin-dir

          hostPath:

            path: /var/lib/kubelet/plugins/ru.yandex.s3.csi

            path: {{ .Values.kubeletPath }}/plugins/ru.yandex.s3.csi

            type: DirectoryOrCreate

        - name: pods-mount-dir

          hostPath:

            path: /var/lib/kubelet/pods

            path: {{ .Values.kubeletPath }}/pods

            type: Directory

        - name: fuse-device

          hostPath:

deploy/helm/templates/provisioner.yaml

+4 −4
Original line number Diff line number Diff line
@@ -85,11 +85,11 @@ spec: 
            - "--v=4"

          env:

            - name: ADDRESS

              value: /var/lib/kubelet/plugins/ru.yandex.s3.csi/csi.sock

              value: {{ .Values.kubeletPath }}/plugins/ru.yandex.s3.csi/csi.sock

          imagePullPolicy: "IfNotPresent"

          volumeMounts:

            - name: socket-dir

              mountPath: /var/lib/kubelet/plugins/ru.yandex.s3.csi

              mountPath: {{ .Values.kubeletPath }}/plugins/ru.yandex.s3.csi

        - name: csi-s3

          image: {{ .Values.images.csi }}

          imagePullPolicy: IfNotPresent
@@ -99,14 +99,14 @@ spec: 
            - "--v=4"

          env:

            - name: CSI_ENDPOINT

              value: unix:///var/lib/kubelet/plugins/ru.yandex.s3.csi/csi.sock

              value: unix://{{ .Values.kubeletPath }}/plugins/ru.yandex.s3.csi/csi.sock

            - name: NODE_ID

              valueFrom:

                fieldRef:

                  fieldPath: spec.nodeName

          volumeMounts:

            - name: socket-dir

              mountPath: /var/lib/kubelet/plugins/ru.yandex.s3.csi

              mountPath: {{ .Values.kubeletPath }}/plugins/ru.yandex.s3.csi

      volumes:

        - name: socket-dir

          emptyDir: {}

deploy/helm/values.yaml

+2 −0
Original line number Diff line number Diff line
@@ -42,3 +42,5 @@ tolerations: 
  all: false

  node: []

  controller: []



kubeletPath: /var/lib/kubelet