[stable/concourse] Add support for encryption key (#1545)

* Support Concourse encryption key

* Bump chart version

* [stable/concourse] Bump version 0.3.2

* [stable/concourse] Add viglesiasce as maintainer

Also update frodenas to use GitHub ID
This commit is contained in:
Boaz Yaniv
2017-08-09 21:55:18 -07:00
committed by Vic Iglesias
parent af8f82de74
commit b41fbc8a62
4 changed files with 23 additions and 2 deletions
+4 -2
View File
@@ -1,5 +1,5 @@
name: concourse
version: 0.3.1
version: 0.3.2
description: Concourse is a simple and scalable CI system.
icon: https://avatars1.githubusercontent.com/u/7809479
keywords:
@@ -11,6 +11,8 @@ sources:
- https://github.com/concourse/bin
- https://github.com/kubernetes/charts
maintainers:
- name: Ferran Rodenas
- name: frodenas
email: frodenas@gmail.com
- name: viglesiasce
email: viglesias@google.com
engine: gotpl
+2
View File
@@ -27,3 +27,5 @@ data:
gitlab-auth-client-secret: {{ default "" .Values.concourse.gitlabAuthClientSecret | b64enc | quote }}
generic-oauth-client-id: {{ default "" .Values.concourse.genericOauthClientId | b64enc | quote }}
generic-oauth-client-secret: {{ default "" .Values.concourse.genericOauthClientSecret | b64enc | quote }}
encryption-key: {{ default "" .Values.concourse.encryptionKey | b64enc | quote }}
old-encryption-key: {{ default "" .Values.concourse.oldEncryptionKey | b64enc | quote }}
@@ -51,6 +51,20 @@ spec:
name: {{ template "concourse.fullname" . }}
key: postgresql-uri
{{ end }}
{{ if .Values.encryptionKey }}
- name: CONCOURSE_ENCRYPTION_KEY
valueFrom:
secretKeyRef:
name: {{ template "concourse.fullname" . }}
key: encryption-key
{{ end }}
{{ if .Values.oldEncryptionKey }}
- name: CONCOURSE_OLD_ENCRYPTION_KEY
valueFrom:
secretKeyRef:
name: {{ template "concourse.fullname" . }}
key: old-encryption-key
{{ end }}
- name: POD_IP
valueFrom:
fieldRef:
+3
View File
@@ -136,6 +136,9 @@ concourse:
workerKeyPub: |-
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC496FSYFcBAKgDtMsBAJiF/6/NxlXKP5UZecyEsedYuTt1GOgJTwaA1qZ1LmHsbfLDE68oDdiM4uvxfI4wtLhz57w3u0jOUxZ2JeF7SVwEf1nVqLn4Gh/f8GUNQGSyIp1zUD5Bx9fq0PAyQ47mt7Ufi84rcf8LKl7nzAIHTcdg2BvTkQN9bUGPaq/Pb1W2bKPAQy4OzXTSIyrAJ89TH2jFeaZfyxQFGbD9jVHH/yl0oiMrDeaRYgccE5II+KY7WoLjsBry/9Qf2ERELKTK4UeIGIqWci9lab1ti+GxFPPiC3krNFjo4jShV4eUs4cNIrjwNrxVaKPXmU6o7Y3Hpayx Concourse
oldEncryptionKey:
encryptionKey:
## ATC listen port.
## ref: https://concourse.ci/architecture.html
##