From 98e6be9582606dcdf7177c51e27cbaf9e0e7adf1 Mon Sep 17 00:00:00 2001 From: Marco Vito Moscaritolo Date: Tue, 28 May 2019 16:16:44 +0200 Subject: [PATCH] Expose docker registry secret credentials --- chart/keel/Chart.yaml | 2 +- chart/keel/README.md | 3 +++ chart/keel/templates/deployment.yaml | 7 +++++++ chart/keel/values.yaml | 5 +++++ 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/chart/keel/Chart.yaml b/chart/keel/Chart.yaml index e76beef3..121cea6d 100644 --- a/chart/keel/Chart.yaml +++ b/chart/keel/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: keel description: Open source, tool for automating Kubernetes deployment updates. Keel is stateless, robust and lightweight. -version: 0.8.0 +version: 0.8.1 # Note that we use appVersion to get images tag, so make sure this is correct. appVersion: 0.14.0 keywords: diff --git a/chart/keel/README.md b/chart/keel/README.md index fb24a63d..68322292 100644 --- a/chart/keel/README.md +++ b/chart/keel/README.md @@ -123,6 +123,9 @@ The following table lists has the main configurable parameters (polling, trigger | `basicauth.enabled` | Enable/disable Basic Auth on approvals | `false` | | `basicauth.user` | Basic Auth username | | | `basicauth.password` | Basic Auth password | | +| `dockerRegistry.enabled` | Docker registry secret enabled. | `false` | +| `dockerRegistry.name` | Docker registry secret name | | +| `dockerRegistry.key` | Docker registry secret key | | Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. diff --git a/chart/keel/templates/deployment.yaml b/chart/keel/templates/deployment.yaml index 6eb808b6..bef3e240 100644 --- a/chart/keel/templates/deployment.yaml +++ b/chart/keel/templates/deployment.yaml @@ -86,6 +86,13 @@ spec: - name: AWS_REGION value: "{{ .Values.ecr.region }}" {{- end }} +{{- if .Values.dockerRegistry.enabled }} + - name: DOCKER_REGISTRY_CFG + valueFrom: + secretKeyRef: + name: {{ .Values.dockerRegistry.name }} + key: {{ .Values.dockerRegistry.key }} +{{- end }} {{- if .Values.webhook.enabled }} # Enable webhook endpoint - name: WEBHOOK_ENDPOINT diff --git a/chart/keel/values.yaml b/chart/keel/values.yaml index d87f419d..19b52df7 100644 --- a/chart/keel/values.yaml +++ b/chart/keel/values.yaml @@ -171,3 +171,8 @@ gcloudIngress: enabled: false domains: - "" + +dockerRegistry: + enabled: false + name: "" + key: ""