Add pod.labels support to all helm charts

all-in-one/README.md

@@ -393,6 +393,7 @@ A Helm chart for the deployment of WSO2 API Manager all-in-one distribution.
 | wso2.deployment.persistence.solrIndexing.capacity.solrIndexedData | string | `"50M"` | For persisting the indexed solr data |
 | wso2.deployment.persistence.solrIndexing.enabled | bool | `false` | Indicates if persistence of the runtime artifacts for Apache Solr-based indexing is enabled By default, this is disabled |
 | wso2.deployment.pod.annotations | object | `{}` | Annotations for pods |
+| wso2.deployment.pod.labels | object | `{}` | Labels for pods. `deployment` and `node` are reserved for the Deployment selector and must not be overridden. |
 | wso2.deployment.readinessProbe.failureThreshold | int | `5` | Minimum consecutive successes for the probe to be considered successful after having failed |
 | wso2.deployment.readinessProbe.initialDelaySeconds | int | `60` | Number of seconds after the container has started before readiness probes are initiated |
 | wso2.deployment.readinessProbe.periodSeconds | int | `10` | How often (in seconds) to perform the probe |

all-in-one/templates/am/instance-1/wso2am-deployment.yaml

@@ -42,6 +42,9 @@ spec:
         deployment: {{ template "am-all-in-one.fullname" . }}-am
         node: {{ template "am-all-in-one.fullname" . }}-am-1
         product: apim
+        {{- if .Values.wso2.deployment.pod.labels }}
+        {{- toYaml .Values.wso2.deployment.pod.labels | nindent 8 }}
+        {{- end }}
     spec:
       affinity:
         podAntiAffinity:

all-in-one/templates/am/instance-2/wso2am-deployment.yaml

@@ -43,6 +43,9 @@ spec:
         deployment: {{ template "am-all-in-one.fullname" . }}-am
         node: {{ template "am-all-in-one.fullname" . }}-am-2
         product: apim
+        {{- if .Values.wso2.deployment.pod.labels }}
+        {{- toYaml .Values.wso2.deployment.pod.labels | nindent 8 }}
+        {{- end }}
     spec:
       affinity:
         podAntiAffinity:

all-in-one/values.yaml

@@ -952,6 +952,9 @@ wso2:
     pod:
       # -- Annotations for pods
       annotations: {}
+      # -- Labels for pods.
+      # `deployment` and `node` are reserved for the Deployment selector and must not be overridden.
+      labels: {}
 
     # -- Environment variables for the deployment
     # Example:

distributed/control-plane/README.md

@@ -263,6 +263,7 @@ A Helm chart for the deployment of WSO2 API Management API Control Plane profile
 | wso2.deployment.persistence.solrIndexing.capacity.solrIndexedData | string | `"50M"` | For persisting the indexed solr data |
 | wso2.deployment.persistence.solrIndexing.enabled | bool | `false` | Indicates if persistence of the runtime artifacts for Apache Solr-based indexing is enabled By default, this is disabled |
 | wso2.deployment.pod.annotations | object | `{}` | Annotations for pods |
+| wso2.deployment.pod.labels | object | `{}` | Labels for pods. `deployment` and `node` are reserved for the Deployment selector and must not be overridden. |
 | wso2.deployment.readinessProbe.failureThreshold | int | `3` | Minimum consecutive successes for the probe to be considered successful after having failed |
 | wso2.deployment.readinessProbe.initialDelaySeconds | int | `60` | Number of seconds after the container has started before readiness probes are initiated |
 | wso2.deployment.readinessProbe.periodSeconds | int | `10` | How often (in seconds) to perform the probe |

distributed/control-plane/templates/control-plane/instance-1/wso2am-cp-deployment.yaml

@@ -45,6 +45,9 @@ spec:
         deployment: {{ template "apim-helm-cp.fullname" . }}
         node: {{ template "apim-helm-cp.fullname" . }}-1
         product: apim
