andata
/
rke2-charts
mirror of https://git.rancher.io/rke2-charts
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
Brad Davidson 2023-06-08 20:53:34 +00:00 committed by Brad Davidson
parent 809cfb93f5
commit d18c146e9e
19 changed files with 63 additions and 266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/rke2-coredns/generated-changes/patch/Chart.yaml.patch
View File

@ -1,9 +1,9 @@
--- charts-original/Chart.yaml
+++ charts/Chart.yaml
@@ -14,7 +14,7 @@
maintainers:
@@ -16,7 +16,7 @@
- name: mrueg
- name: haad
- name: HagaiBarel
-name: coredns
+name: rke2-coredns
sources:

13
packages/rke2-coredns/generated-changes/patch/templates/_helpers.tpl.patch
View File

@ -1,14 +1,15 @@
--- charts-original/templates/_helpers.tpl
+++ charts/templates/_helpers.tpl
@@ -150,6 +150,7 @@
{{- end -}}
@@ -24,7 +24,7 @@
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 -}}
+
{{/*
Create the name of the service account to use
*/}}
@@ -160,3 +161,44 @@
@@ -191,3 +191,44 @@
{{ default "default" .Values.serviceAccount.name }}
{{- end -}}
{{- end -}}

11
packages/rke2-coredns/generated-changes/patch/templates/clusterrole-autoscaler.yaml.patch
View File

@ -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 }}

11
packages/rke2-coredns/generated-changes/patch/templates/clusterrole.yaml.patch
View File

@ -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 }}

11
packages/rke2-coredns/generated-changes/patch/templates/clusterrolebinding-autoscaler.yaml.patch
View File

@ -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 }}

11
packages/rke2-coredns/generated-changes/patch/templates/clusterrolebinding.yaml.patch
View File

@ -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 }}

11
packages/rke2-coredns/generated-changes/patch/templates/configmap-autoscaler.yaml.patch
View File

@ -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 }}

9
packages/rke2-coredns/generated-changes/patch/templates/configmap.yaml.patch
View File

@ -1,14 +1,5 @@
--- charts-original/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 @@
{{- if .port }}:{{ .port }} {{ end -}}
{

28
packages/rke2-coredns/generated-changes/patch/templates/deployment-autoscaler.yaml.patch
View File

@ -1,32 +1,6 @@
--- charts-original/templates/deployment-autoscaler.yaml
+++ charts/templates/deployment-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 }}
@@ -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 @@
@@ -74,7 +74,7 @@
{{- end }}
containers:
- name: autoscaler

48
packages/rke2-coredns/generated-changes/patch/templates/deployment.yaml.patch
View File

@ -1,42 +1,18 @@
--- charts-original/templates/deployment.yaml
+++ charts/templates/deployment.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"
@@ -56,9 +56,6 @@
{{- end }}
@@ -40,14 +40,14 @@
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 @@
annotations:
checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
{{- if .Values.isClusterService }}
scheduler.alpha.kubernetes.io/critical-pod: ''
- {{- if .Values.isClusterService }}
- scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
{{- end }}
- {{- end }}
{{- if .Values.podAnnotations }}
{{ toYaml .Values.podAnnotations | indent 8 }}
@@ -78,9 +77,15 @@
affinity:
{{ toYaml .Values.affinity | indent 8 }}
{{- end }}
@@ -84,8 +81,13 @@
topologySpreadConstraints:
{{ toYaml .Values.topologySpreadConstraints | indent 8 }}
{{- end }}
- {{- if .Values.tolerations }}
+ {{- if or (.Values.isClusterService) (.Values.tolerations) }}
@ -47,16 +23,14 @@
+ {{- end }}
+ {{- if .Values.tolerations }}
{{ toYaml .Values.tolerations | indent 8 }}
+ {{- end }}
{{- end }}
{{- if .Values.nodeSelector }}
nodeSelector:
@@ -88,7 +93,7 @@
@@ -98,7 +100,7 @@
{{- end }}
containers:
- name: "coredns"
- image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+ image: {{ template "system_default_registry" . }}{{ .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 | default .Chart.AppVersion }}
imagePullPolicy: {{ .Values.image.pullPolicy }}
args: [ "-conf", "/etc/coredns/Corefile" ]
volumeMounts:

20
packages/rke2-coredns/generated-changes/patch/templates/poddisruptionbudget.yaml.patch
View File

@ -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 }}

11
packages/rke2-coredns/generated-changes/patch/templates/podsecuritypolicy.yaml.patch
View File

@ -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 }}

20
packages/rke2-coredns/generated-changes/patch/templates/service-metrics.yaml.patch
View File

@ -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:

23
packages/rke2-coredns/generated-changes/patch/templates/service.yaml.patch
View File

