diff --git a/packages/rke2-coredns/generated-changes/patch/Chart.yaml.patch b/packages/rke2-coredns/generated-changes/patch/Chart.yaml.patch index 9fc4689..0246139 100644 --- a/packages/rke2-coredns/generated-changes/patch/Chart.yaml.patch +++ b/packages/rke2-coredns/generated-changes/patch/Chart.yaml.patch @@ -1,14 +1,5 @@ --- charts-original/Chart.yaml +++ charts/Chart.yaml -@@ -2,7 +2,7 @@ - artifacthub.io/changes: | - - Initial helm chart changelog - apiVersion: v2 --appVersion: 1.8.7 -+appVersion: 1.9.1 - description: CoreDNS is a DNS server that chains plugins and provides Kubernetes DNS - Services - home: https://coredns.io @@ -14,7 +14,7 @@ maintainers: - name: mrueg diff --git a/packages/rke2-coredns/generated-changes/patch/templates/_helpers.tpl.patch b/packages/rke2-coredns/generated-changes/patch/templates/_helpers.tpl.patch index b2e0af7..77adfb3 100644 --- a/packages/rke2-coredns/generated-changes/patch/templates/_helpers.tpl.patch +++ b/packages/rke2-coredns/generated-changes/patch/templates/_helpers.tpl.patch @@ -1,6 +1,6 @@ --- charts-original/templates/_helpers.tpl +++ charts/templates/_helpers.tpl -@@ -137,6 +137,7 @@ +@@ -150,6 +150,7 @@ {{- end -}} {{- end -}} @@ -8,7 +8,7 @@ {{/* Create the name of the service account to use */}} -@@ -147,3 +148,44 @@ +@@ -160,3 +161,44 @@ {{ default "default" .Values.serviceAccount.name }} {{- end -}} {{- end -}} diff --git a/packages/rke2-coredns/generated-changes/patch/templates/configmap.yaml.patch b/packages/rke2-coredns/generated-changes/patch/templates/configmap.yaml.patch index 8e85b74..2cea50f 100644 --- a/packages/rke2-coredns/generated-changes/patch/templates/configmap.yaml.patch +++ b/packages/rke2-coredns/generated-changes/patch/templates/configmap.yaml.patch @@ -9,7 +9,7 @@ kubernetes.io/cluster-service: "true" kubernetes.io/name: "CoreDNS" {{- end }} -@@ -27,7 +27,7 @@ +@@ -31,7 +31,7 @@ {{- if .port }}:{{ .port }} {{ end -}} { {{- range .plugins }} diff --git a/packages/rke2-coredns/generated-changes/patch/templates/deployment-autoscaler.yaml.patch b/packages/rke2-coredns/generated-changes/patch/templates/deployment-autoscaler.yaml.patch index 9ed1380..c6514ac 100644 --- a/packages/rke2-coredns/generated-changes/patch/templates/deployment-autoscaler.yaml.patch +++ b/packages/rke2-coredns/generated-changes/patch/templates/deployment-autoscaler.yaml.patch @@ -9,7 +9,7 @@ kubernetes.io/cluster-service: "true" kubernetes.io/name: "CoreDNS" {{- end }} -@@ -23,14 +23,14 @@ +@@ -27,14 +27,14 @@ matchLabels: app.kubernetes.io/instance: {{ .Release.Name | quote }} {{- if .Values.isClusterService }} @@ -26,7 +26,7 @@ {{- end }} app.kubernetes.io/name: {{ template "coredns.name" . }}-autoscaler app.kubernetes.io/instance: {{ .Release.Name | quote }} -@@ -63,7 +63,7 @@ +@@ -67,7 +67,7 @@ {{- end }} containers: - name: autoscaler diff --git a/packages/rke2-coredns/generated-changes/patch/templates/deployment.yaml.patch b/packages/rke2-coredns/generated-changes/patch/templates/deployment.yaml.patch index 3da267d..ab3fa98 100644 --- a/packages/rke2-coredns/generated-changes/patch/templates/deployment.yaml.patch +++ b/packages/rke2-coredns/generated-changes/patch/templates/deployment.yaml.patch @@ -9,7 +9,7 @@ kubernetes.io/cluster-service: "true" kubernetes.io/name: "CoreDNS" {{- end }} -@@ -31,14 +31,14 @@ +@@ -40,14 +40,14 @@ matchLabels: app.kubernetes.io/instance: {{ .Release.Name | quote }} {{- if .Values.isClusterService }} @@ -26,7 +26,7 @@ {{- end }} app.kubernetes.io/name: {{ template "coredns.name" . }} app.kubernetes.io/instance: {{ .Release.Name | quote }} -@@ -49,7 +49,6 @@ +@@ -58,7 +58,6 @@ checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} {{- if .Values.isClusterService }} scheduler.alpha.kubernetes.io/critical-pod: '' @@ -34,7 +34,7 @@ {{- end }} {{- if .Values.podAnnotations }} {{ toYaml .Values.podAnnotations | indent 8 }} -@@ -69,9 +68,15 @@ +@@ -78,9 +77,15 @@ affinity: {{ toYaml .Values.affinity | indent 8 }} {{- end }} @@ -51,7 +51,7 @@ {{- end }} {{- if .Values.nodeSelector }} nodeSelector: -@@ -79,7 +84,7 @@ +@@ -88,7 +93,7 @@ {{- end }} containers: - name: "coredns" diff --git a/packages/rke2-coredns/generated-changes/patch/templates/poddisruptionbudget.yaml.patch b/packages/rke2-coredns/generated-changes/patch/templates/poddisruptionbudget.yaml.patch index 3f71422..e37b31f 100644 --- a/packages/rke2-coredns/generated-changes/patch/templates/poddisruptionbudget.yaml.patch +++ b/packages/rke2-coredns/generated-changes/patch/templates/poddisruptionbudget.yaml.patch @@ -9,7 +9,7 @@ kubernetes.io/cluster-service: "true" kubernetes.io/name: "CoreDNS" {{- end }} -@@ -21,7 +21,7 @@ +@@ -25,7 +25,7 @@ matchLabels: app.kubernetes.io/instance: {{ .Release.Name | quote }} {{- if .Values.isClusterService }} diff --git a/packages/rke2-coredns/generated-changes/patch/templates/service-metrics.yaml.patch b/packages/rke2-coredns/generated-changes/patch/templates/service-metrics.yaml.patch index 6462918..805e5ae 100644 --- a/packages/rke2-coredns/generated-changes/patch/templates/service-metrics.yaml.patch +++ b/packages/rke2-coredns/generated-changes/patch/templates/service-metrics.yaml.patch @@ -9,7 +9,7 @@ kubernetes.io/cluster-service: "true" kubernetes.io/name: "CoreDNS" {{- end }} -@@ -23,7 +23,7 @@ +@@ -33,7 +33,7 @@ selector: app.kubernetes.io/instance: {{ .Release.Name | quote }} {{- if .Values.isClusterService }} diff --git a/packages/rke2-coredns/generated-changes/patch/templates/service.yaml.patch b/packages/rke2-coredns/generated-changes/patch/templates/service.yaml.patch index 091f7ff..349746b 100644 --- a/packages/rke2-coredns/generated-changes/patch/templates/service.yaml.patch +++ b/packages/rke2-coredns/generated-changes/patch/templates/service.yaml.patch @@ -9,7 +9,7 @@ kubernetes.io/cluster-service: "true" kubernetes.io/name: "CoreDNS" {{- end }} -@@ -23,12 +23,10 @@ +@@ -30,12 +30,10 @@ selector: app.kubernetes.io/instance: {{ .Release.Name | quote }} {{- if .Values.isClusterService }} diff --git a/packages/rke2-coredns/generated-changes/patch/templates/servicemonitor.yaml.patch b/packages/rke2-coredns/generated-changes/patch/templates/servicemonitor.yaml.patch index e3da0ab..d445e2c 100644 --- a/packages/rke2-coredns/generated-changes/patch/templates/servicemonitor.yaml.patch +++ b/packages/rke2-coredns/generated-changes/patch/templates/servicemonitor.yaml.patch @@ -9,7 +9,7 @@ kubernetes.io/cluster-service: "true" kubernetes.io/name: "CoreDNS" {{- end }} -@@ -24,7 +24,7 @@ +@@ -28,7 +28,7 @@ matchLabels: app.kubernetes.io/instance: {{ .Release.Name | quote }} {{- if .Values.isClusterService }} diff --git a/packages/rke2-coredns/generated-changes/patch/values.yaml.patch b/packages/rke2-coredns/generated-changes/patch/values.yaml.patch index 8075fbb..3b43df9 100644 --- a/packages/rke2-coredns/generated-changes/patch/values.yaml.patch +++ b/packages/rke2-coredns/generated-changes/patch/values.yaml.patch @@ -5,9 +5,9 @@ image: - repository: coredns/coredns -- tag: "1.8.7" +- tag: "1.9.3" + repository: rancher/hardened-coredns -+ tag: "v1.9.1-build20220318" ++ tag: "v1.9.3-build20220613" pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. @@ -82,7 +82,7 @@ # https://kubernetes.io/docs/tasks/run-application/configure-pdb/#specifying-a-poddisruptionbudget podDisruptionBudget: {} -@@ -243,7 +249,7 @@ +@@ -246,7 +252,7 @@ # See https://github.com/kubernetes-incubator/cluster-proportional-autoscaler autoscaler: # Enabled the cluster-proportional-autoscaler @@ -91,18 +91,18 @@ # Number of cores in the cluster per coredns replica coresPerReplica: 256 -@@ -264,8 +270,8 @@ +@@ -267,8 +273,8 @@ # - --nodelabels=topology.kubernetes.io/zone=us-east-1a image: -- repository: k8s.gcr.io/cluster-proportional-autoscaler-amd64 -- tag: "1.8.1" +- repository: k8s.gcr.io/cpa/cluster-proportional-autoscaler +- tag: "1.8.5" + repository: rancher/hardened-cluster-autoscaler + tag: "v1.8.5-build20211119" pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. -@@ -282,19 +288,26 @@ +@@ -285,19 +291,26 @@ # Node labels for pod assignment # Ref: https://kubernetes.io/docs/user-guide/node-selection/ @@ -123,17 +123,19 @@ # resources for autoscaler pod resources: requests: - cpu: "20m" +- cpu: "20m" - memory: "10Mi" -+ memory: "20Mi" ++ cpu: "25m" ++ memory: "16Mi" limits: - cpu: "20m" +- cpu: "20m" - memory: "10Mi" -+ memory: "20Mi" ++ cpu: "100m" ++ memory: "64Mi" # Options for autoscaler configmap configmap: -@@ -306,11 +319,28 @@ +@@ -309,8 +322,8 @@ livenessProbe: enabled: true initialDelaySeconds: 10 @@ -143,10 +145,11 @@ + timeoutSeconds: 10 failureThreshold: 3 successThreshold: 1 -- - deployment: - enabled: true + +@@ -319,3 +332,21 @@ name: "" + ## Annotations for the coredns deployment + annotations: {} + +k8sApp : "kube-dns" + diff --git a/packages/rke2-coredns/package.yaml b/packages/rke2-coredns/package.yaml index 2cf5f38..6ee9f49 100644 --- a/packages/rke2-coredns/package.yaml +++ b/packages/rke2-coredns/package.yaml @@ -1,4 +1,4 @@ -url: https://github.com/coredns/helm/releases/download/coredns-1.17.0/coredns-1.17.0.tgz +url: https://github.com/coredns/helm/releases/download/coredns-1.19.4/coredns-1.19.4.tgz packageVersion: 00 # This repository does not use releaseCandidateVersions, so you can leave this as 00. releaseCandidateVersion: 00