Commit dc1eb30b authored by Vitaliy Filippov's avatar Vitaliy Filippov
Browse files

Add configurable tolerations (fixes #9 and #27)

parent 52b29e17

deploy/helm/README.md

+3 −0
Original line number Diff line number Diff line
@@ -34,3 +34,6 @@ The following table lists all configuration parameters and their default values. 
| `secret.accessKey`           | S3 Access Key                                                          |                                                        |

| `secret.secretKey`           | S3 Secret Key                                                          |                                                        |

| `secret.endpoint`            | Endpoint                                                               | https://storage.yandexcloud.net                        |

| `tolerations.all`            | Tolerate all taints by the CSI-S3 node driver (mounter)                | false                                                  |

| `tolerations.node`           | Custom tolerations for the CSI-S3 node driver (mounter)                | []                                                     |

| `tolerations.controller`     | Custom tolerations for the CSI-S3 controller (provisioner)             | []                                                     |

deploy/helm/manifest.yaml

+9 −0
Original line number Diff line number Diff line
@@ -102,3 +102,12 @@ user_values: 
      ru: Название секрета, который будет создан или использован для класса хранения

    string_value:

      default_value: csi-s3-secret

  - name: tolerations.all

    title:

      en: Tolerate all taints

      ru: Игнорировать все taint-ы

    description:

      en: Tolerate all taints by the CSI-S3 node driver (mounter)

      ru: Игнорировать все taint-ы узлов кластера драйвером CSI-S3, монтирующим ФС на узлах

    boolean_value:

      default_value: false

deploy/helm/templates/csi-s3.yaml

+13 −0
Original line number Diff line number Diff line
@@ -52,6 +52,19 @@ spec: 
      labels:

        app: csi-s3

    spec:

      tolerations:

        {{- if .Values.tolerations.all }}

        - operator: Exists

        {{- else }}

        - key: CriticalAddonsOnly

          operator: Exists

        - operator: Exists

          effect: NoExecute

          tolerationSeconds: 300

        {{- end }}

        {{- with .Values.tolerations.node }}

        {{- toYaml . | nindent 8 }}

        {{- end }}

      serviceAccount: csi-s3

      hostNetwork: true

      containers:

deploy/helm/templates/provisioner.yaml

+10 −2
Original line number Diff line number Diff line
@@ -71,7 +71,15 @@ spec: 
      serviceAccount: csi-provisioner-sa

      tolerations:

        - key: node-role.kubernetes.io/master

        operator: "Exists"

          operator: Exists

        - key: CriticalAddonsOnly

          operator: Exists

        - operator: Exists

          effect: NoExecute

          tolerationSeconds: 300

        {{- with .Values.tolerations.controller }}

        {{- toYaml . | nindent 8 }}

        {{- end }}

      containers:

        - name: csi-provisioner

          image: {{ .Values.images.provisioner }}

deploy/helm/values.yaml

+5 −0
Original line number Diff line number Diff line
@@ -37,3 +37,8 @@ secret: 
  secretKey: ""

  # Endpoint

  endpoint: https://storage.yandexcloud.net



tolerations:

  all: false

  node: []

  controller: []