Skip to content

Commit

Permalink
Bump coredns image and chart version
Browse files Browse the repository at this point in the history
Signed-off-by: manuelbuil <mbuil@suse.com>
  • Loading branch information
manuelbuil committed Sep 27, 2024
1 parent d2373e9 commit 6b4687d
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 46 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- charts-original/Chart.yaml
+++ charts/Chart.yaml
@@ -19,7 +19,7 @@
@@ -17,7 +17,7 @@
- name: haad
- name: hagaibarel
- name: shubham-cmyk
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,13 @@
{{- end -}}

{{/*
@@ -224,3 +220,72 @@
{{ default "default" .Values.serviceAccount.name }}
{{- end -}}
@@ -234,4 +230,72 @@
{{- else -}}
{{ template "coredns.fullname" . }}
{{- end -}}
-{{- end -}}
\ No newline at end of file
+{{- end -}}
+
+{{- define "system_default_registry" -}}
+{{- if .Values.global.systemDefaultRegistry -}}
Expand Down Expand Up @@ -94,5 +97,4 @@
+ {{- "SingleStack" }}
+ {{- end }}
+{{- end }}
+{{- end }}
+
+{{- end }}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- charts-original/templates/configmap.yaml
+++ charts/templates/configmap.yaml
@@ -23,7 +23,7 @@
@@ -24,7 +24,7 @@
{{- if .port }}:{{ .port }} {{ end -}}
{
{{- range .plugins }}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- charts-original/templates/deployment.yaml
+++ charts/templates/deployment.yaml
@@ -48,9 +48,6 @@
@@ -52,9 +52,6 @@
{{- end }}
annotations:
checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
Expand All @@ -10,7 +10,7 @@
{{- if .Values.podAnnotations }}
{{ toYaml .Values.podAnnotations | indent 8 }}
{{- end }}
@@ -76,9 +73,15 @@
@@ -80,9 +77,15 @@
topologySpreadConstraints:
{{ tpl (toYaml .Values.topologySpreadConstraints) $ | indent 8 }}
{{- end }}
Expand All @@ -27,7 +27,7 @@
{{- end }}
{{- if .Values.nodeSelector }}
nodeSelector:
@@ -90,7 +93,7 @@
@@ -94,7 +97,7 @@
{{- end }}
containers:
- name: "coredns"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
---
apiVersion: v1
kind: Service
@@ -25,12 +27,12 @@
k8s-app: {{ template "coredns.k8sapplabel" . }}
@@ -29,12 +31,12 @@
{{- end }}
app.kubernetes.io/name: {{ template "coredns.name" . }}
{{- end }}
- {{- if .Values.service.clusterIP }}
- clusterIP: {{ .Values.service.clusterIP }}
- {{- end }}
Expand All @@ -25,7 +25,7 @@
{{- end }}
{{- if .Values.service.externalIPs }}
externalIPs:
@@ -45,7 +47,5 @@
@@ -52,7 +54,5 @@
ports:
{{ include "coredns.servicePorts" . | indent 2 -}}
type: {{ default "ClusterIP" .Values.serviceType }}
Expand Down
53 changes: 22 additions & 31 deletions packages/rke2-coredns/generated-changes/patch/values.yaml.patch
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,22 @@
pullPolicy: IfNotPresent
## Optionally specify an array of imagePullSecrets.
## Secrets must be manually created in the namespace.
@@ -50,21 +50,20 @@
@@ -52,12 +52,11 @@

service:
# clusterIP: ""
-# clusterIPs: []
# loadBalancerIP: ""
# loadBalancerClass: ""
# externalIPs: []
# externalTrafficPolicy: ""
-# ipFamilyPolicy: ""
+ ipFamilyPolicy: ""
# The name of the Service
# If not set, a name is generated using the fullname template
name: ""
annotations: {}
@@ -66,10 +65,10 @@
selector: {}

serviceAccount:
- create: false
Expand All @@ -37,7 +39,7 @@
annotations: {}

rbac:
@@ -80,7 +79,7 @@
@@ -85,7 +84,7 @@
isClusterService: true

# Optional priority class to be used for the coredns pods. Used for autoscaler if autoscaler.priorityClassName not set.
Expand All @@ -46,20 +48,10 @@

# Configure the pod level securityContext.
podSecurityContext: {}
@@ -168,17 +167,16 @@
successThreshold: 1

# expects input structure as per specification https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.11/#affinity-v1-core
-# for example:
-# affinity:
-# nodeAffinity:
-# requiredDuringSchedulingIgnoredDuringExecution:
-# nodeSelectorTerms:
-# - matchExpressions:
-# - key: foo.bar.com/role
-# operator: In
-# values:
-# - master
@@ -183,7 +182,16 @@
# operator: In
# values:
# - master
-affinity: {}
+affinity:
+ podAntiAffinity:
Expand All @@ -74,7 +66,7 @@

# expects input structure as per specification https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.21/#topologyspreadconstraint-v1-core
# and supports Helm templating.
@@ -202,16 +200,17 @@
@@ -207,7 +215,8 @@

# Node labels for pod assignment
# Ref: https://kubernetes.io/docs/user-guide/node-selection/
Expand All @@ -83,12 +75,11 @@
+ 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:
-# tolerations:
-# - key: foo.bar.com/role
-# operator: Equal
-# value: master
-# effect: NoSchedule
# for example:
@@ -216,7 +225,13 @@
# operator: Equal
# value: master
# effect: NoSchedule
-tolerations: []
+tolerations:
+- key: "node-role.kubernetes.io/control-plane"
Expand All @@ -100,7 +91,7 @@

# https://kubernetes.io/docs/tasks/run-application/configure-pdb/#specifying-a-poddisruptionbudget
podDisruptionBudget: {}
@@ -293,7 +292,7 @@
@@ -298,7 +313,7 @@
# See https://github.com/kubernetes-incubator/cluster-proportional-autoscaler
autoscaler:
# Enabled the cluster-proportional-autoscaler
Expand All @@ -109,7 +100,7 @@

# Number of cores in the cluster per coredns replica
coresPerReplica: 256
@@ -317,8 +316,8 @@
@@ -322,8 +337,8 @@
# - --nodelabels=topology.kubernetes.io/zone=us-east-1a

image:
Expand All @@ -120,7 +111,7 @@
pullPolicy: IfNotPresent
## Optionally specify an array of imagePullSecrets.
## Secrets must be manually created in the namespace.
@@ -336,19 +335,26 @@
@@ -341,19 +356,26 @@

# Node labels for pod assignment
# Ref: https://kubernetes.io/docs/user-guide/node-selection/
Expand Down Expand Up @@ -153,7 +144,7 @@

# Options for autoscaler configmap
configmap:
@@ -360,8 +366,8 @@
@@ -365,8 +387,8 @@
livenessProbe:
enabled: true
initialDelaySeconds: 10
Expand All @@ -164,10 +155,10 @@
failureThreshold: 3
successThreshold: 1

@@ -376,3 +382,23 @@
name: ""
## Annotations for the coredns deployment
@@ -384,3 +406,25 @@
annotations: {}
## Pod selector
selector: {}
+
+k8sApp: "kube-dns"
+
Expand Down
4 changes: 2 additions & 2 deletions packages/rke2-coredns/package.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
url: https://github.com/coredns/helm/releases/download/coredns-1.29.0/coredns-1.29.0.tgz
packageVersion: 07
url: https://github.com/coredns/helm/releases/download/coredns-1.33.0/coredns-1.33.0.tgz
packageVersion: 00

0 comments on commit 6b4687d

Please sign in to comment.