Merge pull request #35 from dweomer/coredns-v1.7.1-again

coredns v1.7.1 but correct this time

packages/rke2-coredns/rke2-coredns.patch

@@ -176,150 +176,6 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rke2-coredns/charts-original/templates
          imagePullPolicy: {{ .Values.image.pullPolicy }}
          args: [ "-conf", "/etc/coredns/Corefile" ]
          volumeMounts:
-diff -x '*.tgz' -x '*.lock' -uNr packages/rke2-coredns/charts-original/templates/deployment.yaml.orig packages/rke2-coredns/charts/templates/deployment.yaml.orig
---- packages/rke2-coredns/charts-original/templates/deployment.yaml.orig
-+++ packages/rke2-coredns/charts/templates/deployment.yaml.orig
-@@ -0,0 +1,140 @@
-+apiVersion: apps/v1
-+kind: Deployment
-+metadata:
-+  name: {{ template "coredns.fullname" . }}
-+  labels:
-+    app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
-+    app.kubernetes.io/instance: {{ .Release.Name | quote }}
-+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
-+    {{- if .Values.isClusterService }}
-+    k8s-app: {{ .Chart.Name | quote }}
-+    kubernetes.io/cluster-service: "true"
-+    kubernetes.io/name: "CoreDNS"
-+    {{- end }}
-+    app.kubernetes.io/name: {{ template "coredns.name" . }}
-+{{- if .Values.customLabels }}
-+{{ toYaml .Values.customLabels | indent 4 }}
-+{{- end }}
-+spec:
-+  {{- if not .Values.autoscaler.enabled }}
-+  replicas: {{ .Values.replicaCount }}
-+  {{- end }}
-+  strategy:
-+    type: RollingUpdate
-+    rollingUpdate:
-+      maxUnavailable: {{ .Values.rollingUpdate.maxUnavailable }}
-+      maxSurge: {{ .Values.rollingUpdate.maxSurge }}
-+  selector:
-+    matchLabels:
-+      app.kubernetes.io/instance: {{ .Release.Name | quote }}
-+      {{- if .Values.isClusterService }}
-+      k8s-app: {{ .Chart.Name | quote }}
-+      {{- end }}
-+      app.kubernetes.io/name: {{ template "coredns.name" . }}
-+  template:
-+    metadata:
-+      labels:
-+        {{- if .Values.isClusterService }}
-+        k8s-app: {{ .Chart.Name | quote }}
-+        {{- end }}
-+        app.kubernetes.io/name: {{ template "coredns.name" . }}
-+        app.kubernetes.io/instance: {{ .Release.Name | quote }}
-+        {{- if .Values.customLabels }}
-+        {{ toYaml .Values.customLabels }}
-+        {{- end }}
-+      annotations:
-+        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
-+        {{- if .Values.isClusterService }}
-+        scheduler.alpha.kubernetes.io/critical-pod: ''
-+        scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
-+        {{- end }}
-+{{- if .Values.podAnnotations }}
-+{{ toYaml .Values.podAnnotations | indent 8 }}
-+{{- end }}
-+    spec:
-+      {{- if .Values.terminationGracePeriodSeconds }}
-+      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
-+      {{- end }}
-+      serviceAccountName: {{ template "coredns.serviceAccountName" . }}
-+      {{- if .Values.priorityClassName }}
-+      priorityClassName: {{ .Values.priorityClassName | quote }}
-+      {{- end }}
-+      {{- if .Values.isClusterService }}
-+      dnsPolicy: Default
-+      {{- end }}
-+      {{- if .Values.affinity }}
-+      affinity:
-+{{ toYaml .Values.affinity | indent 8 }}
-+      {{- end }}
-+      {{- if .Values.tolerations }}
-+      tolerations:
-+{{ toYaml .Values.tolerations | indent 8 }}
-+      {{- end }}
-+      {{- if .Values.nodeSelector }}
-+      nodeSelector:
-+{{ toYaml .Values.nodeSelector | indent 8 }}
-+      {{- end }}
-+      containers:
-+      - name: "coredns"
-+        image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-+        imagePullPolicy: {{ .Values.image.pullPolicy }}
-+        args: [ "-conf", "/etc/coredns/Corefile" ]
-+        volumeMounts:
-+        - name: config-volume
-+          mountPath: /etc/coredns
-+{{- range .Values.extraSecrets }}
-+        - name: {{ .name }}
-+          mountPath: {{ .mountPath }}
-+          readOnly: true
-+{{- end }}
-+{{- if .Values.extraVolumeMounts }}
-+{{- toYaml .Values.extraVolumeMounts | nindent 8}}
-+{{- end }}
-+        resources:
-+{{ toYaml .Values.resources | indent 10 }}
-+        ports:
-+{{ include "coredns.containerPorts" . | indent 8 }}
-+        livenessProbe:
-+          httpGet:
-+            path: /health
-+            port: 8080
-+            scheme: HTTP
-+          initialDelaySeconds: 60
-+          timeoutSeconds: 5
-+          successThreshold: 1
-+          failureThreshold: 5
-+        readinessProbe:
-+          httpGet:
-+            path: /ready
-+            port: 8181
-+            scheme: HTTP
-+          initialDelaySeconds: 10
-+          timeoutSeconds: 5
-+          successThreshold: 1
-+          failureThreshold: 5
-+        {{- if .Values.preStopSleep }}
-+        lifecycle:
-+          preStop:
-+            exec:
-+              command: ["/usr/bin/sleep", "{{ .Values.preStopSleep }}"]
-+        {{- end }}
-+      volumes:
-+        - name: config-volume
-+          configMap:
-+            name: {{ template "coredns.fullname" . }}
-+            items:
-+            - key: Corefile
-+              path: Corefile
-+            {{ range .Values.zoneFiles }}
-+            - key: {{ .filename }}
-+              path: {{ .filename }}
-+            {{ end }}
-+{{- range .Values.extraSecrets }}
-+        - name: {{ .name }}
-+          secret:
-+            secretName: {{ .name }}
-+            defaultMode: 400
-+{{- end }}
-+{{- if .Values.extraVolumes }}
-+{{ toYaml .Values.extraVolumes | indent 8 }}
-+{{- end }}
 diff -x '*.tgz' -x '*.lock' -uNr packages/rke2-coredns/charts-original/templates/_helpers.tpl packages/rke2-coredns/charts/templates/_helpers.tpl
 --- packages/rke2-coredns/charts-original/templates/_helpers.tpl
 +++ packages/rke2-coredns/charts/templates/_helpers.tpl
