Merge pull request #145 from DVPE-cloud/dvpe-deployment-gloo/deployme…

…nt-labels

add deployment labels in values

charts/dvpe-deployment-gloo/CHANGELOG.md

@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ## [Unreleased]
 
+## [5.1.0]
+### Added
+- Added `deployment.spec.labels`
+
 ## [5.0.0]
 ### **Breaking Changes**
 The section in helm the helm values concerning certificates has been changed due to changes in the upstream API (migration from CLCM to CARDS).
@@ -27,14 +31,14 @@ _Unfortunately all the cardsParameters have to be set, they are required by CARD
 
 For the full config (rarely needed) see the [README.md](./README.md).
 
-## Changed
+### Changed
 - Decommission of CLCM forces to use a new way to create Certificates via the new CARDS API. Since the CARDS API needs a
   different set of parameters, we also have to change our API.
 - Names of Certificate Resources changed:
   - `Secrets`' names now end with `-crt` instead of `-certificate-by-issuer`.
   - `Certificate`'s names don't end with `-certificate-by-issuer` anymore.
 
-## Removed
+### Removed
 - Configuration of AuthPlugin _clientCredentialsPlugin_ was stripped to the basic functionality.
   Within `gloo.authConfig.spec.configs.` the following fields have been removed:  
   ```yaml
@@ -476,3 +480,4 @@ The ExternalSecretStore reference will be generated on Namespace generation by W
 [4.9.1]: https://github.com/DVPE-cloud/dvpe-helm/tree/dvpe-deployment-gloo-4.9.1/charts/dvpe-deployment-gloo
 [4.9.2]: https://github.com/DVPE-cloud/dvpe-helm/tree/dvpe-deployment-gloo-4.9.2/charts/dvpe-deployment-gloo
 [5.0.0]: https://github.com/DVPE-cloud/dvpe-helm/tree/dvpe-deployment-gloo-5.0.0/charts/dvpe-deployment-gloo
+[5.1.0]: https://github.com/DVPE-cloud/dvpe-helm/tree/dvpe-deployment-gloo-5.1.0/charts/dvpe-deployment-gloo

charts/dvpe-deployment-gloo/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "1.4"
 description: Deprecated by Q4/24! Helm chart for installing microservices as gloo enabled VirtualService definitions.
 name: dvpe-deployment-gloo
-version: 5.0.0
+version: 5.1.0
 home: https://github.com/dvpe-cloud/dvpe-helm
 keywords:
   - dvpe-helm

charts/dvpe-deployment-gloo/README.md

@@ -1,6 +1,6 @@
 # dvpe-deployment-gloo
 
-![Version: 5.0.0](https://img.shields.io/badge/Version-5.0.0-informational?style=flat-square)
+![Version: 5.1.0](https://img.shields.io/badge/Version-5.1.0-informational?style=flat-square)
 
 Deprecated by Q4/24! Helm chart for installing microservices as gloo enabled VirtualService definitions.
 
@@ -212,7 +212,7 @@ The following table lists the configurable parameters of the chart and its defau
 | datadog.source | string | `nil` | Defines the source which creates log outputs. Source defines the log format and triggers Datadog parser pipelines |
 | datadog.team | string | `nil` | Label in Datadog for the responsible team |
 | datadog.version | string | `nil` | Label in Datadog for the service version. If undefined, the value of `deployment.spec.image.tag` is used. This value should not be set by ordinary deployments. It is intended for special cases (e.g. CI triggered deployments). |
-| deployment | object | `{"podAnnotations":{},"spec":{"containers":{"livenessProbe":{},"readinessProbe":{},"startupProbe":{}},"image":{"name":null,"pullPolicy":"IfNotPresent","repository":null,"tag":"latest"},"imagePullSecrets":"docker-reg-secret","replicas":1,"resources":{"limits":{"cpu":null,"memory":null},"requests":{"cpu":"150m","memory":"200M"}},"securityContext":{"groupId":null,"userId":null},"serviceAccountName":null}}` | -----------------------------# |
+| deployment | object | `{"podAnnotations":{},"spec":{"containers":{"livenessProbe":{},"readinessProbe":{},"startupProbe":{}},"image":{"name":null,"pullPolicy":"IfNotPresent","repository":null,"tag":"latest"},"imagePullSecrets":"docker-reg-secret","labels":{},"replicas":1,"resources":{"limits":{"cpu":null,"memory":null},"requests":{"cpu":"150m","memory":"200M"}},"securityContext":{"groupId":null,"userId":null},"serviceAccountName":null}}` | -----------------------------# |
 | deployment.podAnnotations | object | `{}` | Object of additional `podAnnotations`. |
 | deployment.spec.containers.livenessProbe | object | `{}` | Configuration of LivenessProbe as documented here: [Configure Liveness, Readiness and Startup Probes](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) |
 | deployment.spec.containers.readinessProbe | object | `{}` | Configuration of ReadinessProbe as documented here: [Configure Liveness, Readiness and Startup Probes](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) |
@@ -222,6 +222,7 @@ The following table lists the configurable parameters of the chart and its defau
 | deployment.spec.image.repository | string | `nil` | The docker repository to pull the service image from. |
 | deployment.spec.image.tag | string | `"latest"` | The image version to use. |
 | deployment.spec.imagePullSecrets | string | `"docker-reg-secret"` | Image Pull Secret to access docker registry. |
+| deployment.spec.labels | object | `{}` | Labels to be added to the deployment and the pods. |
 | deployment.spec.replicas | int | `1` | The number of service instances to deploy. Will be ignored when autoscaling.enabled is true |
 | deployment.spec.resources.limits.cpu | string | `nil` | Total amount of CPU time that a container can use every 100 ms. See [Managing Compute Resources for Containers](https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/) for a detailed description on resource usage. |
 | deployment.spec.resources.limits.memory | string | `nil` | The memory limit for a Pod. See [Managing Compute Resources for Containers](https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/) for a detailed description on resource usage. |

charts/dvpe-deployment-gloo/templates/deployment.yaml

@@ -15,6 +15,9 @@ metadata:
     tags.datadoghq.com/service: {{ $serviceName }}
     tags.datadoghq.com/version: {{ default .image.tag $.Values.datadog.version }}
     {{- end }}
+    {{- if .labels }}
+    {{- toYaml .labels | nindent 4 }}
+    {{- end }}
 spec:
   {{- if not $.Values.autoscaling.enabled }}
   replicas: {{ .replicas }}
@@ -31,6 +34,9 @@ spec:
         tags.datadoghq.com/service: {{ $serviceName }}
         tags.datadoghq.com/version: {{ default .image.tag $.Values.datadog.version }}
         {{- end }}
+        {{- if .labels }}
+        {{- toYaml .labels | nindent 8 }}
+        {{- end }}
       annotations:
         {{- if $.Values.datadog.enabled }}
         ad.datadoghq.com/{{ $serviceName }}.logs: '[{

charts/dvpe-deployment-gloo/values.yaml

@@ -23,6 +23,8 @@ deployment:
   # deployment.podAnnotations -- Object of additional `podAnnotations`.
   podAnnotations: {}
   spec:
+    # deployment.spec.labels -- Labels to be added to the deployment and the pods.
+    labels: {}
     securityContext:
       # deployment.spec.securityContext.userId -- The User ID number of process running inside the container.
       userId: