add podLabels parameter (Azure#963)

adobe-platform · Sep 30, 2021 · 047e875 · 047e875
1 parent 9bbc421
commit 047e875
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/manifest_staging/charts/aad-pod-identity/README.md b/manifest_staging/charts/aad-pod-identity/README.md
@@ -251,6 +251,7 @@ The following tables list the configurable parameters of the aad-pod-identity ch
 | `mic.loggingFormat`                       | Log format. One of (text \| json)                                                                                                                                                                                                                                                                                             | `text`                                                         |
 | `mic.resources`                           | Resource limit for MIC                                                                                                                                                                                                                                                                                                        | `{}`                                                           |
 | `mic.podAnnotations`                      | Pod annotations for MIC                                                                                                                                                                                                                                                                                                       | `{}`                                                           |
+| `mic.podLabels`                           | Pod labels for MIC                                                                                                                                                                                                                                                                                                       | `{}`                                                           |
 | `mic.affinity`                            | Affinity settings                                                                                                                                                                                                                                                                                                             | `{}`                                                           |
 | `mic.tolerations`                         | List of node taints to tolerate                                                                                                                                                                                                                                                                                               | `[]`                                                           |
 | `mic.topologySpreadConstraints`           | Pod topology spread constraints settings                                                                                                                                                                                                                                                                                      | `[]`                                                           |
@@ -273,6 +274,7 @@ The following tables list the configurable parameters of the aad-pod-identity ch
 | `nmi.loggingFormat`                       | Log format. One of (text \| json)                                                                                                                                                                                                                                                                                             | `text`                                                         |
 | `nmi.resources`                           | Resource limit for NMI                                                                                                                                                                                                                                                                                                        | `{}`                                                           |
 | `nmi.podAnnotations`                      | Pod annotations for NMI                                                                                                                                                                                                                                                                                                       | `{}`                                                           |
+| `nmi.podLabels`                           | Pod labels for NMI                                                                                                                                                                                                                                                                                                       | `{}`                                                           |
 | `nmi.affinity`                            | Affinity settings                                                                                                                                                                                                                                                                                                             | `{}`                                                           |
 | `nmi.tolerations`                         | List of node taints to tolerate                                                                                                                                                                                                                                                                                               | `[]`                                                           |
 | `nmi.ipTableUpdateTimeIntervalInSeconds`  | Override iptables update interval in seconds                                                                                                                                                                                                                                                                                  | `60`                                                           |

diff --git a/manifest_staging/charts/aad-pod-identity/templates/mic-deployment.yaml b/manifest_staging/charts/aad-pod-identity/templates/mic-deployment.yaml
@@ -20,6 +20,9 @@ spec:
       labels:
         {{- include "aad-pod-identity.labels" . | nindent 8 }}
         app.kubernetes.io/component: mic
+      {{- if .Values.mic.podLabels }}
+      {{- toYaml .Values.mic.podLabels | nindent 8 }}
+      {{- end }}
 {{- if .Values.mic.podAnnotations }}
       annotations:
 {{ toYaml .Values.mic.podAnnotations | indent 8 }}

diff --git a/manifest_staging/charts/aad-pod-identity/templates/nmi-daemonset.yaml b/manifest_staging/charts/aad-pod-identity/templates/nmi-daemonset.yaml
@@ -20,6 +20,9 @@ spec:
         {{- include "aad-pod-identity.labels" . | nindent 8 }}
         app.kubernetes.io/component: nmi
         tier: node
+      {{- if .Values.nmi.podLabels }}
+      {{- toYaml .Values.nmi.podLabels | nindent 8 }}
+      {{- end }}
 {{- if .Values.nmi.podAnnotations }}
       annotations:
 {{ toYaml .Values.nmi.podAnnotations | indent 8 }}

diff --git a/manifest_staging/charts/aad-pod-identity/values.yaml b/manifest_staging/charts/aad-pod-identity/values.yaml
@@ -61,6 +61,8 @@ mic:
 
   podAnnotations: {}
 
+  podLabels: {}
+
   ## Node labels for pod assignment
   ## aad-pod-identity is currently only supported on linux
   nodeSelector:
@@ -157,6 +159,8 @@ nmi:
 
   podAnnotations: {}
 
+  podLabels: {}
+
   ## Node labels for pod assignment
   ## aad-pod-identity is currently only supported on linux
   nodeSelector: