From b510a0c3aadebd846e583ed07fbcff3982ecd229 Mon Sep 17 00:00:00 2001 From: Wilfrido Vidana <4426659+wvidana@users.noreply.github.com> Date: Fri, 31 May 2019 14:40:25 -0500 Subject: [PATCH] Rename vcsSecretsName to vcsSecretName (#14196) Signed-off-by: Wilfrido Vidana --- stable/atlantis/Chart.yaml | 2 +- stable/atlantis/README.md | 4 ++-- stable/atlantis/templates/_helpers.tpl | 6 +++--- stable/atlantis/templates/secret-webhook.yaml | 2 +- stable/atlantis/templates/statefulset.yaml | 12 ++++++------ stable/atlantis/values.yaml | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/stable/atlantis/Chart.yaml b/stable/atlantis/Chart.yaml index 66abb8b5d0..f7f283071a 100644 --- a/stable/atlantis/Chart.yaml +++ b/stable/atlantis/Chart.yaml @@ -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 diff --git a/stable/atlantis/README.md b/stable/atlantis/README.md index 05ab2db2b6..882b774638 100644 --- a/stable/atlantis/README.md +++ b/stable/atlantis/README.md @@ -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 | diff --git a/stable/atlantis/templates/_helpers.tpl b/stable/atlantis/templates/_helpers.tpl index a55b7dce62..e4fe952486 100644 --- a/stable/atlantis/templates/_helpers.tpl +++ b/stable/atlantis/templates/_helpers.tpl @@ -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 -}} diff --git a/stable/atlantis/templates/secret-webhook.yaml b/stable/atlantis/templates/secret-webhook.yaml index 2797602679..706cbdcfb2 100644 --- a/stable/atlantis/templates/secret-webhook.yaml +++ b/stable/atlantis/templates/secret-webhook.yaml @@ -1,4 +1,4 @@ -{{- if not .Values.vcsSecretsName }} +{{- if not .Values.vcsSecretName }} apiVersion: v1 kind: Secret metadata: diff --git a/stable/atlantis/templates/statefulset.yaml b/stable/atlantis/templates/statefulset.yaml index 76a7907830..781b6bef98 100644 --- a/stable/atlantis/templates/statefulset.yaml +++ b/stable/atlantis/templates/statefulset.yaml @@ -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 }} diff --git a/stable/atlantis/values.yaml b/stable/atlantis/values.yaml index 36c35068ad..acd11e8199 100644 --- a/stable/atlantis/values.yaml +++ b/stable/atlantis/values.yaml @@ -38,7 +38,7 @@ orgWhitelist: # (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: