diff --git a/helmfile.d/snippets/defaults.yaml b/helmfile.d/snippets/defaults.yaml index b6d25a4605..d9f4d486ef 100644 --- a/helmfile.d/snippets/defaults.yaml +++ b/helmfile.d/snippets/defaults.yaml @@ -276,9 +276,20 @@ environments: enabled: true minReplicas: 2 maxReplicas: 10 + service: + annotations: {} tracing: enabled: false samplingRatio: "0.01" + maxBodySize: 1024m + maxBodySizeBytes: 1073741824 + resources: + requests: + cpu: 200m + memory: 512Mi + limits: + cpu: 2 + memory: 2Gi _rawValues: {} istio: tracing: diff --git a/values/ingress-nginx/ingress-nginx.gotmpl b/values/ingress-nginx/ingress-nginx.gotmpl index 90c550a93f..6d1b9fbcf6 100644 --- a/values/ingress-nginx/ingress-nginx.gotmpl +++ b/values/ingress-nginx/ingress-nginx.gotmpl @@ -29,18 +29,7 @@ controller: patch: priorityClassName: otomi-critical useComponentLabel: true - # set fixed allocation with limits same as requests - resources: - {{- if (hasKey $n "resources") }} - {{- $n.resources | toYaml | nindent 4 }} - {{- else }} - limits: - cpu: 2 - memory: 1.5Gi - requests: - cpu: 200m - memory: 512Mi - {{- end }} + resources: {{- $n.resources | toYaml | nindent 4 }} podAnnotations: policy.otomi.io/ignore: psp-privileged opentelemetry: @@ -154,13 +143,6 @@ defaultBackend: requests: cpu: 10m memory: 10Mi - - # podAnnotations: - # sidecar.istio.io/inject: "false" -{{- if eq $v.cluster.provider "azure" }} - nodeSelector: - beta.kubernetes.io/os: linux -{{- end }} service: omitClusterIP: true rbac: