diff --git a/changelog/0.36.md b/changelog/0.36.md index 5355a2e9b..df628f676 100644 --- a/changelog/0.36.md +++ b/changelog/0.36.md @@ -27,6 +27,7 @@ Released 2024-01-30 - [#1953](https://github.com/elastisys/compliantkubernetes-apps/pull/1953) - Diff charts recursively when diffing 'all' @simonklb - [#1961](https://github.com/elastisys/compliantkubernetes-apps/pull/1961) - Use objectStorage.s3.forcePathStyle in Velero values @simonklb - [#1975](https://github.com/elastisys/compliantkubernetes-apps/pull/1975) - Add context to update-ips port parsing error @simonklb +- [#2003](https://github.com/elastisys/compliantkubernetes-apps/pull/2003) - config: expose node-local-dns resources @davidumea ### Other(s) diff --git a/config/config/common-config.yaml b/config/config/common-config.yaml index 4203d9fb3..1bb4ace4e 100644 --- a/config/config/common-config.yaml +++ b/config/config/common-config.yaml @@ -1012,3 +1012,10 @@ nodeLocalDns: # loop # forward . 127.0.0.1:9005 # } + resources: + limits: + cpu: 100m + memory: 200Mi + requests: + cpu: 25m + memory: 40Mi diff --git a/helmfile.d/charts/node-local-dns/templates/node-local-dns.yaml b/helmfile.d/charts/node-local-dns/templates/node-local-dns.yaml index 81183e46c..437ff176a 100644 --- a/helmfile.d/charts/node-local-dns/templates/node-local-dns.yaml +++ b/helmfile.d/charts/node-local-dns/templates/node-local-dns.yaml @@ -143,8 +143,7 @@ spec: containers: - name: node-cache image: registry.k8s.io/dns/k8s-dns-node-cache:1.22.20 - resources: - {{- toYaml .Values.resources | nindent 12 }} + resources: {{- toYaml .Values.resources | nindent 10 }} args: [ "-localip", "{{ .Values.localIP }},{{ .Values.clusterDNS }}", "-conf", "/etc/Corefile", "-upstreamsvc", "kube-dns-upstream"] securityContext: privileged: true diff --git a/helmfile.d/values/node-local-dns.yaml.gotmpl b/helmfile.d/values/node-local-dns.yaml.gotmpl index 82d8ddd81..87447193e 100644 --- a/helmfile.d/values/node-local-dns.yaml.gotmpl +++ b/helmfile.d/values/node-local-dns.yaml.gotmpl @@ -8,3 +8,5 @@ errorConfig: |- {{- if dig "nodeLocalDns" "customConfig" false .Values }} customConfig: {{ toYaml .Values.nodeLocalDns.customConfig }} {{- end }} + +resources: {{- toYaml .Values.nodeLocalDns.resources | nindent 2 }}