Revert changes for coredns v1.7.1 but keep priorityClassName

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
pull/40/head
Brad Davidson 2021-01-08 15:22:53 -08:00 committed by Brad Davidson
parent cf3ffd959f
commit 17ceb0a979
2 changed files with 16 additions and 25 deletions

View File

@ -1,2 +1,2 @@
url: https://charts.helm.sh/stable/packages/coredns-1.13.8.tgz url: https://charts.helm.sh/stable/packages/coredns-1.10.1.tgz
packageVersion: 00 packageVersion: 01

View File

@ -1,24 +1,15 @@
diff -x '*.tgz' -x '*.lock' -uNr packages/rke2-coredns/charts-original/Chart.yaml packages/rke2-coredns/charts/Chart.yaml diff -x '*.tgz' -x '*.lock' -uNr packages/rke2-coredns/charts-original/Chart.yaml packages/rke2-coredns/charts/Chart.yaml
--- packages/rke2-coredns/charts-original/Chart.yaml --- packages/rke2-coredns/charts-original/Chart.yaml
+++ packages/rke2-coredns/charts/Chart.yaml +++ packages/rke2-coredns/charts/Chart.yaml
@@ -1,7 +1,6 @@ @@ -17,7 +17,7 @@
apiVersion: v1 name: andor44
appVersion: 1.7.1 - email: manuel@rueg.eu
-deprecated: true name: mrueg
-description: DEPRECATED CoreDNS is a DNS server that chains plugins and provides Kubernetes
+description: CoreDNS is a DNS server that chains plugins and provides Kubernetes
DNS Services
home: https://coredns.io
icon: https://coredns.io/images/CoreDNS_Colour_Horizontal.png
@@ -9,7 +8,7 @@
- coredns
- dns
- kubedns
-name: coredns -name: coredns
+name: rke2-coredns +name: rke2-coredns
sources: sources:
- https://github.com/coredns/coredns - https://github.com/coredns/coredns
version: 1.13.8 version: 1.10.1
diff -x '*.tgz' -x '*.lock' -uNr packages/rke2-coredns/charts-original/templates/_helpers.tpl packages/rke2-coredns/charts/templates/_helpers.tpl 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-original/templates/_helpers.tpl
+++ packages/rke2-coredns/charts/templates/_helpers.tpl +++ packages/rke2-coredns/charts/templates/_helpers.tpl
@ -190,7 +181,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rke2-coredns/charts-original/templates
{{- end }} {{- end }}
app.kubernetes.io/name: {{ template "coredns.name" . }} app.kubernetes.io/name: {{ template "coredns.name" . }}
app.kubernetes.io/instance: {{ .Release.Name | quote }} app.kubernetes.io/instance: {{ .Release.Name | quote }}
@@ -76,7 +76,7 @@ @@ -70,7 +70,7 @@
{{- end }} {{- end }}
containers: containers:
- name: "coredns" - name: "coredns"
@ -278,8 +269,8 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rke2-coredns/charts-original/templates
+ {{ else }} + {{ else }}
+ clusterIP: {{ (lookup "v1" "ConfigMap" "kube-system" "cluster-dns").data.clusterDNS }} + clusterIP: {{ (lookup "v1" "ConfigMap" "kube-system" "cluster-dns").data.clusterDNS }}
{{- end }} {{- end }}
{{- if .Values.service.externalIPs }} {{- if .Values.service.externalTrafficPolicy }}
externalIPs: externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }}
diff -x '*.tgz' -x '*.lock' -uNr packages/rke2-coredns/charts-original/templates/serviceaccount-autoscaler.yaml packages/rke2-coredns/charts/templates/serviceaccount-autoscaler.yaml diff -x '*.tgz' -x '*.lock' -uNr packages/rke2-coredns/charts-original/templates/serviceaccount-autoscaler.yaml packages/rke2-coredns/charts/templates/serviceaccount-autoscaler.yaml
--- packages/rke2-coredns/charts-original/templates/serviceaccount-autoscaler.yaml --- packages/rke2-coredns/charts-original/templates/serviceaccount-autoscaler.yaml
+++ packages/rke2-coredns/charts/templates/serviceaccount-autoscaler.yaml +++ packages/rke2-coredns/charts/templates/serviceaccount-autoscaler.yaml
@ -333,14 +324,14 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rke2-coredns/charts-original/values.ya
image: image:
- repository: coredns/coredns - repository: coredns/coredns
- tag: "1.7.1" - tag: "1.6.9"
+ repository: rancher/hardened-coredns + repository: rancher/hardened-coredns
+ tag: "v1.7.1" + tag: "v1.6.9"
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
replicaCount: 1 replicaCount: 1
@@ -66,10 +66,10 @@ @@ -34,10 +34,10 @@
annotations: {} prometheus.io/port: "9153"
serviceAccount: serviceAccount:
- create: false - create: false
@ -352,7 +343,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rke2-coredns/charts-original/values.ya
rbac: rbac:
# If true, create & use RBAC resources # If true, create & use RBAC resources
@@ -84,7 +84,7 @@ @@ -52,7 +52,7 @@
isClusterService: true isClusterService: true
# Optional priority class to be used for the coredns pods. Used for autoscaler if autoscaler.priorityClassName not set. # Optional priority class to be used for the coredns pods. Used for autoscaler if autoscaler.priorityClassName not set.
@ -361,7 +352,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rke2-coredns/charts-original/values.ya
# Default zone is what Kubernetes recommends: # Default zone is what Kubernetes recommends:
# https://kubernetes.io/docs/tasks/administer-cluster/dns-custom-nameservers/#coredns-configmap-options # https://kubernetes.io/docs/tasks/administer-cluster/dns-custom-nameservers/#coredns-configmap-options
@@ -253,3 +253,7 @@ @@ -196,3 +196,7 @@
## Annotations for the coredns-autoscaler configmap ## Annotations for the coredns-autoscaler configmap
# i.e. strategy.spinnaker.io/versioned: "false" to ensure configmap isn't renamed # i.e. strategy.spinnaker.io/versioned: "false" to ensure configmap isn't renamed
annotations: {} annotations: {}