diff --git a/assets/index.yaml b/assets/index.yaml index 0a0c6fe..ba55965 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: "2020-12-07T21:17:34.243794775Z" + created: "2021-01-09T00:58:33.508229127Z" description: CoreDNS is a DNS server that chains plugins and provides Kubernetes DNS Services - digest: 864e87e1e91aacb0a4dba99b9827d4579344fcb6004ef8946c42933d3c0b6a9c + digest: 702e7bb14f3a32108166c58e060fb76098a3f44cf92807bd7a9c49ce3fcedd9d 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-08T18:12:00.295038561Z" +generated: "2021-01-09T00:58:33.506836225Z" diff --git a/assets/rke2-coredns/rke2-coredns-1.10.101.tgz b/assets/rke2-coredns/rke2-coredns-1.10.101.tgz index 93d5731..2def334 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/Chart.yaml b/charts/rke2-coredns/Chart.yaml index ea1b23c..fea533e 100755 --- a/charts/rke2-coredns/Chart.yaml +++ b/charts/rke2-coredns/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -appVersion: 1.7.1 +appVersion: 1.6.9 description: CoreDNS is a DNS server that chains plugins and provides Kubernetes DNS Services home: https://coredns.io @@ -8,7 +8,16 @@ keywords: - coredns - dns - kubedns +maintainers: +- email: hello@acale.ph + name: Acaleph +- email: shashidhara.huawei@gmail.com + name: shashidharatd +- email: andor44@gmail.com + name: andor44 +- email: manuel@rueg.eu + name: mrueg name: rke2-coredns sources: - https://github.com/coredns/coredns -version: 1.13.800 +version: 1.10.101 diff --git a/charts/rke2-coredns/README.md b/charts/rke2-coredns/README.md index 9d9ad64..0d41d40 100755 --- a/charts/rke2-coredns/README.md +++ b/charts/rke2-coredns/README.md @@ -1,16 +1,7 @@ -# ⚠️ Repo Archive Notice - -As of Nov 13, 2020, charts in this repo will no longer be updated. -For more information, see the Helm Charts [Deprecation and Archive Notice](https://github.com/helm/charts#%EF%B8%8F-deprecation-and-archive-notice), and [Update](https://helm.sh/blog/charts-repo-deprecation/). - # CoreDNS [CoreDNS](https://coredns.io/) is a DNS server that chains plugins and provides DNS Services -## DEPRECATION NOTICE - -This chart is deprecated and no longer supported. - # TL;DR; ```console @@ -56,7 +47,7 @@ The command removes all the Kubernetes components associated with the chart and | Parameter | Description | Default | |:----------------------------------------|:--------------------------------------------------------------------------------------|:------------------------------------------------------------| | `image.repository` | The image repository to pull from | coredns/coredns | -| `image.tag` | The image tag to pull from | `v1.7.1` | +| `image.tag` | The image tag to pull from | `v1.6.9` | | `image.pullPolicy` | Image pull policy | IfNotPresent | | `replicaCount` | Number of replicas | 1 | | `resources.limits.cpu` | Container maximum CPU | `100m` | @@ -64,16 +55,13 @@ The command removes all the Kubernetes components associated with the chart and | `resources.requests.cpu` | Container requested CPU | `100m` | | `resources.requests.memory` | Container requested memory | `128Mi` | | `serviceType` | Kubernetes Service type | `ClusterIP` | -| `prometheus.service.enabled` | Set this to `true` to create Service for Prometheus metrics | `false` | -| `prometheus.service.annotations` | Annotations to add to the metrics Service | `{prometheus.io/scrape: "true", prometheus.io/port: "9153"}`| | `prometheus.monitor.enabled` | Set this to `true` to create ServiceMonitor for Prometheus operator | `false` | | `prometheus.monitor.additionalLabels` | Additional labels that can be used so ServiceMonitor will be discovered by Prometheus | {} | | `prometheus.monitor.namespace` | Selector to select which namespaces the Endpoints objects are discovered from. | `""` | | `service.clusterIP` | IP address to assign to service | `""` | | `service.loadBalancerIP` | IP address to assign to load balancer (if supported) | `""` | -| `service.externalIPs` | External IP addresses | [] | -| `service.externalTrafficPolicy` | Enable client source IP preservation | [] | -| `service.annotations` | Annotations to add to service | {} | +| `service.externalTrafficPolicy` | Enable client source IP preservation | `[]` | +| `service.annotations` | Annotations to add to service | `{prometheus.io/scrape: "true", prometheus.io/port: "9153"}`| | `serviceAccount.create` | If true, create & use serviceAccount | false | | `serviceAccount.name` | If not set & create is true, use template fullname | | | `rbac.create` | If true, create & use RBAC resources | true | @@ -85,27 +73,12 @@ The command removes all the Kubernetes components associated with the chart and | `nodeSelector` | Node labels for pod assignment | {} | | `tolerations` | Tolerations for pod assignment | [] | | `zoneFiles` | Configure custom Zone files | [] | -| `extraVolumes` | Optional array of volumes to create | [] | -| `extraVolumeMounts` | Optional array of volumes to mount inside the CoreDNS container | [] | | `extraSecrets` | Optional array of secrets to mount inside the CoreDNS container | [] | | `customLabels` | Optional labels for Deployment(s), Pod, Service, ServiceMonitor objects | {} | -| `rollingUpdate.maxUnavailable` | Maximum number of unavailable replicas during rolling update | `1` | -| `rollingUpdate.maxSurge` | Maximum number of pods created above desired number of pods | `25%` | | `podDisruptionBudget` | Optional PodDisruptionBudget | {} | -| `podAnnotations` | Optional Pod only Annotations | {} | -| `terminationGracePeriodSeconds` | Optional duration in seconds the pod needs to terminate gracefully. | 30 | -| `preStopSleep` | Definition of Kubernetes preStop hook executed before Pod termination | {} | -| `hpa.enabled` | Enable Hpa autoscaler instead of proportional one | `false` | -| `hpa.minReplicas` | Hpa minimum number of CoreDNS replicas | `1` | -| `hpa.maxReplicas` | Hpa maximum number of CoreDNS replicas | `2` | -| `hpa.metrics` | Metrics definitions used by Hpa to scale up and down | {} | | `autoscaler.enabled` | Optionally enabled a cluster-proportional-autoscaler for CoreDNS | `false` | | `autoscaler.coresPerReplica` | Number of cores in the cluster per CoreDNS replica | `256` | | `autoscaler.nodesPerReplica` | Number of nodes in the cluster per CoreDNS replica | `16` | -| `autoscaler.min` | Min size of replicaCount | 0 | -| `autoscaler.max` | Max size of replicaCount | 0 (aka no max) | -| `autoscaler.includeUnschedulableNodes` | Should the replicas scale based on the total number or only schedulable nodes | `false` | -| `autoscaler.preventSinglePointFailure` | If true does not allow single points of failure to form | `true` | | `autoscaler.image.repository` | The image repository to pull autoscaler from | k8s.gcr.io/cluster-proportional-autoscaler-amd64 | | `autoscaler.image.tag` | The image tag to pull autoscaler from | `1.7.1` | | `autoscaler.image.pullPolicy` | Image pull policy for the autoscaler | IfNotPresent | @@ -163,7 +136,3 @@ This also creates a ServiceAccount, ClusterRole, and ClusterRoleBinding for the autoscaler deployment. `replicaCount` is ignored if this is enabled. - -By setting `hpa.enabled = true` a [Horizontal Pod Autoscaler](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) -is enabled for Coredns deployment. This can scale number of replicas based on meitrics -like CpuUtilization, MemoryUtilization or Custom ones. diff --git a/charts/rke2-coredns/templates/_helpers.tpl b/charts/rke2-coredns/templates/_helpers.tpl index 6b089e7..cfdbef7 100755 --- a/charts/rke2-coredns/templates/_helpers.tpl +++ b/charts/rke2-coredns/templates/_helpers.tpl @@ -46,7 +46,7 @@ Generate the list of ports automatically from the server definitions {{- range .zones -}} {{- if has (default "" .scheme) (list "dns://") -}} {{/* Optionally enable tcp for this service as well */}} - {{- if eq (default false .use_tcp) true }} + {{- if eq .use_tcp true }} {{- $innerdict := set $innerdict "istcp" true -}} {{- end }} {{- $innerdict := set $innerdict "isudp" true -}} @@ -105,7 +105,7 @@ Generate the list of ports automatically from the server definitions {{- range .zones -}} {{- if has (default "" .scheme) (list "dns://") -}} {{/* Optionally enable tcp for this service as well */}} - {{- if eq (default false .use_tcp) true }} + {{- if eq .use_tcp true }} {{- $innerdict := set $innerdict "istcp" true -}} {{- end }} {{- $innerdict := set $innerdict "isudp" true -}} diff --git a/charts/rke2-coredns/templates/configmap-autoscaler.yaml b/charts/rke2-coredns/templates/configmap-autoscaler.yaml index 608a0b7..0712e0d 100755 --- a/charts/rke2-coredns/templates/configmap-autoscaler.yaml +++ b/charts/rke2-coredns/templates/configmap-autoscaler.yaml @@ -29,9 +29,6 @@ data: { "coresPerReplica": {{ .Values.autoscaler.coresPerReplica | float64 }}, "nodesPerReplica": {{ .Values.autoscaler.nodesPerReplica | float64 }}, - "preventSinglePointFailure": {{ .Values.autoscaler.preventSinglePointFailure }}, - "min": {{ .Values.autoscaler.min | int }}, - "max": {{ .Values.autoscaler.max | int }}, - "includeUnschedulableNodes": {{ .Values.autoscaler.includeUnschedulableNodes }} + "preventSinglePointFailure": true } {{- end }} diff --git a/charts/rke2-coredns/templates/deployment-autoscaler.yaml b/charts/rke2-coredns/templates/deployment-autoscaler.yaml index 8461532..6ddd209 100755 --- a/charts/rke2-coredns/templates/deployment-autoscaler.yaml +++ b/charts/rke2-coredns/templates/deployment-autoscaler.yaml @@ -1,4 +1,4 @@ -{{- if and (.Values.autoscaler.enabled) (not .Values.hpa.enabled) }} +{{- if .Values.autoscaler.enabled }} --- apiVersion: apps/v1 kind: Deployment diff --git a/charts/rke2-coredns/templates/deployment.yaml b/charts/rke2-coredns/templates/deployment.yaml index e67dd15..6bc8e69 100755 --- a/charts/rke2-coredns/templates/deployment.yaml +++ b/charts/rke2-coredns/templates/deployment.yaml @@ -22,8 +22,8 @@ spec: strategy: type: RollingUpdate rollingUpdate: - maxUnavailable: {{ .Values.rollingUpdate.maxUnavailable }} - maxSurge: {{ .Values.rollingUpdate.maxSurge }} + maxUnavailable: 1 + maxSurge: 10% selector: matchLabels: app.kubernetes.io/instance: {{ .Release.Name | quote }} @@ -39,22 +39,16 @@ spec: {{- end }} app.kubernetes.io/name: {{ template "coredns.name" . }} app.kubernetes.io/instance: {{ .Release.Name | quote }} - {{- if .Values.customLabels }} - {{ toYaml .Values.customLabels }} - {{- end }} +{{- if .Values.customLabels }} +{{ toYaml .Values.customLabels | indent 8 }} +{{- end }} annotations: 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 }} -{{- if .Values.podAnnotations }} -{{ toYaml .Values.podAnnotations | indent 8 }} -{{- end }} spec: - {{- if .Values.terminationGracePeriodSeconds }} - terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }} - {{- end }} serviceAccountName: {{ template "coredns.serviceAccountName" . }} {{- if .Values.priorityClassName }} priorityClassName: {{ .Values.priorityClassName | quote }} @@ -86,9 +80,6 @@ spec: - name: {{ .name }} mountPath: {{ .mountPath }} readOnly: true -{{- end }} -{{- if .Values.extraVolumeMounts }} -{{- toYaml .Values.extraVolumeMounts | nindent 8}} {{- end }} resources: {{ toYaml .Values.resources | indent 10 }} @@ -112,12 +103,6 @@ spec: timeoutSeconds: 5 successThreshold: 1 failureThreshold: 5 - {{- if .Values.preStopSleep }} - lifecycle: - preStop: - exec: - command: ["/usr/bin/sleep", "{{ .Values.preStopSleep }}"] - {{- end }} volumes: - name: config-volume configMap: @@ -135,6 +120,3 @@ spec: secretName: {{ .name }} defaultMode: 400 {{- end }} -{{- if .Values.extraVolumes }} -{{ toYaml .Values.extraVolumes | indent 8 }} -{{- end }} diff --git a/charts/rke2-coredns/templates/service-metrics.yaml b/charts/rke2-coredns/templates/service-metrics.yaml index 0f99adf..1657cd7 100755 --- a/charts/rke2-coredns/templates/service-metrics.yaml +++ b/charts/rke2-coredns/templates/service-metrics.yaml @@ -1,4 +1,4 @@ -{{- if .Values.prometheus.service.enabled }} +{{- if .Values.prometheus.monitor.enabled }} apiVersion: v1 kind: Service metadata: @@ -18,7 +18,7 @@ metadata: {{ toYaml .Values.customLabels | indent 4 }} {{- end }} annotations: -{{ toYaml .Values.prometheus.service.annotations | indent 4 }} +{{ toYaml .Values.service.annotations | indent 4 }} spec: selector: app.kubernetes.io/instance: {{ .Release.Name | quote }} diff --git a/charts/rke2-coredns/templates/service.yaml b/charts/rke2-coredns/templates/service.yaml index d7124ac..95c858f 100755 --- a/charts/rke2-coredns/templates/service.yaml +++ b/charts/rke2-coredns/templates/service.yaml @@ -29,10 +29,6 @@ spec: {{ else }} clusterIP: {{ (lookup "v1" "ConfigMap" "kube-system" "cluster-dns").data.clusterDNS }} {{- end }} - {{- if .Values.service.externalIPs }} - externalIPs: - {{ toYaml .Values.service.externalIPs | indent 4 }} - {{- end }} {{- if .Values.service.externalTrafficPolicy }} externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }} {{- end }} diff --git a/charts/rke2-coredns/values.yaml b/charts/rke2-coredns/values.yaml index 49a1e8b..828589e 100755 --- a/charts/rke2-coredns/values.yaml +++ b/charts/rke2-coredns/values.yaml @@ -4,7 +4,7 @@ image: repository: rancher/hardened-coredns - tag: "v1.7.1" + tag: "v1.6.9" pullPolicy: IfNotPresent replicaCount: 1 @@ -17,42 +17,9 @@ resources: cpu: 100m memory: 128Mi -## Create HorizontalPodAutoscaler object. -## -# autoscaling: -# minReplicas: 1 -# maxReplicas: 10 -# metrics: -# - type: Resource -# resource: -# name: cpu -# targetAverageUtilization: 60 -# - type: Resource -# resource: -# name: memory -# targetAverageUtilization: 60 - -rollingUpdate: - maxUnavailable: 1 - maxSurge: 25% - -# Under heavy load it takes more that standard time to remove Pod endpoint from a cluster. -# This will delay termination of our pod by `preStopSleep`. To make sure kube-proxy has -# enough time to catch up. -# preStopSleep: 5 -terminationGracePeriodSeconds: 30 - -podAnnotations: {} -# cluster-autoscaler.kubernetes.io/safe-to-evict: "false" - serviceType: "ClusterIP" prometheus: - service: - enabled: false - annotations: - prometheus.io/scrape: "true" - prometheus.io/port: "9153" monitor: enabled: false additionalLabels: {} @@ -61,9 +28,10 @@ prometheus: service: # clusterIP: "" # loadBalancerIP: "" -# externalIPs: [] # externalTrafficPolicy: "" - annotations: {} + annotations: + prometheus.io/scrape: "true" + prometheus.io/port: "9153" serviceAccount: create: true @@ -174,15 +142,6 @@ zoneFiles: [] # example.com. IN A 192.168.99.102 # *.example.com. IN A 192.168.99.102 -# optional array of extra volumes to create -extraVolumes: [] -# - name: some-volume-name -# emptyDir: {} -# optional array of mount points for extraVolumes -extraVolumeMounts: [] -# - name: some-volume-name -# mountPath: /etc/wherever - # optional array of secrets to mount inside coredns container # possible usecase: need for secure connection with etcd backend extraSecrets: [] @@ -194,14 +153,6 @@ extraSecrets: [] # Custom labels to apply to Deployment, Pod, Service, ServiceMonitor. Including autoscaler if enabled. customLabels: {} -## Alternative configuration for HPA deployment if wanted -# -hpa: - enabled: false - minReplicas: 1 - maxReplicas: 2 - metrics: {} - ## Configue a cluster-proportional-autoscaler for coredns # See https://github.com/kubernetes-incubator/cluster-proportional-autoscaler autoscaler: @@ -212,18 +163,10 @@ autoscaler: coresPerReplica: 256 # Number of nodes in the cluster per coredns replica nodesPerReplica: 16 - # Min size of replicaCount - min: 0 - # Max size of replicaCount (default of 0 is no max) - max: 0 - # Whether to include unschedulable nodes in the nodes/cores calculations - this requires version 1.8.0+ of the autoscaler - includeUnschedulableNodes: false - # If true does not allow single points of failure to form - preventSinglePointFailure: true image: repository: k8s.gcr.io/cluster-proportional-autoscaler-amd64 - tag: "1.8.0" + tag: "1.7.1" pullPolicy: IfNotPresent # Optional priority class to be used for the autoscaler pods. priorityClassName used if not set. diff --git a/index.yaml b/index.yaml index 0a0c6fe..ba55965 100644 --- a/index.yaml +++ b/index.yaml @@ -39,10 +39,10 @@ entries: version: 1.13.800 - apiVersion: v1 appVersion: 1.6.9 - created: "2020-12-07T21:17:34.243794775Z" + created: "2021-01-09T00:58:33.508229127Z" description: CoreDNS is a DNS server that chains plugins and provides Kubernetes DNS Services - digest: 864e87e1e91aacb0a4dba99b9827d4579344fcb6004ef8946c42933d3c0b6a9c + digest: 702e7bb14f3a32108166c58e060fb76098a3f44cf92807bd7a9c49ce3fcedd9d 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-08T18:12:00.295038561Z" +generated: "2021-01-09T00:58:33.506836225Z" diff --git a/sha256sum/rke2-coredns/rke2-coredns.sum b/sha256sum/rke2-coredns/rke2-coredns.sum index fea1b99..0a1d6bc 100644 --- a/sha256sum/rke2-coredns/rke2-coredns.sum +++ b/sha256sum/rke2-coredns/rke2-coredns.sum @@ -1,2 +1,2 @@ -e8a5665ec9f501f9131042dd1eb602ce6ba92a19d27279f4aae8d0fb5e32f12e packages/rke2-coredns/package.yaml -1c0b1d0da141d7b457c5b1a576bbd0f9a7cd0ddc7154d2c92a70b11671b092e2 packages/rke2-coredns/rke2-coredns.patch +771f526366bc9f1758d13e7807a51512fc03ad6d4ed48c162218a776292c11da packages/rke2-coredns/package.yaml +845f90ab4e5fdb14f5a5be3e16790fd6690f3f00788349f00fe15ab6d3bf1e95 packages/rke2-coredns/rke2-coredns.patch