Merge pull request #683 from uncycler/feature/crdtoleration

k8s-ci-robot · web-flow · commit 8e2174dfd4a9 · 2021-08-12T10:15:48.000-07:00
helm: use same toleration and nodeselector for crd-hook jobs
diff --git a/manifest_staging/charts/secrets-store-csi-driver/templates/crds-upgrade-hook.yaml b/manifest_staging/charts/secrets-store-csi-driver/templates/crds-upgrade-hook.yaml
@@ -69,3 +69,10 @@ spec:
         imagePullPolicy: {{ .Values.linux.crds.image.pullPolicy }}
       nodeSelector:
         kubernetes.io/os: linux
+{{- if .Values.linux.nodeSelector }}
+{{- toYaml .Values.linux.nodeSelector | nindent 8 }}
+{{- end }}
+{{- with .Values.linux.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+{{- end }}
diff --git a/manifest_staging/charts/secrets-store-csi-driver/templates/keep-crds-upgrade-hook.yaml b/manifest_staging/charts/secrets-store-csi-driver/templates/keep-crds-upgrade-hook.yaml
@@ -72,3 +72,10 @@ spec:
         imagePullPolicy: {{ .Values.linux.crds.image.pullPolicy }}
       nodeSelector:
         kubernetes.io/os: linux
+{{- if .Values.linux.nodeSelector }}
+{{- toYaml .Values.linux.nodeSelector | nindent 8 }}
+{{- end }}
+{{- with .Values.linux.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+{{- end }}
