mirror of https://git.rancher.io/rke2-charts
Bump coredns helmchart to 1.24.0
Does not change the image, just the chart Signed-off-by: Brad Davidson <brad.davidson@rancher.com>pull/347/head
parent
809cfb93f5
commit
d18c146e9e
|
@ -1,9 +1,9 @@
|
||||||
--- charts-original/Chart.yaml
|
--- charts-original/Chart.yaml
|
||||||
+++ charts/Chart.yaml
|
+++ charts/Chart.yaml
|
||||||
@@ -14,7 +14,7 @@
|
@@ -16,7 +16,7 @@
|
||||||
maintainers:
|
|
||||||
- name: mrueg
|
- name: mrueg
|
||||||
- name: haad
|
- name: haad
|
||||||
|
- name: HagaiBarel
|
||||||
-name: coredns
|
-name: coredns
|
||||||
+name: rke2-coredns
|
+name: rke2-coredns
|
||||||
sources:
|
sources:
|
||||||
|
|
|
@ -1,14 +1,15 @@
|
||||||
--- charts-original/templates/_helpers.tpl
|
--- charts-original/templates/_helpers.tpl
|
||||||
+++ charts/templates/_helpers.tpl
|
+++ charts/templates/_helpers.tpl
|
||||||
@@ -150,6 +150,7 @@
|
@@ -24,7 +24,7 @@
|
||||||
{{- end -}}
|
Allow k8s-app label to be overridden
|
||||||
|
*/}}
|
||||||
|
{{- define "coredns.k8sapplabel" -}}
|
||||||
|
-{{- default .Chart.Name .Values.k8sAppLabelOverride | trunc 63 | trimSuffix "-" -}}
|
||||||
|
+{{- .Values.k8sApp | default .Chart.Name .Values.k8sAppLabelOverride | trunc 63 | trimSuffix "-" -}}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
|
||||||
+
|
|
||||||
{{/*
|
{{/*
|
||||||
Create the name of the service account to use
|
@@ -191,3 +191,44 @@
|
||||||
*/}}
|
|
||||||
@@ -160,3 +161,44 @@
|
|
||||||
{{ default "default" .Values.serviceAccount.name }}
|
{{ default "default" .Values.serviceAccount.name }}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
|
|
@ -1,11 +0,0 @@
|
||||||
--- charts-original/templates/clusterrole-autoscaler.yaml
|
|
||||||
+++ charts/templates/clusterrole-autoscaler.yaml
|
|
||||||
@@ -9,7 +9,7 @@
|
|
||||||
app.kubernetes.io/instance: {{ .Release.Name | quote }}
|
|
||||||
helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
|
|
||||||
{{- if .Values.isClusterService }}
|
|
||||||
- k8s-app: {{ .Chart.Name }}-autoscaler
|
|
||||||
+ k8s-app: {{ .Values.k8sApp | default .Chart.Name }}-autoscaler
|
|
||||||
kubernetes.io/cluster-service: "true"
|
|
||||||
kubernetes.io/name: "CoreDNS"
|
|
||||||
{{- end }}
|
|
|
@ -1,11 +0,0 @@
|
||||||
--- charts-original/templates/clusterrole.yaml
|
|
||||||
+++ charts/templates/clusterrole.yaml
|
|
||||||
@@ -8,7 +8,7 @@
|
|
||||||
app.kubernetes.io/instance: {{ .Release.Name | quote }}
|
|
||||||
helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
|
|
||||||
{{- if .Values.isClusterService }}
|
|
||||||
- k8s-app: {{ .Chart.Name | quote }}
|
|
||||||
+ k8s-app: {{ .Values.k8sApp | default .Chart.Name | quote }}
|
|
||||||
kubernetes.io/cluster-service: "true"
|
|
||||||
kubernetes.io/name: "CoreDNS"
|
|
||||||
{{- end }}
|
|
|
@ -1,11 +0,0 @@
|
||||||
--- charts-original/templates/clusterrolebinding-autoscaler.yaml
|
|
||||||
+++ charts/templates/clusterrolebinding-autoscaler.yaml
|
|
||||||
@@ -9,7 +9,7 @@
|
|
||||||
app.kubernetes.io/instance: {{ .Release.Name | quote }}
|
|
||||||
helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
|
|
||||||
{{- if .Values.isClusterService }}
|
|
||||||
- k8s-app: {{ .Chart.Name }}-autoscaler
|
|
||||||
+ k8s-app: {{ .Values.k8sApp | default .Chart.Name }}-autoscaler
|
|
||||||
kubernetes.io/cluster-service: "true"
|
|
||||||
kubernetes.io/name: "CoreDNS"
|
|
||||||
{{- end }}
|
|
|
@ -1,11 +0,0 @@
|
||||||
--- charts-original/templates/clusterrolebinding.yaml
|
|
||||||
+++ charts/templates/clusterrolebinding.yaml
|
|
||||||
@@ -8,7 +8,7 @@
|
|
||||||
app.kubernetes.io/instance: {{ .Release.Name | quote }}
|
|
||||||
helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
|
|
||||||
{{- if .Values.isClusterService }}
|
|
||||||
- k8s-app: {{ .Chart.Name | quote }}
|
|
||||||
+ k8s-app: {{ .Values.k8sApp | default .Chart.Name | quote }}
|
|
||||||
kubernetes.io/cluster-service: "true"
|
|
||||||
kubernetes.io/name: "CoreDNS"
|
|
||||||
{{- end }}
|
|
|
@ -1,11 +0,0 @@
|
||||||
--- charts-original/templates/configmap-autoscaler.yaml
|
|
||||||
+++ charts/templates/configmap-autoscaler.yaml
|
|
||||||
@@ -10,7 +10,7 @@
|
|
||||||
app.kubernetes.io/instance: {{ .Release.Name | quote }}
|
|
||||||
helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
|
|
||||||
{{- if .Values.isClusterService }}
|
|
||||||
- k8s-app: {{ .Chart.Name }}-autoscaler
|
|
||||||
+ k8s-app: {{ .Values.k8sApp | default .Chart.Name }}-autoscaler
|
|
||||||
kubernetes.io/cluster-service: "true"
|
|
||||||
kubernetes.io/name: "CoreDNS"
|
|
||||||
{{- end }}
|
|
|
@ -1,14 +1,5 @@
|
||||||
--- charts-original/templates/configmap.yaml
|
--- charts-original/templates/configmap.yaml
|
||||||
+++ charts/templates/configmap.yaml
|
+++ charts/templates/configmap.yaml
|
||||||
@@ -9,7 +9,7 @@
|
|
||||||
app.kubernetes.io/instance: {{ .Release.Name | quote }}
|
|
||||||
helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
|
|
||||||
{{- if .Values.isClusterService }}
|
|
||||||
- k8s-app: {{ .Chart.Name | quote }}
|
|
||||||
+ k8s-app: {{ .Values.k8sApp | default .Chart.Name | quote }}
|
|
||||||
kubernetes.io/cluster-service: "true"
|
|
||||||
kubernetes.io/name: "CoreDNS"
|
|
||||||
{{- end }}
|
|
||||||
@@ -31,7 +31,7 @@
|
@@ -31,7 +31,7 @@
|
||||||
{{- if .port }}:{{ .port }} {{ end -}}
|
{{- if .port }}:{{ .port }} {{ end -}}
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,32 +1,6 @@
|
||||||
--- charts-original/templates/deployment-autoscaler.yaml
|
--- charts-original/templates/deployment-autoscaler.yaml
|
||||||
+++ charts/templates/deployment-autoscaler.yaml
|
+++ charts/templates/deployment-autoscaler.yaml
|
||||||
@@ -10,7 +10,7 @@
|
@@ -74,7 +74,7 @@
|
||||||
app.kubernetes.io/instance: {{ .Release.Name | quote }}
|
|
||||||
helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
|
|
||||||
{{- if .Values.isClusterService }}
|
|
||||||
- k8s-app: {{ .Chart.Name }}-autoscaler
|
|
||||||
+ k8s-app: {{ .Values.k8sApp | default .Chart.Name }}-autoscaler
|
|
||||||
kubernetes.io/cluster-service: "true"
|
|
||||||
kubernetes.io/name: "CoreDNS"
|
|
||||||
{{- end }}
|
|
||||||
@@ -27,14 +27,14 @@
|
|
||||||
matchLabels:
|
|
||||||
app.kubernetes.io/instance: {{ .Release.Name | quote }}
|
|
||||||
{{- if .Values.isClusterService }}
|
|
||||||
- k8s-app: {{ .Chart.Name }}-autoscaler
|
|
||||||
+ k8s-app: {{ .Values.k8sApp | default .Chart.Name }}-autoscaler
|
|
||||||
{{- end }}
|
|
||||||
app.kubernetes.io/name: {{ template "coredns.name" . }}-autoscaler
|
|
||||||
template:
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
{{- if .Values.isClusterService }}
|
|
||||||
- k8s-app: {{ .Chart.Name }}-autoscaler
|
|
||||||
+ k8s-app: {{ .Values.k8sApp | default .Chart.Name }}-autoscaler
|
|
||||||
{{- end }}
|
|
||||||
app.kubernetes.io/name: {{ template "coredns.name" . }}-autoscaler
|
|
||||||
app.kubernetes.io/instance: {{ .Release.Name | quote }}
|
|
||||||
@@ -67,7 +67,7 @@
|
|
||||||
{{- end }}
|
{{- end }}
|
||||||
containers:
|
containers:
|
||||||
- name: autoscaler
|
- name: autoscaler
|
||||||
|
|
|
@ -1,42 +1,18 @@
|
||||||
--- charts-original/templates/deployment.yaml
|
--- charts-original/templates/deployment.yaml
|
||||||
+++ charts/templates/deployment.yaml
|
+++ charts/templates/deployment.yaml
|
||||||
@@ -9,7 +9,7 @@
|
@@ -56,9 +56,6 @@
|
||||||
app.kubernetes.io/instance: {{ .Release.Name | quote }}
|
|
||||||
helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
|
|
||||||
{{- if .Values.isClusterService }}
|
|
||||||
- k8s-app: {{ .Chart.Name | quote }}
|
|
||||||
+ k8s-app: {{ .Values.k8sApp | default .Chart.Name | quote }}
|
|
||||||
kubernetes.io/cluster-service: "true"
|
|
||||||
kubernetes.io/name: "CoreDNS"
|
|
||||||
{{- end }}
|
{{- end }}
|
||||||
@@ -40,14 +40,14 @@
|
annotations:
|
||||||
matchLabels:
|
|
||||||
app.kubernetes.io/instance: {{ .Release.Name | quote }}
|
|
||||||
{{- if .Values.isClusterService }}
|
|
||||||
- k8s-app: {{ .Chart.Name | quote }}
|
|
||||||
+ k8s-app: {{ .Values.k8sApp | default .Chart.Name | quote }}
|
|
||||||
{{- end }}
|
|
||||||
app.kubernetes.io/name: {{ template "coredns.name" . }}
|
|
||||||
template:
|
|
||||||
metadata:
|
|
||||||
labels:
|
|
||||||
{{- if .Values.isClusterService }}
|
|
||||||
- k8s-app: {{ .Chart.Name | quote }}
|
|
||||||
+ k8s-app: {{ .Values.k8sApp | default .Chart.Name | quote }}
|
|
||||||
{{- end }}
|
|
||||||
app.kubernetes.io/name: {{ template "coredns.name" . }}
|
|
||||||
app.kubernetes.io/instance: {{ .Release.Name | quote }}
|
|
||||||
@@ -58,7 +58,6 @@
|
|
||||||
checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
|
checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
|
||||||
{{- if .Values.isClusterService }}
|
- {{- if .Values.isClusterService }}
|
||||||
scheduler.alpha.kubernetes.io/critical-pod: ''
|
|
||||||
- scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
|
- scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
|
||||||
{{- end }}
|
- {{- end }}
|
||||||
{{- if .Values.podAnnotations }}
|
{{- if .Values.podAnnotations }}
|
||||||
{{ toYaml .Values.podAnnotations | indent 8 }}
|
{{ toYaml .Values.podAnnotations | indent 8 }}
|
||||||
@@ -78,9 +77,15 @@
|
{{- end }}
|
||||||
affinity:
|
@@ -84,8 +81,13 @@
|
||||||
{{ toYaml .Values.affinity | indent 8 }}
|
topologySpreadConstraints:
|
||||||
|
{{ toYaml .Values.topologySpreadConstraints | indent 8 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
- {{- if .Values.tolerations }}
|
- {{- if .Values.tolerations }}
|
||||||
+ {{- if or (.Values.isClusterService) (.Values.tolerations) }}
|
+ {{- if or (.Values.isClusterService) (.Values.tolerations) }}
|
||||||
|
@ -47,16 +23,14 @@
|
||||||
+ {{- end }}
|
+ {{- end }}
|
||||||
+ {{- if .Values.tolerations }}
|
+ {{- if .Values.tolerations }}
|
||||||
{{ toYaml .Values.tolerations | indent 8 }}
|
{{ toYaml .Values.tolerations | indent 8 }}
|
||||||
+ {{- end }}
|
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if .Values.nodeSelector }}
|
{{- if .Values.nodeSelector }}
|
||||||
nodeSelector:
|
@@ -98,7 +100,7 @@
|
||||||
@@ -88,7 +93,7 @@
|
|
||||||
{{- end }}
|
{{- end }}
|
||||||
containers:
|
containers:
|
||||||
- name: "coredns"
|
- name: "coredns"
|
||||||
- image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
|
- image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
|
||||||
+ image: {{ template "system_default_registry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag }}
|
+ image: {{ template "system_default_registry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
|
||||||
imagePullPolicy: {{ .Values.image.pullPolicy }}
|
imagePullPolicy: {{ .Values.image.pullPolicy }}
|
||||||
args: [ "-conf", "/etc/coredns/Corefile" ]
|
args: [ "-conf", "/etc/coredns/Corefile" ]
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
|
|
|
@ -1,20 +0,0 @@
|
||||||
--- charts-original/templates/poddisruptionbudget.yaml
|
|
||||||
+++ charts/templates/poddisruptionbudget.yaml
|
|
||||||
@@ -8,7 +8,7 @@
|
|
||||||
app.kubernetes.io/instance: {{ .Release.Name | quote }}
|
|
||||||
helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
|
|
||||||
{{- if .Values.isClusterService }}
|
|
||||||
- k8s-app: {{ .Chart.Name | quote }}
|
|
||||||
+ k8s-app: {{ .Values.k8sApp | default .Chart.Name | quote }}
|
|
||||||
kubernetes.io/cluster-service: "true"
|
|
||||||
kubernetes.io/name: "CoreDNS"
|
|
||||||
{{- end }}
|
|
||||||
@@ -25,7 +25,7 @@
|
|
||||||
matchLabels:
|
|
||||||
app.kubernetes.io/instance: {{ .Release.Name | quote }}
|
|
||||||
{{- if .Values.isClusterService }}
|
|
||||||
- k8s-app: {{ .Chart.Name | quote }}
|
|
||||||
+ k8s-app: {{ .Values.k8sApp | default .Chart.Name | quote }}
|
|
||||||
{{- end }}
|
|
||||||
app.kubernetes.io/name: {{ template "coredns.name" . }}
|
|
||||||
{{ toYaml .Values.podDisruptionBudget | indent 2 }}
|
|
|
@ -1,11 +0,0 @@
|
||||||
--- charts-original/templates/podsecuritypolicy.yaml
|
|
||||||
+++ charts/templates/podsecuritypolicy.yaml
|
|
||||||
@@ -12,7 +12,7 @@
|
|
||||||
app.kubernetes.io/instance: {{ .Release.Name | quote }}
|
|
||||||
helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
|
|
||||||
{{- if .Values.isClusterService }}
|
|
||||||
- k8s-app: {{ .Chart.Name | quote }}
|
|
||||||
+ k8s-app: {{ .Values.k8sApp | default .Chart.Name | quote }}
|
|
||||||
kubernetes.io/cluster-service: "true"
|
|
||||||
kubernetes.io/name: "CoreDNS"
|
|
||||||
{{- else }}
|
|
|
@ -1,20 +0,0 @@
|
||||||
--- charts-original/templates/service-metrics.yaml
|
|
||||||
+++ charts/templates/service-metrics.yaml
|
|
||||||
@@ -8,7 +8,7 @@
|
|
||||||
app.kubernetes.io/instance: {{ .Release.Name | quote }}
|
|
||||||
helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
|
|
||||||
{{- if .Values.isClusterService }}
|
|
||||||
- k8s-app: {{ .Chart.Name | quote }}
|
|
||||||
+ k8s-app: {{ .Values.k8sApp | default .Chart.Name | quote }}
|
|
||||||
kubernetes.io/cluster-service: "true"
|
|
||||||
kubernetes.io/name: "CoreDNS"
|
|
||||||
{{- end }}
|
|
||||||
@@ -33,7 +33,7 @@
|
|
||||||
selector:
|
|
||||||
app.kubernetes.io/instance: {{ .Release.Name | quote }}
|
|
||||||
{{- if .Values.isClusterService }}
|
|
||||||
- k8s-app: {{ .Chart.Name | quote }}
|
|
||||||
+ k8s-app: {{ .Values.k8sApp | default .Chart.Name | quote }}
|
|
||||||
{{- end }}
|
|
||||||
app.kubernetes.io/name: {{ template "coredns.name" . }}
|
|
||||||
ports:
|
|
|
@ -1,26 +1,17 @@
|
||||||
--- charts-original/templates/service.yaml
|
--- charts-original/templates/service.yaml
|
||||||
+++ charts/templates/service.yaml
|
+++ charts/templates/service.yaml
|
||||||
@@ -9,7 +9,7 @@
|
@@ -33,13 +33,7 @@
|
||||||
app.kubernetes.io/instance: {{ .Release.Name | quote }}
|
k8s-app: {{ template "coredns.k8sapplabel" . }}
|
||||||
helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
|
|
||||||
{{- if .Values.isClusterService }}
|
|
||||||
- k8s-app: {{ .Chart.Name | quote }}
|
|
||||||
+ k8s-app: {{ .Values.k8sApp | default .Chart.Name | quote }}
|
|
||||||
kubernetes.io/cluster-service: "true"
|
|
||||||
kubernetes.io/name: "CoreDNS"
|
|
||||||
{{- end }}
|
|
||||||
@@ -30,12 +30,10 @@
|
|
||||||
selector:
|
|
||||||
app.kubernetes.io/instance: {{ .Release.Name | quote }}
|
|
||||||
{{- if .Values.isClusterService }}
|
|
||||||
- k8s-app: {{ .Chart.Name | quote }}
|
|
||||||
+ k8s-app: {{ .Values.k8sApp | default .Chart.Name | quote }}
|
|
||||||
{{- end }}
|
{{- end }}
|
||||||
app.kubernetes.io/name: {{ template "coredns.name" . }}
|
app.kubernetes.io/name: {{ template "coredns.name" . }}
|
||||||
- {{- if .Values.service.clusterIP }}
|
- {{- if .Values.service.clusterIP }}
|
||||||
- clusterIP: {{ .Values.service.clusterIP }}
|
- clusterIP: {{ .Values.service.clusterIP }}
|
||||||
- {{- end }}
|
- {{- end }}
|
||||||
|
- {{- if .Values.service.clusterIPs }}
|
||||||
|
- clusterIPs:
|
||||||
|
- {{ toYaml .Values.service.clusterIPs | nindent 4 }}
|
||||||
|
- {{- end }}
|
||||||
+ clusterIP: {{ template "clusterDNSServerIP" . }}
|
+ clusterIP: {{ template "clusterDNSServerIP" . }}
|
||||||
{{- if .Values.service.externalIPs }}
|
{{- if .Values.service.externalIPs }}
|
||||||
externalIPs:
|
externalIPs:
|
||||||
{{ toYaml .Values.service.externalIPs | indent 4 }}
|
{{- toYaml .Values.service.externalIPs | nindent 4 }}
|
||||||
|
|
|
@ -1,11 +0,0 @@
|
||||||
--- charts-original/templates/serviceaccount-autoscaler.yaml
|
|
||||||
+++ charts/templates/serviceaccount-autoscaler.yaml
|
|
||||||
@@ -10,7 +10,7 @@
|
|
||||||
app.kubernetes.io/instance: {{ .Release.Name | quote }}
|
|
||||||
helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
|
|
||||||
{{- if .Values.isClusterService }}
|
|
||||||
- k8s-app: {{ .Chart.Name }}-autoscaler
|
|
||||||
+ k8s-app: {{ .Values.k8sApp | default .Chart.Name }}-autoscaler
|
|
||||||
kubernetes.io/cluster-service: "true"
|
|
||||||
kubernetes.io/name: "CoreDNS"
|
|
||||||
{{- end }}
|
|
|
@ -1,11 +0,0 @@
|
||||||
--- charts-original/templates/serviceaccount.yaml
|
|
||||||
+++ charts/templates/serviceaccount.yaml
|
|
||||||
@@ -8,7 +8,7 @@
|
|
||||||
app.kubernetes.io/instance: {{ .Release.Name | quote }}
|
|
||||||
helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
|
|
||||||
{{- if .Values.isClusterService }}
|
|
||||||
- k8s-app: {{ .Chart.Name | quote }}
|
|
||||||
+ k8s-app: {{ .Values.k8sApp | default .Chart.Name | quote }}
|
|
||||||
kubernetes.io/cluster-service: "true"
|
|
||||||
kubernetes.io/name: "CoreDNS"
|
|
||||||
{{- end }}
|
|
|
@ -1,20 +0,0 @@
|
||||||
--- charts-original/templates/servicemonitor.yaml
|
|
||||||
+++ charts/templates/servicemonitor.yaml
|
|
||||||
@@ -11,7 +11,7 @@
|
|
||||||
app.kubernetes.io/instance: {{ .Release.Name | quote }}
|
|
||||||
helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
|
|
||||||
{{- if .Values.isClusterService }}
|
|
||||||
- k8s-app: {{ .Chart.Name | quote }}
|
|
||||||
+ k8s-app: {{ .Values.k8sApp | default .Chart.Name | quote }}
|
|
||||||
kubernetes.io/cluster-service: "true"
|
|
||||||
kubernetes.io/name: "CoreDNS"
|
|
||||||
{{- end }}
|
|
||||||
@@ -28,7 +28,7 @@
|
|
||||||
matchLabels:
|
|
||||||
app.kubernetes.io/instance: {{ .Release.Name | quote }}
|
|
||||||
{{- if .Values.isClusterService }}
|
|
||||||
- k8s-app: {{ .Chart.Name | quote }}
|
|
||||||
+ k8s-app: {{ .Values.k8sApp | default .Chart.Name | quote }}
|
|
||||||
{{- end }}
|
|
||||||
app.kubernetes.io/name: {{ template "coredns.name" . }}
|
|
||||||
app.kubernetes.io/component: metrics
|
|
|
@ -1,17 +1,26 @@
|
||||||
--- charts-original/values.yaml
|
--- charts-original/values.yaml
|
||||||
+++ charts/values.yaml
|
+++ charts/values.yaml
|
||||||
@@ -3,8 +3,8 @@
|
@@ -3,9 +3,9 @@
|
||||||
# Declare variables to be passed into your templates.
|
# Declare variables to be passed into your templates.
|
||||||
|
|
||||||
image:
|
image:
|
||||||
- repository: coredns/coredns
|
- repository: coredns/coredns
|
||||||
- tag: "1.9.3"
|
|
||||||
+ repository: rancher/hardened-coredns
|
+ repository: rancher/hardened-coredns
|
||||||
|
# Overrides the image tag whose default is the chart appVersion.
|
||||||
|
- tag: ""
|
||||||
+ tag: "v1.10.1-build20230406"
|
+ tag: "v1.10.1-build20230406"
|
||||||
pullPolicy: IfNotPresent
|
pullPolicy: IfNotPresent
|
||||||
## Optionally specify an array of imagePullSecrets.
|
## Optionally specify an array of imagePullSecrets.
|
||||||
## Secrets must be manually created in the namespace.
|
## Secrets must be manually created in the namespace.
|
||||||
@@ -76,10 +76,10 @@
|
@@ -54,7 +54,6 @@
|
||||||
|
|
||||||
|
service:
|
||||||
|
# clusterIP: ""
|
||||||
|
-# clusterIPs: []
|
||||||
|
# loadBalancerIP: ""
|
||||||
|
# externalIPs: []
|
||||||
|
# externalTrafficPolicy: ""
|
||||||
|
@@ -65,10 +64,10 @@
|
||||||
annotations: {}
|
annotations: {}
|
||||||
|
|
||||||
serviceAccount:
|
serviceAccount:
|
||||||
|
@ -24,16 +33,16 @@
|
||||||
annotations: {}
|
annotations: {}
|
||||||
|
|
||||||
rbac:
|
rbac:
|
||||||
@@ -95,7 +95,7 @@
|
@@ -84,7 +83,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.
|
||||||
-priorityClassName: ""
|
-priorityClassName: ""
|
||||||
+priorityClassName: "system-cluster-critical"
|
+priorityClassName: "system-cluster-critical"
|
||||||
|
|
||||||
# Default zone is what Kubernetes recommends:
|
# Configure the pod level securityContext.
|
||||||
# https://kubernetes.io/docs/tasks/administer-cluster/dns-custom-nameservers/#coredns-configmap-options
|
podSecurityContext: {}
|
||||||
@@ -172,21 +172,21 @@
|
@@ -172,17 +171,16 @@
|
||||||
successThreshold: 1
|
successThreshold: 1
|
||||||
|
|
||||||
# expects input structure as per specification https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.11/#affinity-v1-core
|
# expects input structure as per specification https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.11/#affinity-v1-core
|
||||||
|
@ -59,6 +68,10 @@
|
||||||
+ values:
|
+ values:
|
||||||
+ - kube-dns
|
+ - kube-dns
|
||||||
|
|
||||||
|
# expects input structure as per specification https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.21/#topologyspreadconstraint-v1-core
|
||||||
|
# for example:
|
||||||
|
@@ -197,16 +195,17 @@
|
||||||
|
|
||||||
# Node labels for pod assignment
|
# Node labels for pod assignment
|
||||||
# Ref: https://kubernetes.io/docs/user-guide/node-selection/
|
# Ref: https://kubernetes.io/docs/user-guide/node-selection/
|
||||||
-nodeSelector: {}
|
-nodeSelector: {}
|
||||||
|
@ -66,11 +79,12 @@
|
||||||
+ kubernetes.io/os: linux
|
+ kubernetes.io/os: linux
|
||||||
|
|
||||||
# expects input structure as per specification https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.11/#toleration-v1-core
|
# expects input structure as per specification https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.11/#toleration-v1-core
|
||||||
# for example:
|
-# for example:
|
||||||
@@ -195,7 +195,13 @@
|
-# tolerations:
|
||||||
# operator: Equal
|
-# - key: foo.bar.com/role
|
||||||
# value: master
|
-# operator: Equal
|
||||||
# effect: NoSchedule
|
-# value: master
|
||||||
|
-# effect: NoSchedule
|
||||||
-tolerations: []
|
-tolerations: []
|
||||||
+tolerations:
|
+tolerations:
|
||||||
+- key: "node-role.kubernetes.io/control-plane"
|
+- key: "node-role.kubernetes.io/control-plane"
|
||||||
|
@ -82,7 +96,7 @@
|
||||||
|
|
||||||
# https://kubernetes.io/docs/tasks/run-application/configure-pdb/#specifying-a-poddisruptionbudget
|
# https://kubernetes.io/docs/tasks/run-application/configure-pdb/#specifying-a-poddisruptionbudget
|
||||||
podDisruptionBudget: {}
|
podDisruptionBudget: {}
|
||||||
@@ -246,7 +252,7 @@
|
@@ -281,7 +280,7 @@
|
||||||
# See https://github.com/kubernetes-incubator/cluster-proportional-autoscaler
|
# See https://github.com/kubernetes-incubator/cluster-proportional-autoscaler
|
||||||
autoscaler:
|
autoscaler:
|
||||||
# Enabled the cluster-proportional-autoscaler
|
# Enabled the cluster-proportional-autoscaler
|
||||||
|
@ -91,18 +105,18 @@
|
||||||
|
|
||||||
# Number of cores in the cluster per coredns replica
|
# Number of cores in the cluster per coredns replica
|
||||||
coresPerReplica: 256
|
coresPerReplica: 256
|
||||||
@@ -267,8 +273,8 @@
|
@@ -302,8 +301,8 @@
|
||||||
# - --nodelabels=topology.kubernetes.io/zone=us-east-1a
|
# - --nodelabels=topology.kubernetes.io/zone=us-east-1a
|
||||||
|
|
||||||
image:
|
image:
|
||||||
- repository: k8s.gcr.io/cpa/cluster-proportional-autoscaler
|
- repository: registry.k8s.io/cpa/cluster-proportional-autoscaler
|
||||||
- tag: "1.8.5"
|
- tag: "1.8.5"
|
||||||
+ repository: rancher/hardened-cluster-autoscaler
|
+ repository: rancher/hardened-cluster-autoscaler
|
||||||
+ tag: "v1.8.6-build20230406"
|
+ tag: "v1.8.6-build20230406"
|
||||||
pullPolicy: IfNotPresent
|
pullPolicy: IfNotPresent
|
||||||
## Optionally specify an array of imagePullSecrets.
|
## Optionally specify an array of imagePullSecrets.
|
||||||
## Secrets must be manually created in the namespace.
|
## Secrets must be manually created in the namespace.
|
||||||
@@ -285,19 +291,26 @@
|
@@ -321,19 +320,26 @@
|
||||||
|
|
||||||
# Node labels for pod assignment
|
# Node labels for pod assignment
|
||||||
# Ref: https://kubernetes.io/docs/user-guide/node-selection/
|
# Ref: https://kubernetes.io/docs/user-guide/node-selection/
|
||||||
|
@ -135,7 +149,7 @@
|
||||||
|
|
||||||
# Options for autoscaler configmap
|
# Options for autoscaler configmap
|
||||||
configmap:
|
configmap:
|
||||||
@@ -309,8 +322,8 @@
|
@@ -345,8 +351,8 @@
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
enabled: true
|
enabled: true
|
||||||
initialDelaySeconds: 10
|
initialDelaySeconds: 10
|
||||||
|
@ -146,7 +160,7 @@
|
||||||
failureThreshold: 3
|
failureThreshold: 3
|
||||||
successThreshold: 1
|
successThreshold: 1
|
||||||
|
|
||||||
@@ -319,3 +332,21 @@
|
@@ -355,3 +361,21 @@
|
||||||
name: ""
|
name: ""
|
||||||
## Annotations for the coredns deployment
|
## Annotations for the coredns deployment
|
||||||
annotations: {}
|
annotations: {}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
url: https://github.com/coredns/helm/releases/download/coredns-1.19.4/coredns-1.19.4.tgz
|
url: https://github.com/coredns/helm/releases/download/coredns-1.24.0/coredns-1.24.0.tgz
|
||||||
packageVersion: 02
|
packageVersion: 00
|
||||||
# This repository does not use releaseCandidateVersions, so you can leave this as 00.
|
# This repository does not use releaseCandidateVersions, so you can leave this as 00.
|
||||||
releaseCandidateVersion: 00
|
releaseCandidateVersion: 00
|
||||||
|
|
Loading…
Reference in New Issue