+        {{- if .Values.wso2.deployment.pod.labels }}
+        {{- toYaml .Values.wso2.deployment.pod.labels | nindent 8 }}
+        {{- end }}
     spec:
       affinity:
         podAntiAffinity:

distributed/control-plane/templates/control-plane/instance-2/wso2am-cp-deployment.yaml

@@ -46,6 +46,9 @@ spec:
         deployment: {{ template "apim-helm-cp.fullname" . }}
         node: {{ template "apim-helm-cp.fullname" . }}-2
         product: apim
+        {{- if .Values.wso2.deployment.pod.labels }}
+        {{- toYaml .Values.wso2.deployment.pod.labels | nindent 8 }}
+        {{- end }}
     spec:
       affinity:
         podAntiAffinity:

distributed/control-plane/values.yaml

@@ -732,6 +732,9 @@ wso2:
     pod:
       # -- Annotations for pods
       annotations: {}
+      # -- Labels for pods.
+      # `deployment` and `node` are reserved for the Deployment selector and must not be overridden.
+      labels: {}
 
     # -- Environment variables for the deployment
     # Example:

distributed/gateway/README.md

@@ -236,6 +236,7 @@ A Helm chart for the deployment of WSO2 API Management Universal Gateway profile
 | wso2.deployment.minReplicas | int | `2` | Minimum replicas for HPA |
 | wso2.deployment.nodeSelector | string | `nil` | Node selector to deploy pod in selected node. Add label to the node and specify the label here. |
 | wso2.deployment.pod.annotations | object | `{}` | Annotations for pods |
+| wso2.deployment.pod.labels | object | `{}` | Labels for pods. `deployment` is reserved for the Deployment selector and must not be overridden. |
 | wso2.deployment.readinessProbe.failureThreshold | int | `3` | Minimum consecutive successes for the probe to be considered successful after having failed |
 | wso2.deployment.readinessProbe.initialDelaySeconds | int | `60` | Number of seconds after the container has started before readiness probes are initiated |
 | wso2.deployment.readinessProbe.periodSeconds | int | `10` | How often (in seconds) to perform the probe |

distributed/gateway/templates/gateway/wso2am-gateway-deployment.yaml

@@ -46,6 +46,9 @@ spec:
       labels:
         deployment: {{ template "apim-helm-gw.fullname" . }}
         product: apim
+        {{- if .Values.wso2.deployment.pod.labels }}
+        {{- toYaml .Values.wso2.deployment.pod.labels | nindent 8 }}
+        {{- end }}
     spec:
       affinity:
         podAntiAffinity:

distributed/gateway/values.yaml

@@ -666,6 +666,9 @@ wso2:
     pod:
       # -- Annotations for pods
       annotations: {}
+      # -- Labels for pods.
+      # `deployment` is reserved for the Deployment selector and must not be overridden.
+      labels: {}
 
     # -- Environment variables for the deployment
     # Example:

distributed/key-manager/README.md

@@ -170,6 +170,7 @@ A Helm chart for the deployment of WSO2 API Manager all-in-one distribution.
 | wso2.deployment.minAvailable | string | `"50%"` | Minimum available pod counts for PDB |
 | wso2.deployment.nodeSelector | string | `nil` | Node selector to deploy pod in selected node. Add label to the node and specify the label here. |
 | wso2.deployment.pod.annotations | object | `{}` | Annotations for pods |
+| wso2.deployment.pod.labels | object | `{}` | Labels for pods. `deployment` is reserved for the Deployment selector and must not be overridden. |
 | wso2.deployment.readinessProbe.failureThreshold | int | `3` | Minimum consecutive successes for the probe to be considered successful after having failed |
 | wso2.deployment.readinessProbe.initialDelaySeconds | int | `60` | Number of seconds after the container has started before readiness probes are initiated |
 | wso2.deployment.readinessProbe.periodSeconds | int | `10` | How often (in seconds) to perform the probe |

distributed/key-manager/templates/key-manager/wso2am-km-deployment.yaml

@@ -50,6 +50,9 @@ spec:
       labels:
         deployment: {{ template "apim-helm-km.fullname" . }}
         product: apim
+        {{- if .Values.wso2.deployment.pod.labels }}
+        {{- toYaml .Values.wso2.deployment.pod.labels | nindent 8 }}
+        {{- end }}
     spec:
       affinity:
         podAntiAffinity:

distributed/key-manager/values.yaml

@@ -493,6 +493,9 @@ wso2:
     pod:
       # -- Annotations for pods
       annotations: {}
+      # -- Labels for pods.
+      # `deployment` is reserved for the Deployment selector and must not be overridden.
+      labels: {}
 
     # -- Environment variables for the deployment
     # Example:

distributed/traffic-manager/README.md

@@ -129,6 +129,7 @@ A Helm chart for the deployment of WSO2 API Management Traffic Manager profile
 | wso2.deployment.minAvailable | string | `"50%"` | Minimum available pod counts for PDB |
 | wso2.deployment.nodeSelector | string | `nil` | Node selector to deploy pod in selected node. Add label to the node and specify the label here. |
 | wso2.deployment.pod.annotations | object | `{}` | Annotations for pods |
+| wso2.deployment.pod.labels | object | `{}` | Labels for pods. `deployment` and `node` are reserved for the Deployment selector and must not be overridden. |
 | wso2.deployment.readinessProbe.failureThreshold | int | `3` | Minimum consecutive successes for the probe to be considered successful after having failed |
 | wso2.deployment.readinessProbe.initialDelaySeconds | int | `60` | Number of seconds after the container has started before readiness probes are initiated |
 | wso2.deployment.readinessProbe.periodSeconds | int | `10` | How often (in seconds) to perform the probe |

distributed/traffic-manager/templates/traffic-manager/instance-1/wso2am-tm-deployment.yaml

@@ -48,6 +48,9 @@ spec:
         deployment: {{ template "apim-helm-tm.fullname" . }}
         node: {{ template "apim-helm-tm.fullname" . }}-1
         product: apim
+        {{- if .Values.wso2.deployment.pod.labels }}
+        {{- toYaml .Values.wso2.deployment.pod.labels | nindent 8 }}
+        {{- end }}
     spec:
       affinity:
         podAntiAffinity:

distributed/traffic-manager/templates/traffic-manager/instance-2/wso2am-tm-deployment.yaml

@@ -49,6 +49,9 @@ spec:
         deployment: {{ template "apim-helm-tm.fullname" . }}
         node: {{ template "apim-helm-tm.fullname" . }}-2
         product: apim
+        {{- if .Values.wso2.deployment.pod.labels }}
+        {{- toYaml .Values.wso2.deployment.pod.labels | nindent 8 }}
+        {{- end }}
     spec:
       affinity:
         podAntiAffinity:

distributed/traffic-manager/values.yaml

@@ -409,6 +409,9 @@ wso2:
     pod:
       # -- Annotations for pods
       annotations: {}
+      # -- Labels for pods.
+      # `deployment` and `node` are reserved for the Deployment selector and must not be overridden.
+      labels: {}
 
     # -- Environment variables for the deployment
     # Example:

resources/am-pattern-0-all-in-one/default_values.yaml

@@ -773,6 +773,14 @@ wso2:
     # -- Node selector to deploy pod in selected node. Add label to the node and specify the label here.
     nodeSelector:
 
+    # Pod-specific configurations
+    pod:
+      # -- Annotations for pods
+      annotations: {}
+      # -- Labels for pods.
+      # `deployment` and `node` are reserved for the Deployment selector and must not be overridden.
+      labels: {}
+
     persistence:
       # -- Persistent runtime artifacts for Apache Solr-based indexing
       solrIndexing:

resources/am-pattern-1-all-in-one-HA/default_values.yaml