@ -1,26 +1,17 @@
--- charts-original/templates/service.yaml
+++ charts/templates/service.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 }}
@@ -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 }}
@@ -33,13 +33,7 @@
k8s-app: {{ template "coredns.k8sapplabel" . }}
{{- end }}
app.kubernetes.io/name: {{ template "coredns.name" . }}
- {{- if .Values.service.clusterIP }}
- clusterIP: {{ .Values.service.clusterIP }}
- {{- end }}
- {{- if .Values.service.clusterIPs }}
- clusterIPs:
- {{ toYaml .Values.service.clusterIPs | nindent 4 }}
- {{- end }}
+ clusterIP: {{ template "clusterDNSServerIP" . }}
{{- if .Values.service.externalIPs }}
externalIPs:
{{ toYaml .Values.service.externalIPs | indent 4 }}
{{- toYaml .Values.service.externalIPs | nindent 4 }}

11
packages/rke2-coredns/generated-changes/patch/templates/serviceaccount-autoscaler.yaml.patch
View File

@ -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 }}

11
packages/rke2-coredns/generated-changes/patch/templates/serviceaccount.yaml.patch
View File

@ -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 }}

20
packages/rke2-coredns/generated-changes/patch/templates/servicemonitor.yaml.patch
View File

@ -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

50
packages/rke2-coredns/generated-changes/patch/values.yaml.patch
View File

@ -1,17 +1,26 @@
--- charts-original/values.yaml
+++ charts/values.yaml
@@ -3,8 +3,8 @@
@@ -3,9 +3,9 @@
# Declare variables to be passed into your templates.
image:
- repository: coredns/coredns
- tag: "1.9.3"
+ repository: rancher/hardened-coredns
# Overrides the image tag whose default is the chart appVersion.
- tag: ""
+ tag: "v1.10.1-build20230406"
pullPolicy: IfNotPresent
## Optionally specify an array of imagePullSecrets.
## 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: {}
serviceAccount:
@ -24,16 +33,16 @@
annotations: {}
rbac:
@@ -95,7 +95,7 @@
@@ -84,7 +83,7 @@
isClusterService: true
# Optional priority class to be used for the coredns pods. Used for autoscaler if autoscaler.priorityClassName not set.
-priorityClassName: ""
+priorityClassName: "system-cluster-critical"
# Default zone is what Kubernetes recommends:
# https://kubernetes.io/docs/tasks/administer-cluster/dns-custom-nameservers/#coredns-configmap-options
@@ -172,21 +172,21 @@
# Configure the pod level securityContext.
podSecurityContext: {}
@@ -172,17 +171,16 @@
successThreshold: 1
# expects input structure as per specification https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.11/#affinity-v1-core
@ -59,6 +68,10 @@
+ values:
+ - 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
# Ref: https://kubernetes.io/docs/user-guide/node-selection/
-nodeSelector: {}
@ -66,11 +79,12 @@
+ kubernetes.io/os: linux
# expects input structure as per specification https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.11/#toleration-v1-core
# for example:
@@ -195,7 +195,13 @@
# operator: Equal
# value: master
# effect: NoSchedule
-# for example:
-# tolerations:
-# - key: foo.bar.com/role
-# operator: Equal
-# value: master
-# effect: NoSchedule
-tolerations: []
+tolerations:
+- key: "node-role.kubernetes.io/control-plane"
@ -82,7 +96,7 @@
# https://kubernetes.io/docs/tasks/run-application/configure-pdb/#specifying-a-poddisruptionbudget
podDisruptionBudget: {}
@@ -246,7 +252,7 @@
@@ -281,7 +280,7 @@
# See https://github.com/kubernetes-incubator/cluster-proportional-autoscaler
autoscaler:
# Enabled the cluster-proportional-autoscaler
@ -91,18 +105,18 @@
# Number of cores in the cluster per coredns replica
coresPerReplica: 256
@@ -267,8 +273,8 @@
@@ -302,8 +301,8 @@
# - --nodelabels=topology.kubernetes.io/zone=us-east-1a
image:
- repository: k8s.gcr.io/cpa/cluster-proportional-autoscaler
- repository: registry.k8s.io/cpa/cluster-proportional-autoscaler
- tag: "1.8.5"
+ repository: rancher/hardened-cluster-autoscaler
+ tag: "v1.8.6-build20230406"
pullPolicy: IfNotPresent
## Optionally specify an array of imagePullSecrets.
## Secrets must be manually created in the namespace.
@@ -285,19 +291,26 @@
@@ -321,19 +320,26 @@
# Node labels for pod assignment
# Ref: https://kubernetes.io/docs/user-guide/node-selection/
@ -135,7 +149,7 @@
# Options for autoscaler configmap
configmap:
@@ -309,8 +322,8 @@
@@ -345,8 +351,8 @@
livenessProbe:
enabled: true
initialDelaySeconds: 10
@ -146,7 +160,7 @@
failureThreshold: 3
successThreshold: 1
@@ -319,3 +332,21 @@
@@ -355,3 +361,21 @@
name: ""
## Annotations for the coredns deployment
annotations: {}

4
packages/rke2-coredns/package.yaml
View File

@ -1,4 +1,4 @@
url: https://github.com/coredns/helm/releases/download/coredns-1.19.4/coredns-1.19.4.tgz
packageVersion: 02
url: https://github.com/coredns/helm/releases/download/coredns-1.24.0/coredns-1.24.0.tgz
packageVersion: 00
# This repository does not use releaseCandidateVersions, so you can leave this as 00.
releaseCandidateVersion: 00