feat: support additional labels for pods (#163)

Author: nic-chen

charts/api7/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.17.5
+version: 0.17.6
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/api7/README.md

@@ -21,6 +21,7 @@ A Helm chart for Kubernetes
 | dashboard.extraEnvVars | list | `[]` |  |
 | dashboard.extraVolumeMounts | list | `[]` |  |
 | dashboard.extraVolumes | list | `[]` |  |
+| dashboard.podLabels | object | `{}` |  |
 | dashboard.image.pullPolicy | string | `"Always"` |  |
 | dashboard.image.repository | string | `"api7/api7-ee-3-integrated"` |  |
 | dashboard.image.tag | string | `"v3.5.0"` |  |
@@ -84,6 +85,7 @@ A Helm chart for Kubernetes
 | developer_portal.extraEnvVars | list | `[]` |  |
 | developer_portal.extraVolumeMounts | list | `[]` |  |
 | developer_portal.extraVolumes | list | `[]` |  |
+| developer_portal.podLabels | object | `{}` |  |
 | developer_portal.image.pullPolicy | string | `"Always"` |  |
 | developer_portal.image.repository | string | `"api7/api7-ee-developer-portal"` |  |
 | developer_portal.image.tag | string | `"v3.5.0"` |  |
@@ -116,6 +118,7 @@ A Helm chart for Kubernetes
 | dp_manager.extraEnvVars | list | `[]` |  |
 | dp_manager.extraVolumeMounts | list | `[]` |  |
 | dp_manager.extraVolumes | list | `[]` |  |
+| dp_manager.podLabels | object | `{}` |  |
 | dp_manager.image.pullPolicy | string | `"Always"` |  |
 | dp_manager.image.repository | string | `"api7/api7-ee-dp-manager"` |  |
 | dp_manager.image.tag | string | `"v3.5.0"` |  |

charts/api7/templates/dashboard-deploy.yaml

@@ -21,6 +21,11 @@ spec:
       labels:
         {{- include "api7ee3.selectorLabels" . | nindent 8 }}
         app.kubernetes.io/component: dashboard
+        {{- if .Values.dashboard.podLabels }}
+        {{- range $key, $value := $.Values.dashboard.podLabels }}
+        {{ $key }}: {{ $value | quote }}
+        {{- end }}
+        {{- end }}
     spec:
       {{- if .Values.imagePullSecret }}
       imagePullSecrets:

charts/api7/templates/developer-portal-deploy.yaml

@@ -22,6 +22,11 @@ spec:
       labels:
         {{- include "api7ee3.selectorLabels" . | nindent 8 }}
         app.kubernetes.io/component: developer-portal
+        {{- if .Values.developer_portal.podLabels }}
+        {{- range $key, $value := $.Values.developer_portal.podLabels }}
+        {{ $key }}: {{ $value | quote }}
+        {{- end }}
+        {{- end }}
     spec:
       {{- if .Values.imagePullSecret }}
       imagePullSecrets:

charts/api7/templates/dp-manager-deploy.yaml

@@ -21,6 +21,11 @@ spec:
       labels:
         {{- include "api7ee3.selectorLabels" . | nindent 8 }}
         app.kubernetes.io/component: dp-manager
+        {{- if .Values.dp_manager.podLabels }}
+        {{- range $key, $value := $.Values.dp_manager.podLabels }}
+        {{ $key }}: {{ $value | quote }}
+        {{- end }}
+        {{- end }}
     spec:
       {{- if .Values.imagePullSecret }}
       imagePullSecrets:

charts/api7/values.yaml

@@ -26,6 +26,7 @@ dashboard:
   extraEnvVars: []
   extraVolumes: []
   extraVolumeMounts: []
+  podLabels: {}
 
 dp_manager:
   replicaCount: 1
@@ -49,6 +50,7 @@ dp_manager:
   extraEnvVars: []
   extraVolumes: []
   extraVolumeMounts: []
+  podLabels: {}
 
 developer_portal:
   replicaCount: 1
@@ -63,6 +65,7 @@ developer_portal:
   extraEnvVars: []
   extraVolumes: []
   extraVolumeMounts: []
+  podLabels: {}
 
 imagePullSecret: ""
 nameOverride: ""

charts/gateway/Chart.yaml

@@ -14,7 +14,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.6
+version: 0.2.7
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/gateway/README.md

@@ -102,6 +102,7 @@ The command removes all the Kubernetes components associated with the chart and
 | apisix.meta.luaSharedDict.prometheus-metrics | string | `"15m"` |  |
 | apisix.nodeSelector | object | `{}` | Node labels for API7 Gateway pod assignment |
 | apisix.podAnnotations | object | `{}` | Annotations to add to each pod |
+| apisix.podLabels | object | `{}` | Labels to add to each pod |
 | apisix.podDisruptionBudget | object | `{"enabled":false,"maxUnavailable":1,"minAvailable":"90%"}` | See https://kubernetes.io/docs/tasks/run-application/configure-pdb/ for more details |
 | apisix.podDisruptionBudget.enabled | bool | `false` | Enable or disable podDisruptionBudget |
 | apisix.podDisruptionBudget.maxUnavailable | int | `1` | Set the maxUnavailable of podDisruptionBudget |

charts/gateway/templates/_pod.tpl

@@ -9,6 +9,11 @@ metadata:
     {{- end }}
   labels:
     {{- include "apisix.selectorLabels" . | nindent 4 }}
+    {{- if .Values.apisix.podLabels }}
+    {{- range $key, $value := $.Values.apisix.podLabels }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
+    {{- end }}
 spec:
   {{- with .Values.global.imagePullSecrets }}
   imagePullSecrets:

charts/gateway/values.yaml

@@ -114,6 +114,8 @@ apisix:
   priorityClassName: ""
   # -- Annotations to add to each pod
   podAnnotations: {}
+  # -- Labels to add to each pod
+  podLabels: {}
   # -- Set the securityContext for API7 Gateway pods
   podSecurityContext: {}
     # fsGroup: 2000