Merge pull request #667 from travelaudience/helm-tolerations

HELM: add tolerations
This commit is contained in:
Jimmy Zelinskie 2018-12-19 13:49:22 -05:00 committed by GitHub
commit 3947073b9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 1 deletions

View File

@ -1,6 +1,6 @@
name: clair name: clair
home: https://coreos.com/clair home: https://coreos.com/clair
version: 0.1.0 version: 0.1.1
appVersion: 3.0.0-pre appVersion: 3.0.0-pre
description: Clair is an open source project for the static analysis of vulnerabilities in application containers. description: Clair is an open source project for the static analysis of vulnerabilities in application containers.
icon: https://cloud.githubusercontent.com/assets/343539/21630811/c5081e5c-d202-11e6-92eb-919d5999c77a.png icon: https://cloud.githubusercontent.com/assets/343539/21630811/c5081e5c-d202-11e6-92eb-919d5999c77a.png

View File

@ -21,6 +21,14 @@ spec:
- name: "{{ .Chart.Name }}-config" - name: "{{ .Chart.Name }}-config"
secret: secret:
secretName: {{ template "clair.fullname" . }} secretName: {{ template "clair.fullname" . }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{ toYaml .Values.nodeSelector | indent 8 }}
{{- end }}
{{- if .Values.tolerations }}
tolerations:
{{ toYaml .Values.tolerations | indent 8 }}
{{- end }}
containers: containers:
- name: {{ .Chart.Name }} - name: {{ .Chart.Name }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"

View File

@ -55,6 +55,9 @@ config:
- apk - apk
- dpkg - dpkg
- rpm - rpm
nodeSelector: {}
tolerations: []
# Configuration values for the postgresql dependency. # Configuration values for the postgresql dependency.
# ref: https://github.com/kubernetes/charts/blob/master/stable/postgresql/README.md # ref: https://github.com/kubernetes/charts/blob/master/stable/postgresql/README.md
postgresql: postgresql: