Add tolerations to helm charts in manifest staging folder

Author: fernandosilvacornejo

charts/secrets-store-csi-driver/README.md

@@ -29,15 +29,13 @@ The following table lists the configurable parameters of the csi-secrets-store-p
 | `linux.enabled` | Install secrets store csi driver on linux nodes | true |
 | `linux.kubeletRootDir` | Configure the kubelet root dir | `/var/lib/kubelet` |
 | `linux.nodeSelector` | Node Selector for the daemonset on linux nodes | `{}` |
-| `linux.tolerations` | Tolerations for the daemonset on linux nodes | `[]` |
 | `linux.metricsAddr` | The address the metric endpoint binds to | `:8080` |
 | `windows.image.repository` | Windows image repository | `us.gcr.io/k8s-artifacts-prod/csi-secrets-store/driver` |
 | `windows.image.pullPolicy` | Windows image pull policy | `IfNotPresent` |
 | `windows.image.tag` | Windows image tag | `v0.0.12` |
 | `windows.enabled` | Install secrets store csi driver on windows nodes | false |
 | `windows.kubeletRootDir` | Configure the kubelet root dir | `C:\var\lib\kubelet` |
 | `windows.nodeSelector` | Node Selector for the daemonset on windows nodes | `{}` |
-| `windows.tolerations` | Tolerations for the daemonset on windows nodes | `[]` |
 | `windows.metricsAddr` | The address the metric endpoint binds to | `:8080` |
 | `logLevel.debug` | Enable debug logging | true |
 | `livenessProbe.port` | Liveness probe port | `9808` |

charts/secrets-store-csi-driver/templates/secrets-store-csi-driver-windows.yaml

@@ -121,7 +121,3 @@ spec:
 {{- toYaml .Values.windows.nodeSelector | nindent 8 }}
 {{- end }}
 {{- end -}}
-{{- with .Values.windows.tolerations }}
-      tolerations:
-{{ toYaml . | indent 8 }}
-{{- end }}

charts/secrets-store-csi-driver/templates/secrets-store-csi-driver.yaml

@@ -124,7 +124,3 @@ spec:
 {{- toYaml .Values.linux.nodeSelector | nindent 8 }}
 {{- end }}
 {{- end -}}
-{{- with .Values.linux.tolerations }}
-      tolerations:
-{{ toYaml . | indent 8 }}
-{{- end }}

charts/secrets-store-csi-driver/values.yaml

@@ -6,7 +6,6 @@ linux:
     pullPolicy: Always
   kubeletRootDir: /var/lib/kubelet
   nodeSelector: {}
-  tolerations: []
   metricsAddr: ":8080"
 
 windows:
@@ -17,7 +16,6 @@ windows:
     pullPolicy: IfNotPresent
   kubeletRootDir: C:\var\lib\kubelet
   nodeSelector: {}
-  tolerations: []
   metricsAddr: ":8080"
 
 logLevel:

manifest_staging/charts/secrets-store-csi-driver/README.md

@@ -29,12 +29,16 @@ The following table lists the configurable parameters of the csi-secrets-store-p
 | `linux.enabled` | Install secrets store csi driver on linux nodes | true |
 | `linux.kubeletRootDir` | Configure the kubelet root dir | `/var/lib/kubelet` |
 | `linux.nodeSelector` | Node Selector for the daemonset on linux nodes | `{}` |
+| `linux.tolerations` | Tolerations for the daemonset on linux nodes | `[]` |
+| `linux.metricsAddr` | The address the metric endpoint binds to | `:8080` |
 | `windows.image.repository` | Windows image repository | `us.gcr.io/k8s-artifacts-prod/csi-secrets-store/driver` |
 | `windows.image.pullPolicy` | Windows image pull policy | `IfNotPresent` |
 | `windows.image.tag` | Windows image tag | `v0.0.12` |
 | `windows.enabled` | Install secrets store csi driver on windows nodes | false |
 | `windows.kubeletRootDir` | Configure the kubelet root dir | `C:\var\lib\kubelet` |
 | `windows.nodeSelector` | Node Selector for the daemonset on windows nodes | `{}` |
+| `windows.tolerations` | Tolerations for the daemonset on windows nodes | `[]` |
+| `windows.metricsAddr` | The address the metric endpoint binds to | `:8080` |
 | `logLevel.debug` | Enable debug logging | true |
 | `livenessProbe.port` | Liveness probe port | `9808` |
 | `livenessProbe.logLevel` | Liveness probe container logging verbosity level | `2` |

manifest_staging/charts/secrets-store-csi-driver/templates/secrets-store-csi-driver-windows.yaml

@@ -52,6 +52,7 @@ spec:
             {{- if and (semverCompare ">= v0.0.9-0" .Values.windows.image.tag) .Values.minimumProviderVersions }}
             - "--min-provider-version={{ .Values.minimumProviderVersions }}"
             {{- end }}
+            - "--metrics-addr={{ .Values.windows.metricsAddr }}"
           env:
             - name: CSI_ENDPOINT
               value: unix://C:\\csi\\csi.sock
@@ -120,3 +121,7 @@ spec:
 {{- toYaml .Values.windows.nodeSelector | nindent 8 }}
 {{- end }}
 {{- end -}}
+{{- with .Values.windows.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+{{- end }}

manifest_staging/charts/secrets-store-csi-driver/templates/secrets-store-csi-driver.yaml

@@ -54,6 +54,7 @@ spec:
             {{- if and (semverCompare ">= v0.0.8-0" .Values.linux.image.tag) .Values.minimumProviderVersions }}
             - "--min-provider-version={{ .Values.minimumProviderVersions }}"
             {{- end }}
+            - "--metrics-addr={{ .Values.linux.metricsAddr }}"
           env:
             - name: CSI_ENDPOINT
               value: unix:///csi/csi.sock
@@ -123,3 +124,7 @@ spec:
 {{- toYaml .Values.linux.nodeSelector | nindent 8 }}
 {{- end }}
 {{- end -}}
+{{- with .Values.linux.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+{{- end }}

manifest_staging/charts/secrets-store-csi-driver/values.yaml

@@ -6,6 +6,8 @@ linux:
     pullPolicy: Always
   kubeletRootDir: /var/lib/kubelet
   nodeSelector: {}
+  tolerations: []
+  metricsAddr: ":8080"
 
 windows:
   enabled: false
@@ -15,6 +17,8 @@ windows:
     pullPolicy: IfNotPresent
   kubeletRootDir: C:\var\lib\kubelet
   nodeSelector: {}
+  tolerations: []
+  metricsAddr: ":8080"
 
 logLevel:
   debug: true