feature(chart): allow configuring labels and annotations

lets users configure the labels and annotations in the Helm chart

Resolves #2442

Author: brookelew

chart/kube-flannel/templates/config.yaml

@@ -6,6 +6,13 @@ metadata:
   labels:
     tier: node
     app: flannel
+    {{- with merge .Values.flannel.configMap.labels .Values.global.commonLabels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+  {{- with merge .Values.flannel.configMap.annotations .Values.global.commonAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 data:
   cni-conf.json: {{ .Values.flannel.cniConf | toJson }}
   net-conf.json: |

chart/kube-flannel/templates/daemonset.yaml

@@ -6,6 +6,13 @@ metadata:
   labels:
     tier: node
     app: flannel
+    {{- with merge .Values.flannel.daemonSet.labels .Values.global.commonLabels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+  {{- with merge .Values.flannel.daemonSet.annotations .Values.global.commonAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   selector:
     matchLabels:
@@ -15,6 +22,13 @@ spec:
       labels:
         tier: node
         app: flannel
+        {{- with merge .Values.flannel.podLabels .Values.global.commonLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
+      {{- with merge .Values.flannel.podAnnotations .Values.global.commonAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
     spec:
       affinity:
         nodeAffinity:

chart/kube-flannel/templates/rbac.yaml

@@ -2,6 +2,14 @@ kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: flannel
+  labels:
+    {{- with (merge .Values.flannel.rbac.clusterRole.labels .Values.flannel.rbac.labels .Values.global.commonLabels) }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+  {{- with (merge .Values.flannel.rbac.clusterRole.annotations .Values.flannel.rbac.annotations .Values.global.commonAnnotations) }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 rules:
 - apiGroups:
   - ""
@@ -41,6 +49,14 @@ kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: flannel
+  labels:
+    {{- with (merge .Values.flannel.rbac.clusterRoleBinding.labels .Values.flannel.rbac.labels .Values.global.commonLabels) }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+  {{- with (merge .Values.flannel.rbac.clusterRoleBinding.annotations .Values.flannel.rbac.annotations .Values.global.commonAnnotations) }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole

chart/kube-flannel/templates/serviceaccount.yaml

@@ -3,3 +3,11 @@ kind: ServiceAccount
 metadata:
   name: flannel
   namespace: {{ .Release.Namespace }}
+  {{- with merge .Values.flannel.serviceAccount.labels .Values.global.commonLabels }}
+  labels:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with merge .Values.flannel.serviceAccount.annotations .Values.global.commonAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}

chart/kube-flannel/values.yaml

@@ -2,6 +2,10 @@
 global:
   imagePullSecrets:
 # - name: "a-secret-name"
+  # Labels to be applied to all deployed resources
+  commonLabels: {}
+  # Annotations to be applied to all deployed resources
+  commonAnnotations: {}
 
 # The IPv4 cidr pool to create on startup if none exists. Pod IPs will be
 # chosen from this range.
@@ -35,7 +39,7 @@ flannel:
   backend: "vxlan"
   # Port used by the backend 0 means default value (VXLAN: 8472, Wireguard: 51821, UDP: 8285)
   #backendPort: 0
-  # MTU to use for outgoing packets (VXLAN and Wiregurad) if not defined the MTU of the external interface is used.
+  # MTU to use for outgoing packets (VXLAN and WireGuard) if not defined the MTU of the external interface is used.
   # mtu: 1500
   #
   # VXLAN Configs:
@@ -49,13 +53,13 @@ flannel:
   # MAC prefix to be used on Windows. (Defaults is 0E-2A)
   # macPrefix: "0E-2A"
   #
-  # Wireguard Configs:
+  # WireGuard Configs:
   #
   # UDP listen port used with IPv6
   # backendPortv6: 51821
   # Pre shared key to use
   # psk: 0
-  # IP version to use on Wireguard
+  # IP version to use on WireGuard
   # tunnelMode: "separate"
   # Persistent keep interval to use
   # keepaliveInterval: 0
@@ -94,6 +98,46 @@ flannel:
     operator: Exists
   nodeSelector: {}
 
+  configMap:
+    # Additional labels to add to the ConfigMap
+    labels: {}
+    # Additional annotations to add to the ConfigMap
+    annotations: {}
+
+  # Labels to be applied to the deployed pods
+  podLabels: {}
+  # Annotations to be applied to the deployed pods
+  podAnnotations: {}
+
+  daemonSet:
+    # Additional labels to add to the DaemonSet
+    labels: {}
+    # Additional annotations to add to the DaemonSet
+    annotations: {}
+
+  serviceAccount:
+    # Additional labels to add to the service account
+    labels: {}
+    # Additional annotations to add to the service account
+    annotations: {}
+
+  rbac:
+    # Additional labels to add to all RBAC-related resources
+    labels: {}
+    # Additional annotations to add to all RBAC-related resources
+    annotations: {}
+    clusterRole:
+      # Additional labels to add to the ClusterRole
+      labels: {}
+      # Additional annotations to add to the ClusterRole
+      annotations: {}
+    clusterRoleBinding:
+      # Additional labels to add to the ClusterRoleBinding
+      labels: {}
+      # Additional annotations to add to the ClusterRoleBinding
+      annotations: {}
+
+
 netpol:
   enabled: false
   args: