Skip to content
Snippets Groups Projects
Commit 9b4a8866 authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

Merge branch 'feat/configurable-vault-image' into 'master'

feat(vault): configurable Vault Secrets Provider images

See merge request to-be-continuous/docker!59
parents 3dd2cef5 96e2c5df
No related branches found
No related tags found
No related merge requests found
......@@ -518,6 +518,7 @@ In order to be able to communicate with the Vault server, the variant requires t
| Name | Description | Default value |
| ----------------- | -------------------------------------- | ----------------- |
| `TBC_VAULT_IMAGE` | The [Vault Secrets Provider](https://gitlab.com/to-be-continuous/tools/vault-secrets-provider) image to use (can be overridden) | `$CI_REGISTRY/to-be-continuous/tools/vault-secrets-provider:master` |
| `VAULT_BASE_URL` | The Vault server base API url | _none_ |
| :lock: `VAULT_ROLE_ID` | The [AppRole](https://www.vaultproject.io/docs/auth/approle) RoleID | **must be defined** |
| :lock: `VAULT_SECRET_ID` | The [AppRole](https://www.vaultproject.io/docs/auth/approle) SecretID | **must be defined** |
......
......@@ -206,6 +206,12 @@
"description": "Retrieve secrets from a [Vault](https://www.vaultproject.io/) server",
"template_path": "templates/gitlab-ci-docker-vault.yml",
"variables": [
{
"name": "TBC_VAULT_IMAGE",
"description": "The [Vault Secrets Provider](https://gitlab.com/to-be-continuous/tools/vault-secrets-provider) image to use",
"default": "$CI_REGISTRY/to-be-continuous/tools/vault-secrets-provider:master",
"advanced": true
},
{
"name": "VAULT_BASE_URL",
"description": "The Vault server base API url",
......
......@@ -2,6 +2,8 @@
# === Vault template variant
# =====================================================================================================================
variables:
# variabilized vault-secrets-provider image
TBC_VAULT_IMAGE: "$CI_REGISTRY/to-be-continuous/tools/vault-secrets-provider:master"
# variables have to be explicitly declared in the YAML to be exported to the service
VAULT_ROLE_ID: "$VAULT_ROLE_ID"
VAULT_SECRET_ID: "$VAULT_SECRET_ID"
......@@ -10,5 +12,5 @@ variables:
services:
- name: "$TBC_TRACKING_IMAGE"
command: ["--service", "docker", "3.4.0"]
- name: "$CI_REGISTRY/to-be-continuous/tools/vault-secrets-provider:master"
- name: "$TBC_VAULT_IMAGE"
alias: "vault-secrets-provider"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment