[stable/chart/cluster-overprovisioner] Added labels and annotations to the deployments (#17496)

* PE-12185 Added labels and annotations to the deployments

Signed-off-by: Hingst, Arne-Kristian <arne@hingst.it>

* Fixes linter errors about to many empty lines

Signed-off-by: Hingst, Arne-Kristian <arne@hingst.it>

* Another blank line linter error

Signed-off-by: Hingst, Arne-Kristian <arne@hingst.it>

stable/cluster-overprovisioner/Chart.yaml

@@ -3,7 +3,7 @@ appVersion: "1.0"
 description: Installs the a deployment that overprovisions the cluster
 name: cluster-overprovisioner
 home: https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler
-version: 0.2.4
+version: 0.2.5
 maintainers:
 - name: max-rocket-internet
   email: max.williams@deliveryhero.com

stable/cluster-overprovisioner/README.md

@@ -49,10 +49,12 @@ The following table lists the configurable parameters for this chart and their d
 | `deployments`                      | Define optional additional deployments                                                                                          | `[]`              |
 | `deployments[].name`               | Name for additional deployments (will be added as label cluster-over-provisioner-name, so you can match it with affinity rules) | ``                |
 | `deployments[].replicaCount`       | Number of replicas                                                                                                              | `1`               |
+| `deployments[].annotations`       | Annotations to add to the deployment                                                                                                              | `{}`               |
 | `deployments[].resources`          | Resources for the overprovision pods                                                                                            | `{}`              |
 | `deployments[].affinity`           | Map of node/pod affinities                                                                                                      | `{}`              |
 | `deployments[].nodeSelector`       | Node labels for pod assignment                                                                                                  | `{}`              |
 | `deployments[].tolerations`        | Optional deployment tolerations                                                                                                 | `[]`              |
+| `deployments[].labels`        | Optional labels tolerations                                                                                                 | `{}`              |
 
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install` or provide a YAML file containing the values for the above parameters:

stable/cluster-overprovisioner/ci/additional-deploys-values.yaml

@@ -1,13 +1,17 @@
 deployments:
   - name: ci-test1
+    annotations: {}
     replicaCount: 1
     nodeSelector: {}
     resources: {}
     tolerations: []
     affinity: {}
+    labels: {}
   - name: ci-test2
+    annotations: {}
     replicaCount: 1
     nodeSelector: {}
     resources: {}
     tolerations: []
     affinity: {}
+    labels: {}

stable/cluster-overprovisioner/templates/deployments.yaml

@@ -29,10 +29,17 @@ spec:
       app.kubernetes.io/instance: {{ $relName }}
   template:
     metadata:
+    {{- with .annotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
       labels:
         app.kubernetes.io/name: {{ $name }}
         cluster-overprovisioner-name: {{ .name }}
         app.kubernetes.io/instance: {{ $relName }}
+    {{- with .labels }}
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
     spec:
       priorityClassName: {{ $priorityClassName }}
       containers:

stable/cluster-overprovisioner/values.yaml

@@ -18,8 +18,10 @@ fullnameOverride: ""
 
 deployments: []
   # - name: default
+  #   annotations: {}
   #   replicaCount: 1
   #   nodeSelector: {}
   #   resources: {}
   #   tolerations: []
   #   affinity: {}
+  #   labels: {}