@@ -792,6 +792,14 @@ wso2:
     # -- Node selector to deploy pod in selected node. Add label to the node and specify the label here.
     nodeSelector:
 
+    # Pod-specific configurations
+    pod:
+      # -- Annotations for pods
+      annotations: {}
+      # -- Labels for pods.
+      # `deployment` and `node` are reserved for the Deployment selector and must not be overridden.
+      labels: {}
+
     persistence:
       # -- Persistent runtime artifacts for Apache Solr-based indexing
       solrIndexing:

resources/am-pattern-2-all-in-one_GW/default_gw_values.yaml

@@ -543,6 +543,14 @@ wso2:
     # -- Node selector to deploy pod in selected node. Add label to the node and specify the label here.
     nodeSelector:
 
+    # Pod-specific configurations
+    pod:
+      # -- Annotations for pods
+      annotations: {}
+      # -- Labels for pods.
+      # `deployment` is reserved for the Deployment selector and must not be overridden.
+      labels: {}
+
     # Kubernetes RollingUpdate strategy configurations
     strategy:
       rollingUpdate:

resources/am-pattern-2-all-in-one_GW/default_values.yaml

@@ -766,6 +766,14 @@ wso2:
     # -- Node selector to deploy pod in selected node. Add label to the node and specify the label here.
     nodeSelector:
 
+    # Pod-specific configurations
+    pod:
+      # -- Annotations for pods
+      annotations: {}
+      # -- Labels for pods.
+      # `deployment` and `node` are reserved for the Deployment selector and must not be overridden.
+      labels: {}
+
     persistence:
       # -- Persistent runtime artifacts for Apache Solr-based indexing
       solrIndexing:

resources/am-pattern-3-ACP_TM_GW/default_acp_values.yaml

@@ -590,6 +590,14 @@ wso2:
     # -- Node selector to deploy pod in selected node. Add label to the node and specify the label here.
     nodeSelector:
 
+    # Pod-specific configurations
+    pod:
+      # -- Annotations for pods
+      annotations: {}
+      # -- Labels for pods.
+      # `deployment` and `node` are reserved for the Deployment selector and must not be overridden.
+      labels: {}
+
     # -- Enable high availability for traffic manager. If this is enabled, two traffic manager instances will be deployed.
     # This is not relavant to HA in Kubernetes. Multiple replicas of the same instance will not count as HA for TM.
     highAvailability: true

resources/am-pattern-3-ACP_TM_GW/default_gw_values.yaml

@@ -545,6 +545,14 @@ wso2:
     # -- Node selector to deploy pod in selected node. Add label to the node and specify the label here.
     nodeSelector:
 
+    # Pod-specific configurations
+    pod:
+      # -- Annotations for pods
+      annotations: {}
+      # -- Labels for pods.
+      # `deployment` is reserved for the Deployment selector and must not be overridden.
+      labels: {}
+
     # Kubernetes RollingUpdate strategy configurations
     strategy:
       rollingUpdate:

resources/am-pattern-3-ACP_TM_GW/default_tm_values.yaml

@@ -333,6 +333,14 @@ wso2:
     # -- Node selector to deploy pod in selected node. Add label to the node and specify the label here.
     nodeSelector:
 
+    # Pod-specific configurations
+    pod:
+      # -- Annotations for pods
+      annotations: {}
+      # -- Labels for pods.
+      # `deployment` and `node` are reserved for the Deployment selector and must not be overridden.
+      labels: {}
+
     # Kubernetes RollingUpdate strategy configurations
     strategy:
       rollingUpdate:

resources/am-pattern-4-ACP_TM_GW_KM/default_acp_values.yaml

@@ -590,6 +590,14 @@ wso2:
     # -- Node selector to deploy pod in selected node. Add label to the node and specify the label here.
     nodeSelector:
 
