diff --git a/stable/cluster-overprovisioner/Chart.yaml b/stable/cluster-overprovisioner/Chart.yaml index b4e4029aef..e445028433 100644 --- a/stable/cluster-overprovisioner/Chart.yaml +++ b/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 diff --git a/stable/cluster-overprovisioner/README.md b/stable/cluster-overprovisioner/README.md index 30c0de805f..9bd6dc1cce 100644 --- a/stable/cluster-overprovisioner/README.md +++ b/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: diff --git a/stable/cluster-overprovisioner/ci/additional-deploys-values.yaml b/stable/cluster-overprovisioner/ci/additional-deploys-values.yaml index f0055905eb..01c9d3dfc9 100644 --- a/stable/cluster-overprovisioner/ci/additional-deploys-values.yaml +++ b/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: {} diff --git a/stable/cluster-overprovisioner/templates/deployments.yaml b/stable/cluster-overprovisioner/templates/deployments.yaml index 70cfb5b03f..25e7bb47f6 100644 --- a/stable/cluster-overprovisioner/templates/deployments.yaml +++ b/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: diff --git a/stable/cluster-overprovisioner/values.yaml b/stable/cluster-overprovisioner/values.yaml index 7fc68406a7..b7e9bb0177 100644 --- a/stable/cluster-overprovisioner/values.yaml +++ b/stable/cluster-overprovisioner/values.yaml @@ -18,8 +18,10 @@ fullnameOverride: "" deployments: [] # - name: default + # annotations: {} # replicaCount: 1 # nodeSelector: {} # resources: {} # tolerations: [] # affinity: {} + # labels: {}