Skip to content

Commit 5c1097d

Browse files
srodenhuisj-zimnowodaCasLubbers
authored
fix: nginx defaults (#1693)
Co-authored-by: Jehoszafat Zimnowoda <[email protected]> Co-authored-by: CasLubbers <[email protected]>
1 parent 65a00cb commit 5c1097d

File tree

2 files changed

+12
-19
lines changed

2 files changed

+12
-19
lines changed

helmfile.d/snippets/defaults.yaml

+11
Original file line numberDiff line numberDiff line change
@@ -276,9 +276,20 @@ environments:
276276
enabled: true
277277
minReplicas: 2
278278
maxReplicas: 10
279+
service:
280+
annotations: {}
279281
tracing:
280282
enabled: false
281283
samplingRatio: "0.01"
284+
maxBodySize: 1024m
285+
maxBodySizeBytes: 1073741824
286+
resources:
287+
requests:
288+
cpu: 200m
289+
memory: 512Mi
290+
limits:
291+
cpu: 2
292+
memory: 2Gi
282293
_rawValues: {}
283294
istio:
284295
tracing:

values/ingress-nginx/ingress-nginx.gotmpl

+1-19
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,7 @@ controller:
2929
patch:
3030
priorityClassName: otomi-critical
3131
useComponentLabel: true
32-
# set fixed allocation with limits same as requests
33-
resources:
34-
{{- if (hasKey $n "resources") }}
35-
{{- $n.resources | toYaml | nindent 4 }}
36-
{{- else }}
37-
limits:
38-
cpu: 2
39-
memory: 1.5Gi
40-
requests:
41-
cpu: 200m
42-
memory: 512Mi
43-
{{- end }}
32+
resources: {{- $n.resources | toYaml | nindent 4 }}
4433
podAnnotations:
4534
policy.otomi.io/ignore: psp-privileged
4635
opentelemetry:
@@ -154,13 +143,6 @@ defaultBackend:
154143
requests:
155144
cpu: 10m
156145
memory: 10Mi
157-
158-
# podAnnotations:
159-
# sidecar.istio.io/inject: "false"
160-
{{- if eq $v.cluster.provider "azure" }}
161-
nodeSelector:
162-
beta.kubernetes.io/os: linux
163-
{{- end }}
164146
service:
165147
omitClusterIP: true
166148
rbac:

0 commit comments

Comments
 (0)