+    # Pod-specific configurations
+    pod:
+      # -- Annotations for pods
+      annotations: {}
+      # -- Labels for pods.
+      # `deployment` and `node` are reserved for the Deployment selector and must not be overridden.
+      labels: {}
+
     # -- Enable high availability for traffic manager. If this is enabled, two traffic manager instances will be deployed.
     # This is not relavant to HA in Kubernetes. Multiple replicas of the same instance will not count as HA for TM.
     highAvailability: true

resources/am-pattern-4-ACP_TM_GW_KM/default_gw_values.yaml

@@ -545,6 +545,14 @@ wso2:
     # -- Node selector to deploy pod in selected node. Add label to the node and specify the label here.
     nodeSelector:
 
+    # Pod-specific configurations
+    pod:
+      # -- Annotations for pods
+      annotations: {}
+      # -- Labels for pods.
+      # `deployment` is reserved for the Deployment selector and must not be overridden.
+      labels: {}
+
     # Kubernetes RollingUpdate strategy configurations
     strategy:
       rollingUpdate:

resources/am-pattern-4-ACP_TM_GW_KM/default_km_values.yaml

@@ -411,6 +411,14 @@ wso2:
     # -- Node selector to deploy pod in selected node. Add label to the node and specify the label here.
     nodeSelector:
 
+    # Pod-specific configurations
+    pod:
+      # -- Annotations for pods
+      annotations: {}
+      # -- Labels for pods.
+      # `deployment` is reserved for the Deployment selector and must not be overridden.
+      labels: {}
+
     # Kubernetes RollingUpdate strategy configurations
     strategy:
       rollingUpdate:

resources/am-pattern-4-ACP_TM_GW_KM/default_tm_values.yaml

@@ -333,6 +333,14 @@ wso2:
     # -- Node selector to deploy pod in selected node. Add label to the node and specify the label here.
     nodeSelector:
 
+    # Pod-specific configurations
+    pod:
+      # -- Annotations for pods
+      annotations: {}
+      # -- Labels for pods.
+      # `deployment` and `node` are reserved for the Deployment selector and must not be overridden.
+      labels: {}
+
     # Kubernetes RollingUpdate strategy configurations
     strategy:
       rollingUpdate:

resources/am-pattern-5-all-in-one_GW_KM/default_gw_values.yaml

@@ -543,6 +543,14 @@ wso2:
     # -- Node selector to deploy pod in selected node. Add label to the node and specify the label here.
     nodeSelector:
 
+    # Pod-specific configurations
+    pod:
+      # -- Annotations for pods
+      annotations: {}
+      # -- Labels for pods.
+      # `deployment` is reserved for the Deployment selector and must not be overridden.
+      labels: {}
+
     # Kubernetes RollingUpdate strategy configurations
     strategy:
       rollingUpdate:

resources/am-pattern-5-all-in-one_GW_KM/default_km_values.yaml

@@ -411,6 +411,14 @@ wso2:
     # -- Node selector to deploy pod in selected node. Add label to the node and specify the label here.
     nodeSelector:
 
+    # Pod-specific configurations
+    pod:
+      # -- Annotations for pods
+      annotations: {}
+      # -- Labels for pods.
+      # `deployment` is reserved for the Deployment selector and must not be overridden.
+      labels: {}
+
     # Kubernetes RollingUpdate strategy configurations
     strategy:
       rollingUpdate:

resources/am-pattern-5-all-in-one_GW_KM/default_values.yaml

@@ -774,6 +774,14 @@ wso2:
     # -- Node selector to deploy pod in selected node. Add label to the node and specify the label here.
     nodeSelector:
 
+    # Pod-specific configurations
+    pod:
+      # -- Annotations for pods
+      annotations: {}
+      # -- Labels for pods.
+      # `deployment` and `node` are reserved for the Deployment selector and must not be overridden.
+      labels: {}
+
     persistence:
       # -- Persistent runtime artifacts for Apache Solr-based indexing
       solrIndexing: