Commit 9dac91e1 authored by Vitaliy Filippov's avatar Vitaliy Filippov
Browse files

Remove NoExecute toleration for attacher, but add CriticalAddons back for provisioner and attacher

parent 514c0131

deploy/helm/templates/attacher.yaml

+4 −2
Original line number Diff line number Diff line
@@ -78,7 +78,9 @@ spec: 
      serviceAccount: csi-attacher-sa

      tolerations:

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

        operator: "Exists"

          operator: Exists

        - key: CriticalAddonsOnly

          operator: Exists

      containers:

        - name: csi-attacher

          image: {{ .Values.images.attacher }}

deploy/helm/templates/provisioner.yaml

+2 −0
Original line number Diff line number Diff line
@@ -72,6 +72,8 @@ spec: 
      tolerations:

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

          operator: Exists

        - key: CriticalAddonsOnly

          operator: Exists

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

        {{- toYaml . | nindent 8 }}

        {{- end }}

deploy/kubernetes/attacher.yaml

+0 −3
Original line number Diff line number Diff line
@@ -81,9 +81,6 @@ spec: 
          operator: Exists

        - key: CriticalAddonsOnly

          operator: Exists

        - operator: Exists

          effect: NoExecute

          tolerationSeconds: 300

      containers:

        - name: csi-attacher

          image: quay.io/k8scsi/csi-attacher:v3.0.1

deploy/kubernetes/provisioner.yaml

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

      tolerations:

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

        operator: "Exists"

          operator: Exists

        - key: CriticalAddonsOnly

          operator: Exists

      containers:

        - name: csi-provisioner

          image: quay.io/k8scsi/csi-provisioner:v2.1.0