Fix resources location

This commit is contained in:
Stefan Reimer 2021-03-24 12:17:19 +01:00
parent 48d3d269e7
commit 019b5b0ac4
2 changed files with 18 additions and 11 deletions

View File

@ -1,7 +1,7 @@
diff -tubNr charts/aws-efs-csi-driver/templates/node-daemonset.yaml charts/aws-efs-csi-driver.zdt/templates/node-daemonset.yaml diff -tubNr charts/aws-efs-csi-driver/templates/node-daemonset.yaml charts/aws-efs-csi-driver.zdt/templates/node-daemonset.yaml
--- charts/aws-efs-csi-driver/templates/node-daemonset.yaml 2021-03-19 00:22:54.000000000 +0100 --- charts/aws-efs-csi-driver/templates/node-daemonset.yaml 2021-03-19 00:22:54.000000000 +0100
+++ charts/aws-efs-csi-driver.zdt/templates/node-daemonset.yaml 2021-03-24 12:02:07.152569061 +0100 +++ charts/aws-efs-csi-driver.zdt/templates/node-daemonset.yaml 2021-03-24 12:16:25.242538180 +0100
@@ -40,15 +40,14 @@ @@ -40,15 +40,10 @@
{{- with .Values.nodeSelector }} {{- with .Values.nodeSelector }}
{{- . | toYaml | nindent 8 }} {{- . | toYaml | nindent 8 }}
{{- end }} {{- end }}
@ -17,16 +17,23 @@ diff -tubNr charts/aws-efs-csi-driver/templates/node-daemonset.yaml charts/aws-e
- - fargate - - fargate
+ {{- . | toYaml | nindent 8 }} + {{- . | toYaml | nindent 8 }}
+ {{- end }} + {{- end }}
hostNetwork: true
{{- if .Values.dnsPolicy }}
dnsPolicy: "{{ .Values.dnsPolicy }}"
@@ -99,6 +94,10 @@
timeoutSeconds: 3
periodSeconds: 2
failureThreshold: 5
+ {{- with .Values.resources }} + {{- with .Values.resources }}
+ resources: + resources:
+ {{- . | toYaml | nindent 8 }} + {{- . | toYaml | nindent 8 }}
+ {{- end }} + {{- end }}
hostNetwork: true - name: csi-driver-registrar
{{- if .Values.dnsPolicy }} image: {{ printf "%s:%s" .Values.sidecars.nodeDriverRegistrarImage.repository .Values.sidecars.nodeDriverRegistrarImage.tag }}
dnsPolicy: "{{ .Values.dnsPolicy }}" args:
diff -tubNr charts/aws-efs-csi-driver/values.yaml charts/aws-efs-csi-driver.zdt/values.yaml diff -tubNr charts/aws-efs-csi-driver/values.yaml charts/aws-efs-csi-driver.zdt/values.yaml
--- charts/aws-efs-csi-driver/values.yaml 2021-03-19 00:22:54.000000000 +0100 --- charts/aws-efs-csi-driver/values.yaml 2021-03-19 00:22:54.000000000 +0100
+++ charts/aws-efs-csi-driver.zdt/values.yaml 2021-03-24 11:54:19.252585893 +0100 +++ charts/aws-efs-csi-driver.zdt/values.yaml 2021-03-24 12:10:40.949217232 +0100
@@ -43,7 +43,15 @@ @@ -43,7 +43,15 @@
tolerations: [] tolerations: []

View File

@ -44,10 +44,6 @@ spec:
affinity: affinity:
{{- . | toYaml | nindent 8 }} {{- . | toYaml | nindent 8 }}
{{- end }} {{- end }}
{{- with .Values.resources }}
resources:
{{- . | toYaml | nindent 8 }}
{{- end }}
hostNetwork: true hostNetwork: true
{{- if .Values.dnsPolicy }} {{- if .Values.dnsPolicy }}
dnsPolicy: "{{ .Values.dnsPolicy }}" dnsPolicy: "{{ .Values.dnsPolicy }}"
@ -98,6 +94,10 @@ spec:
timeoutSeconds: 3 timeoutSeconds: 3
periodSeconds: 2 periodSeconds: 2
failureThreshold: 5 failureThreshold: 5
{{- with .Values.resources }}
resources:
{{- . | toYaml | nindent 8 }}
{{- end }}
- name: csi-driver-registrar - name: csi-driver-registrar
image: {{ printf "%s:%s" .Values.sidecars.nodeDriverRegistrarImage.repository .Values.sidecars.nodeDriverRegistrarImage.tag }} image: {{ printf "%s:%s" .Values.sidecars.nodeDriverRegistrarImage.repository .Values.sidecars.nodeDriverRegistrarImage.tag }}
args: args: