diff --git a/README.md b/README.md index 6fdf337e51bbeae50c5f3516481c6ad7fe2074a7..3da492e2f9de32a329987d221c2a0c70cf1a09ee 100644 --- a/README.md +++ b/README.md @@ -439,7 +439,7 @@ In order to be able to communicate with the Vault server, the variant requires t | Input / Variable | 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` | +| `TBC_VAULT_IMAGE` | The [Vault Secrets Provider](https://gitlab.com/to-be-continuous/tools/vault-secrets-provider) image to use (can be overridden) | `registry.gitlab.com/to-be-continuous/tools/vault-secrets-provider:master` | | `vault-base-url` / `VAULT_BASE_URL` | The Vault server base API url | _none_ | | `vault-oidc-aud` / `VAULT_OIDC_AUD` | The `aud` claim for the JWT | `$CI_SERVER_URL` | | :lock: `VAULT_ROLE_ID` | The [AppRole](https://www.vaultproject.io/docs/auth/approle) RoleID | **must be defined** | diff --git a/kicker.json b/kicker.json index 0430580473aafd534c73787e7d884ee23f498fbb..50b76720a272b55ba1584312d2fc9ffbe90fdcca 100644 --- a/kicker.json +++ b/kicker.json @@ -264,7 +264,7 @@ { "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", + "default": "registry.gitlab.com/to-be-continuous/tools/vault-secrets-provider:master", "advanced": true }, { diff --git a/templates/gitlab-ci-python-vault.yml b/templates/gitlab-ci-python-vault.yml index cee0ab51e37ab3c2abb5e894589ec9c14564aa83..25202de3af91581aae3d3458bc13b5077fee662d 100644 --- a/templates/gitlab-ci-python-vault.yml +++ b/templates/gitlab-ci-python-vault.yml @@ -12,7 +12,7 @@ spec: --- variables: # variabilized vault-secrets-provider image - TBC_VAULT_IMAGE: $CI_REGISTRY/to-be-continuous/tools/vault-secrets-provider:master + TBC_VAULT_IMAGE: registry.gitlab.com/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" diff --git a/templates/gitlab-ci-python.yml b/templates/gitlab-ci-python.yml index 2619c6f64cb7a1f10fd719dee9d1908531cbf623..bc3f7f7f4ab0330d591e4a147f76cd7080e7aa93 100644 --- a/templates/gitlab-ci-python.yml +++ b/templates/gitlab-ci-python.yml @@ -198,7 +198,7 @@ workflow: variables: # variabilized tracking image - TBC_TRACKING_IMAGE: "$CI_REGISTRY/to-be-continuous/tools/tracking:master" + TBC_TRACKING_IMAGE: "registry.gitlab.com/to-be-continuous/tools/tracking:master" # Change pip's cache directory to be inside the project directory since we can # only cache local items.