Merge pull request #246 from hligit/feat/pod-and-rbac-customization

feat: add customAnnotations, dnsConfig, and podLabels support

Author: hagaibarel

.github/workflows/lint-test.yaml

@@ -17,7 +17,7 @@ jobs:
           version: v3.13.1
 
       - name: Install helm-unittest plugin
-        run: helm plugin install https://github.com/helm-unittest/helm-unittest
+        run: helm plugin install --version 1.0.2 https://github.com/helm-unittest/helm-unittest
 
       - name: Add Helm repo
         run: |

charts/coredns/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: coredns
-version: 1.45.0
+version: 1.45.1
 appVersion: 1.13.1
 home: https://coredns.io
 icon: https://coredns.io/images/CoreDNS_Colour_Horizontal.png
@@ -19,5 +19,9 @@ maintainers:
 type: application
 annotations:
   artifacthub.io/changes: |
-    - kind: changed
-      description: Bump to CoreDNS 1.13.1
+    - kind: added
+      description: Support for customAnnotations on ClusterRole and ClusterRoleBinding
+    - kind: added
+      description: Support for dnsConfig in deployment
+    - kind: added
+      description: Support for podLabels

charts/coredns/README.md

@@ -172,6 +172,8 @@ The command removes all the Kubernetes components associated with the chart and
 | `rollingUpdate.maxSurge`                       | Maximum number of pods created above desired number of pods                                                                               | `25%`                                                        |
 | `podDisruptionBudget`                          | Optional PodDisruptionBudget                                                                                                              | {}                                                           |
 | `podAnnotations`                               | Optional Pod only Annotations                                                                                                             | {}                                                           |
+| `podLabels`                                    | Optional Pod only Labels                                                                                                                  | {}                                                           |
+| `dnsConfig`                                    | Optional Pod DNS configuration. When set, `dnsPolicy` is automatically set to `None`                                                      | {}                                                           |
 | `terminationGracePeriodSeconds`                | Optional duration in seconds the pod needs to terminate gracefully.                                                                       | 30                                                           |
 | `hpa.enabled`                                  | Enable Hpa autoscaler instead of proportional one                                                                                         | `false`                                                      |
 | `hpa.minReplicas`                              | Hpa minimum number of CoreDNS replicas                                                                                                    | `1`                                                          |

charts/coredns/templates/clusterrole.yaml

@@ -4,6 +4,10 @@ kind: ClusterRole
 metadata:
   name: {{ template "coredns.clusterRoleName" . }}
   labels: {{- include "coredns.labels" . | nindent 4 }}
+{{- with .Values.customAnnotations }}
+  annotations:
+{{- toYaml . | nindent 4 }}
+{{- end }}
 rules:
 - apiGroups:
   - ""

charts/coredns/templates/clusterrolebinding.yaml

@@ -4,6 +4,10 @@ kind: ClusterRoleBinding
 metadata:
   name: {{ template "coredns.clusterRoleName" . }}
   labels: {{- include "coredns.labels" . | nindent 4 }}
+{{- with .Values.customAnnotations }}
+  annotations:
+{{- toYaml . | nindent 4 }}
+{{- end }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

charts/coredns/templates/deployment.yaml

@@ -49,6 +49,9 @@ spec:
         app.kubernetes.io/instance: {{ .Release.Name | quote }}
 {{- if .Values.customLabels }}
 {{ toYaml .Values.customLabels | indent 8 }}
+{{- end }}
+{{- if .Values.podLabels }}
+{{ toYaml .Values.podLabels | indent 8 }}
 {{- end }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
@@ -66,12 +69,20 @@ spec:
       terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
       {{- end }}
       serviceAccountName: {{ template "coredns.serviceAccountName" . }}
+      {{- if eq .Values.automountServiceAccountToken false }}
+      automountServiceAccountToken: false
+      {{- end }}
       {{- if .Values.priorityClassName }}
       priorityClassName: {{ .Values.priorityClassName | quote }}
       {{- end }}
-      {{- if .Values.isClusterService }}
+      {{- if .Values.dnsConfig }}
+      dnsPolicy: None
+      {{- else if .Values.isClusterService }}
       dnsPolicy: Default
       {{- end }}
+      {{- if .Values.dnsConfig }}
+      dnsConfig: {{ toYaml .Values.dnsConfig | nindent 8 }}
+      {{- end }}
       {{- if .Values.affinity }}
       affinity:
 {{ tpl (toYaml .Values.affinity) $ | indent 8 }}

charts/coredns/values.yaml

@@ -34,6 +34,8 @@ terminationGracePeriodSeconds: 30
 podAnnotations: {}
 #  cluster-autoscaler.kubernetes.io/safe-to-evict: "false"
 
+podLabels: {}
+
 serviceType: "ClusterIP"
 
 prometheus: