[stable/cluster-overprovisioner] multi deployment option cleanup (#16686)

Signed-off-by: Denis Dabischa <denis.dabischa@kloeckner.com>
This commit is contained in:
dabde
2019-08-29 05:21:56 -07:00
committed by Kubernetes Prow Robot
parent 838dc91c09
commit b26bd32048
6 changed files with 29 additions and 79 deletions
+1 -1
View File
@@ -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.2
version: 0.2.3
maintainers:
- name: max-rocket-internet
email: max.williams@deliveryhero.com
+19 -25
View File
@@ -34,31 +34,25 @@ Some thought or experimentation is required to set `deployment.resources` and `d
The following table lists the configurable parameters for this chart and their default values.
| Parameter | Description | Default |
| -----------------------------------------------|---------------------------------------------------|-------------------|
| `priorityClassOverprovision.name` | Name of the overprovision priorityClass | `overprovision` |
| `priorityClassOverprovision.value` | Priority value of the overprovision priorityClass | `-1` |
| `priorityClassDefault.enabled` | If true, enable default priorityClass | `true` |
| `priorityClassDefault.name` | Name of the default priorityClass | `default` |
| `priorityClassDefault.value` | Priority value of the default priorityClass | `0` |
| `replicaCount` | Number of replicas | `1` |
| `resources` | Resources for the overprovision pods | `{}` |
| `image.repository` | Image repository | `k8s.gcr.io/pause`|
| `image.tag` | Image tag | `3.1` |
| `image.pullPolicy` | Container pull policy | `IfNotPresent` |
| `affinity` | Map of node/pod affinities | `{}` |
| `nodeSelector` | Node labels for pod assignment | `{}` |
| `annotations` | Optional deployment annotations | `{}` |
| `fullnameOverride` | Override the fullname of the chart | `nil` |
| `nameOverride` | Override the name of the chart | `nil` |
| `tolerations` | Optional deployment tolerations | `[]` |
| `additionalDeployments` | Define optional additional deployments | `[]` |
| `additionalDeployments[].name` | Name for additional deployments | `` |
| `additionalDeployments[].replicaCount` | Number of replicas | `1` |
| `additionalDeployments[].resources` | Resources for the overprovision pods | `{}` |
| `additionalDeployments[].affinity` | Map of node/pod affinities | `{}` |
| `additionalDeployments[].nodeSelector` | Node labels for pod assignment | `{}` |
| `additionalDeployments[].tolerations` | Optional deployment tolerations | `[]` |
| Parameter | Description | Default |
| -----------------------------------|---------------------------------------------------|-------------------|
| `priorityClassOverprovision.name` | Name of the overprovision priorityClass | `overprovision` |
| `priorityClassOverprovision.value` | Priority value of the overprovision priorityClass | `-1` |
| `priorityClassDefault.enabled` | If true, enable default priorityClass | `true` |
| `priorityClassDefault.name` | Name of the default priorityClass | `default` |
| `priorityClassDefault.value` | Priority value of the default priorityClass | `0` |
| `image.repository` | Image repository | `k8s.gcr.io/pause`|
| `image.tag` | Image tag | `3.1` |
| `image.pullPolicy` | Container pull policy | `IfNotPresent` |
| `fullnameOverride` | Override the fullname of the chart | `nil` |
| `nameOverride` | Override the name of the chart | `nil` |
| `deployments` | Define optional additional deployments | `[]` |
| `deployments[].name` | Name for additional deployments | `` |
| `deployments[].replicaCount` | Number of replicas | `1` |
| `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 | `[]` |
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:
@@ -1,4 +1,4 @@
additionalDeployments:
deployments:
- name: ci-test1
replicaCount: 1
nodeSelector: {}
@@ -1,40 +0,0 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "cluster-overprovisioner.fullname" . }}
labels:
app.kubernetes.io/name: {{ include "cluster-overprovisioner.name" . }}
helm.sh/chart: {{ include "cluster-overprovisioner.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
app.kubernetes.io/name: {{ include "cluster-overprovisioner.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
template:
metadata:
labels:
app.kubernetes.io/name: {{ include "cluster-overprovisioner.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
spec:
priorityClassName: {{ .Values.priorityClassOverprovision.name }}
containers:
- name: {{ .Chart.Name }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
resources:
{{- toYaml .Values.resources | nindent 12 }}
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
@@ -9,7 +9,7 @@
{{- $imageTag := .Values.image.tag }}
{{- $pullPolicy := .Values.image.pullPolicy }}
{{ range .Values.additionalDeployments }}
{{ range .Values.deployments }}
apiVersion: apps/v1
kind: Deployment
metadata:
+7 -11
View File
@@ -7,10 +7,6 @@ priorityClassDefault:
name: default
value: 0
replicaCount: 1
resources: {}
image:
repository: k8s.gcr.io/pause
tag: 3.1
@@ -20,10 +16,10 @@ nameOverride: ""
fullnameOverride: ""
nodeSelector: {}
tolerations: []
affinity: {}
additionalDeployments: []
deployments: []
# - name: default
# replicaCount: 1
# nodeSelector: {}
# resources: {}
# tolerations: []
# affinity: {}