diff --git a/assets/index.yaml b/assets/index.yaml index ba55965..0e3b4f6 100644 --- a/assets/index.yaml +++ b/assets/index.yaml @@ -39,10 +39,10 @@ entries: version: 1.13.800 - apiVersion: v1 appVersion: 1.6.9 - created: "2021-01-09T00:58:33.508229127Z" + created: "2021-01-13T00:41:56.07674445Z" description: CoreDNS is a DNS server that chains plugins and provides Kubernetes DNS Services - digest: 702e7bb14f3a32108166c58e060fb76098a3f44cf92807bd7a9c49ce3fcedd9d + digest: c5663262f8382f88cfa65cec1064ecceeef564ce38910004505a9612ec4c4f00 home: https://coredns.io icon: https://coredns.io/images/CoreDNS_Colour_Horizontal.png keywords: @@ -220,4 +220,4 @@ entries: urls: - assets/rke2-metrics-server/rke2-metrics-server-2.11.100.tgz version: 2.11.100 -generated: "2021-01-09T00:58:33.506836225Z" +generated: "2021-01-13T00:41:56.075564647Z" diff --git a/assets/rke2-coredns/rke2-coredns-1.10.101.tgz b/assets/rke2-coredns/rke2-coredns-1.10.101.tgz index 2def334..a2f8c47 100644 Binary files a/assets/rke2-coredns/rke2-coredns-1.10.101.tgz and b/assets/rke2-coredns/rke2-coredns-1.10.101.tgz differ diff --git a/charts/rke2-coredns/templates/deployment.yaml b/charts/rke2-coredns/templates/deployment.yaml index 6bc8e69..0ed3c52 100755 --- a/charts/rke2-coredns/templates/deployment.yaml +++ b/charts/rke2-coredns/templates/deployment.yaml @@ -46,7 +46,6 @@ spec: 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 }} spec: serviceAccountName: {{ template "coredns.serviceAccountName" . }} @@ -60,9 +59,15 @@ spec: affinity: {{ toYaml .Values.affinity | indent 8 }} {{- end }} - {{- if .Values.tolerations }} + {{- if or (.Values.isClusterService) (.Values.tolerations) }} tolerations: + {{- if .Values.isClusterService }} + - key: CriticalAddonsOnly + operator: Exists + {{- end }} + {{- if .Values.tolerations }} {{ toYaml .Values.tolerations | indent 8 }} + {{- end }} {{- end }} {{- if .Values.nodeSelector }} nodeSelector: diff --git a/index.yaml b/index.yaml index ba55965..0e3b4f6 100644 --- a/index.yaml +++ b/index.yaml @@ -39,10 +39,10 @@ entries: version: 1.13.800 - apiVersion: v1 appVersion: 1.6.9 - created: "2021-01-09T00:58:33.508229127Z" + created: "2021-01-13T00:41:56.07674445Z" description: CoreDNS is a DNS server that chains plugins and provides Kubernetes DNS Services - digest: 702e7bb14f3a32108166c58e060fb76098a3f44cf92807bd7a9c49ce3fcedd9d + digest: c5663262f8382f88cfa65cec1064ecceeef564ce38910004505a9612ec4c4f00 home: https://coredns.io icon: https://coredns.io/images/CoreDNS_Colour_Horizontal.png keywords: @@ -220,4 +220,4 @@ entries: urls: - assets/rke2-metrics-server/rke2-metrics-server-2.11.100.tgz version: 2.11.100 -generated: "2021-01-09T00:58:33.506836225Z" +generated: "2021-01-13T00:41:56.075564647Z" diff --git a/sha256sum/rke2-coredns/rke2-coredns.sum b/sha256sum/rke2-coredns/rke2-coredns.sum index 0a1d6bc..abefaeb 100644 --- a/sha256sum/rke2-coredns/rke2-coredns.sum +++ b/sha256sum/rke2-coredns/rke2-coredns.sum @@ -1,2 +1,2 @@ 771f526366bc9f1758d13e7807a51512fc03ad6d4ed48c162218a776292c11da packages/rke2-coredns/package.yaml -845f90ab4e5fdb14f5a5be3e16790fd6690f3f00788349f00fe15ab6d3bf1e95 packages/rke2-coredns/rke2-coredns.patch +55fe7387696ce013e5af6c39739c54e316ef4caf262f6df6e4a8ccc5d3647eaf packages/rke2-coredns/rke2-coredns.patch