@@ -469,52 +325,6 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rke2-coredns/charts-original/templates
    {{- end }}
    {{- if .Values.service.externalIPs }}
    externalIPs:
-diff -x '*.tgz' -x '*.lock' -uNr packages/rke2-coredns/charts-original/templates/service.yaml.orig packages/rke2-coredns/charts/templates/service.yaml.orig
---- packages/rke2-coredns/charts-original/templates/service.yaml.orig
-+++ packages/rke2-coredns/charts/templates/service.yaml.orig
-@@ -0,0 +1,42 @@
-+apiVersion: v1
-+kind: Service
-+metadata:
-+  name: {{ template "coredns.fullname" . }}
-+  labels:
-+    app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
-+    app.kubernetes.io/instance: {{ .Release.Name | quote }}
-+    helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
-+    {{- if .Values.isClusterService }}
-+    k8s-app: {{ .Chart.Name | quote }}
-+    kubernetes.io/cluster-service: "true"
-+    kubernetes.io/name: "CoreDNS"
-+    {{- end }}
-+    app.kubernetes.io/name: {{ template "coredns.name" . }}
-+{{- if .Values.customLabels }}
-+{{ toYaml .Values.customLabels | indent 4 }}
-+{{- end }}
-+  annotations:
-+{{ toYaml .Values.service.annotations | indent 4 }}
-+spec:
-+  selector:
-+    app.kubernetes.io/instance: {{ .Release.Name | quote }}
-+    {{- if .Values.isClusterService }}
-+    k8s-app: {{ .Chart.Name | quote }}
-+    {{- end }}
-+    app.kubernetes.io/name: {{ template "coredns.name" . }}
-+  {{- if .Values.service.clusterIP }}
-+  clusterIP: {{ .Values.service.clusterIP }}
-+  {{- end }}
-+  {{- if .Values.service.externalIPs }}
-+  externalIPs:
-+  {{ toYaml .Values.service.externalIPs | indent 4 }}
-+  {{- end }}
-+  {{- if .Values.service.externalTrafficPolicy }}
-+  externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }}
-+  {{- end }}
-+  {{- if .Values.service.loadBalancerIP }}
-+  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
-+  {{- end }}
-+  ports:
-+{{ include "coredns.servicePorts" . | indent 2 -}}
-+  type: {{ default "ClusterIP" .Values.serviceType }}
 diff -x '*.tgz' -x '*.lock' -uNr packages/rke2-coredns/charts-original/values.yaml packages/rke2-coredns/charts/values.yaml
 --- packages/rke2-coredns/charts-original/values.yaml
 +++ packages/rke2-coredns/charts/values.yaml