DevFW-CICD/ingress-nginx-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[helm] template pod affinity

Browse source
This commit is contained in:
TheRealNoob 2024-06-11 20:31:48 -05:00
parent 4038211261
commit 64130485cc
No known key found for this signature in database
5 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
charts/ingress-nginx/Chart.yaml
View file

@ -1,8 +1,6 @@
annotations: annotations:
artifacthub.io/changes: |- artifacthub.io/changes: |-
- "update post submit helm ci and clean up (#11221)" - "template pod affinity"
- "refactor helm ci tests part I (#11188)"
- "Update Ingress-Nginx version controller-v1.10.1"
artifacthub.io/prerelease: "false" artifacthub.io/prerelease: "false"
apiVersion: v2 apiVersion: v2
appVersion: 1.10.1 appVersion: 1.10.1
@ -22,4 +20,4 @@ maintainers:
name: ingress-nginx name: ingress-nginx
sources: sources:
- https://github.com/kubernetes/ingress-nginx - https://github.com/kubernetes/ingress-nginx
version: 4.10.1 version: 4.11.0

2
charts/ingress-nginx/templates/controller-daemonset.yaml
View file

@ -203,7 +203,7 @@ spec:
tolerations: {{ toYaml .Values.controller.tolerations | nindent 8 }} tolerations: {{ toYaml .Values.controller.tolerations | nindent 8 }}
{{- end }} {{- end }}
{{- if .Values.controller.affinity }} {{- if .Values.controller.affinity }}
affinity: {{ toYaml .Values.controller.affinity | nindent 8 }} affinity: {{ tpl ( toYaml .Values.controller.affinity ) $ | nindent 8 }}
{{- end }} {{- end }}
{{- if .Values.controller.topologySpreadConstraints }} {{- if .Values.controller.topologySpreadConstraints }}
topologySpreadConstraints: {{ tpl (toYaml .Values.controller.topologySpreadConstraints) $ | nindent 8 }} topologySpreadConstraints: {{ tpl (toYaml .Values.controller.topologySpreadConstraints) $ | nindent 8 }}

2
charts/ingress-nginx/templates/controller-deployment.yaml
View file

@ -206,7 +206,7 @@ spec:
tolerations: {{ toYaml .Values.controller.tolerations | nindent 8 }} tolerations: {{ toYaml .Values.controller.tolerations | nindent 8 }}
{{- end }} {{- end }}
{{- if .Values.controller.affinity }} {{- if .Values.controller.affinity }}
affinity: {{ toYaml .Values.controller.affinity | nindent 8 }} affinity: {{ tpl ( toYaml .Values.controller.affinity ) $ | nindent 8 }}
{{- end }} {{- end }}
{{- if .Values.controller.topologySpreadConstraints }} {{- if .Values.controller.topologySpreadConstraints }}
topologySpreadConstraints: {{ tpl (toYaml .Values.controller.topologySpreadConstraints) $ | nindent 8 }} topologySpreadConstraints: {{ tpl (toYaml .Values.controller.topologySpreadConstraints) $ | nindent 8 }}

2
charts/ingress-nginx/templates/default-backend-deployment.yaml
View file

@ -107,7 +107,7 @@ spec:
tolerations: {{ toYaml .Values.defaultBackend.tolerations | nindent 8 }} tolerations: {{ toYaml .Values.defaultBackend.tolerations | nindent 8 }}
{{- end }} {{- end }}
{{- if .Values.defaultBackend.affinity }} {{- if .Values.defaultBackend.affinity }}
affinity: {{ toYaml .Values.defaultBackend.affinity | nindent 8 }} affinity: {{ tpl ( toYaml .Values.defaultBackend.affinity ) $ | nindent 8 }}
{{- end }} {{- end }}
{{- if .Values.defaultBackend.topologySpreadConstraints }} {{- if .Values.defaultBackend.topologySpreadConstraints }}
topologySpreadConstraints: {{ tpl (toYaml .Values.defaultBackend.topologySpreadConstraints) $ | nindent 8 }} topologySpreadConstraints: {{ tpl (toYaml .Values.defaultBackend.topologySpreadConstraints) $ | nindent 8 }}

12
charts/ingress-nginx/values.yaml
View file

@ -260,11 +260,13 @@ controller:
# - key: app.kubernetes.io/name # - key: app.kubernetes.io/name
# operator: In # operator: In
# values: # values:
# - ingress-nginx # - |-
# {{ include "ingress-nginx.name" . }}
# - key: app.kubernetes.io/instance # - key: app.kubernetes.io/instance
# operator: In # operator: In
# values: # values:
# - ingress-nginx # - |-
# {{ .Release.Name }}
# - key: app.kubernetes.io/component # - key: app.kubernetes.io/component
# operator: In # operator: In
# values: # values:
@ -279,11 +281,13 @@ controller:
# - key: app.kubernetes.io/name # - key: app.kubernetes.io/name
# operator: In # operator: In
# values: # values:
# - ingress-nginx # - |-
# {{ include "ingress-nginx.name" . }}
# - key: app.kubernetes.io/instance # - key: app.kubernetes.io/instance
# operator: In # operator: In
# values: # values:
# - ingress-nginx # - |-
# {{ .Release.Name }}
# - key: app.kubernetes.io/component # - key: app.kubernetes.io/component
# operator: In # operator: In
# values: # values: