Rename vcsSecretsName to vcsSecretName (#14196)

Signed-off-by: Wilfrido Vidana <wvidanas@gmail.com>
This commit is contained in:
Wilfrido Vidana
2019-05-31 12:40:25 -07:00
committed by Kubernetes Prow Robot
parent bac94b197c
commit b510a0c3aa
6 changed files with 14 additions and 14 deletions
+1 -1
View File
@@ -2,7 +2,7 @@ apiVersion: v1
appVersion: "v0.7.1"
description: A Helm chart for Atlantis https://www.runatlantis.io
name: atlantis
version: 3.5.1
version: 3.5.2
keywords:
- terraform
home: https://www.runatlantis.io
+2 -2
View File
@@ -16,7 +16,7 @@ In order for Atlantis to start and run successfully:
- `bitbucket`
Refer to [values.yaml](values.yaml) for detailed examples.
They can also be provided directly through a Kubernetes `Secret`, use the variable `vcsSecretsName` to reference it.
They can also be provided directly through a Kubernetes `Secret`, use the variable `vcsSecretName` to reference it.
1. Supply a value for `orgWhitelist`, e.g. `github.org/myorg/*`.
@@ -45,7 +45,7 @@ The following options are supported. See [values.yaml](values.yaml) for more de
| `gitlab.token` | Personal access token for the Atlantis GitLab user. | n/a |
| `gitlab.secret` | Webhook secret for the Atlantis GitLab integration. All repositories in GitLab that are to be integrated with Atlantis must share the same value. | n/a |
| `gitlab.hostname` | Hostname of your GitLab Enterprise installation. | n/a |
| `vcsSecretsName` | Name of a pre-existing Kubernetes `Secret` containing `token` and `secret` keys set to your VCS provider's API token and webhook secret, respectively. Use this instead of `github.token`/`github.secret`, etc. (optional) | n/a |
| `vcsSecretName` | Name of a pre-existing Kubernetes `Secret` containing `token` and `secret` keys set to your VCS provider's API token and webhook secret, respectively. Use this instead of `github.token`/`github.secret`, etc. (optional) | n/a |
| `podTemplate.annotations` | Additional annotations to use for the StatefulSet. | n/a |
| `logLevel` | Level to use for logging. Either debug, info, warn, or error. | n/a |
| `orgWhiteList` | Whitelist of repositories from which Atlantis will accept webhooks. **This value must be set for Atlantis to function correctly.** Accepts wildcard characters (`*`). Multiple values may be comma-separated. | none |
+3 -3
View File
@@ -63,9 +63,9 @@ Defines the internal kubernetes address to Atlantis
{{/*
Generates secret-webhook name
*/}}
{{- define "atlantis.vcsSecretsName" -}}
{{- if .Values.vcsSecretsName -}}
{{ .Values.vcsSecretsName }}
{{- define "atlantis.vcsSecretName" -}}
{{- if .Values.vcsSecretName -}}
{{ .Values.vcsSecretName }}
{{- else -}}
{{ template "atlantis.fullname" . }}-webhook
{{- end -}}
@@ -1,4 +1,4 @@
{{- if not .Values.vcsSecretsName }}
{{- if not .Values.vcsSecretName }}
apiVersion: v1
kind: Secret
metadata:
+6 -6
View File
@@ -129,12 +129,12 @@ spec:
- name: ATLANTIS_GH_TOKEN
valueFrom:
secretKeyRef:
name: {{ template "atlantis.vcsSecretsName" . }}
name: {{ template "atlantis.vcsSecretName" . }}
key: github_token
- name: ATLANTIS_GH_WEBHOOK_SECRET
valueFrom:
secretKeyRef:
name: {{ template "atlantis.vcsSecretsName" . }}
name: {{ template "atlantis.vcsSecretName" . }}
key: github_secret
{{- if .Values.github.hostname }}
- name: ATLANTIS_GH_HOSTNAME
@@ -147,12 +147,12 @@ spec:
- name: ATLANTIS_GITLAB_TOKEN
valueFrom:
secretKeyRef:
name: {{ template "atlantis.vcsSecretsName" . }}
name: {{ template "atlantis.vcsSecretName" . }}
key: gitlab_token
- name: ATLANTIS_GITLAB_WEBHOOK_SECRET
valueFrom:
secretKeyRef:
name: {{ template "atlantis.vcsSecretsName" . }}
name: {{ template "atlantis.vcsSecretName" . }}
key: gitlab_secret
{{- if .Values.gitlab.hostname }}
- name: ATLANTIS_GITLAB_HOSTNAME
@@ -165,7 +165,7 @@ spec:
- name: ATLANTIS_BITBUCKET_TOKEN
valueFrom:
secretKeyRef:
name: {{ template "atlantis.vcsSecretsName" . }}
name: {{ template "atlantis.vcsSecretName" . }}
key: bitbucket_token
{{- if .Values.bitbucket.baseURL }}
- name: ATLANTIS_BITBUCKET_BASE_URL
@@ -173,7 +173,7 @@ spec:
- name: ATLANTIS_BITBUCKET_WEBHOOK_SECRET
valueFrom:
secretKeyRef:
name: {{ template "atlantis.vcsSecretsName" . }}
name: {{ template "atlantis.vcsSecretName" . }}
key: bitbucket_secret
{{- end }}
{{- end }}
+1 -1
View File
@@ -38,7 +38,7 @@ orgWhitelist: <replace-me>
# (The chart will perform the base64 encoding for you for values that are stored in secrets.)
# If managing secrets outside the chart for the webhook, use this variable to reference the secret name
# vcsSecretsName: 'mysecret'
# vcsSecretName: 'mysecret'
# When referencing Terraform modules in private repositories, it may be helpful
# (necessary?) to use redirection in a .gitconfig like so: