Skip to content

Commit

Permalink
Added different limits for Nginx-Ingress on local and on cluster
Browse files Browse the repository at this point in the history
  • Loading branch information
Szymongib committed Oct 18, 2018
1 parent 6364eb7 commit c349d4f
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,12 @@ spec:
{{ toYaml .Values.controller.extraVolumeMounts | indent 12}}
{{- end }}
resources:
{{ toYaml .Values.controller.resources | indent 12 }}
{{- if .Values.global.isLocalEnv }} # modified original chart to enable different memory limits for cluster and Minikube
{{ toYaml .Values.controller.resources.local | indent 12 }}
{{- end }}
{{- if not .Values.global.isLocalEnv }}
{{ toYaml .Values.controller.resources.cluster | indent 12 }}
{{- end }}
{{- if .Values.controller.extraContainers }}
{{ toYaml .Values.controller.extraContainers | indent 8}}
{{- end }}
Expand Down
14 changes: 10 additions & 4 deletions resources/core/charts/nginx-ingress/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,16 @@ controller:
minAvailable: 1

resources:
limits:
memory: 256Mi
requests:
memory: 128Mi
cluster:
limits:
memory: 512Mi
requests:
memory: 128Mi
local:
limits:
memory: 256Mi
requests:
memory: 128Mi

autoscaling:
enabled: false
Expand Down

0 comments on commit c349d4f

Please sign in to comment.