.gitlab-ci.yml

@@ -9,10 +9,10 @@ include:
     ref: 'master'
     file: '/templates/validation.yml'
   - project: 'to-be-continuous/bash'
-    ref: '2.1.1'
+    ref: '3.1.0'
     file: 'templates/gitlab-ci-bash.yml'
   - project: 'to-be-continuous/semantic-release'
-    ref: '2.3.1'
+    ref: '3.2.0'
     file: '/templates/gitlab-ci-semrel.yml'
 
 stages:

CHANGELOG.md

+# [2.1.0](https://gitlab.com/to-be-continuous/openshift/compare/2.0.0...2.1.0) (2022-12-13)
+
+
+### Features
+
+* **vault:** configurable Vault Secrets Provider image ([ba0cfa0](https://gitlab.com/to-be-continuous/openshift/commit/ba0cfa098242b72012fdf75940d7feb968cbb4b5))
+
 # [2.0.0](https://gitlab.com/to-be-continuous/openshift/compare/1.4.0...2.0.0) (2022-08-05)
 
 

README.md

@@ -57,7 +57,7 @@ In order to include this template in your project, add the following to your `gi
 ```yaml
 include:
   - project: 'to-be-continuous/openshift'
-    ref: '2.0.0'
+    ref: '2.1.0'
     file: '/templates/gitlab-ci-openshift.yml'
 ```
 
@@ -433,6 +433,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** |
@@ -458,11 +459,11 @@ With:
 include:
   # main template
   - project: 'to-be-continuous/openshift'
-    ref: '2.0.0'
+    ref: '2.1.0'
     file: '/templates/gitlab-ci-openshift.yml'
   # Vault variant
   - project: 'to-be-continuous/openshift'
-    ref: '2.0.0'
+    ref: '2.1.0'
     file: '/templates/gitlab-ci-openshift-vault.yml'
 
 variables:
@@ -488,7 +489,7 @@ variables:
 ```yaml
 include:
   - project: 'to-be-continuous/openshift'
-    ref: '2.0.0' 
+    ref: '2.1.0' 
     file: '/templates/gitlab-ci-openshift.yml'
 
 variables:

kicker.json

@@ -206,6 +206,12 @@
       "description": "Retrieve secrets from a [Vault](https://www.vaultproject.io/) server",
       "template_path": "templates/gitlab-ci-openshift-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"

templates/gitlab-ci-openshift-vault.yml

@@ -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"
@@ -9,6 +11,6 @@ variables:
 .os-base:
   services:
     - name: "$TBC_TRACKING_IMAGE"
-      command: ["--service", "openshift", "2.0.0" ]
-    - name: "$CI_REGISTRY/to-be-continuous/tools/vault-secrets-provider:master"
+      command: ["--service", "openshift", "2.1.0" ]
+    - name: "$TBC_VAULT_IMAGE"
       alias: "vault-secrets-provider"

templates/gitlab-ci-openshift.yml

@@ -572,7 +572,7 @@ stages:
   image: $OS_CLI_IMAGE
   services:
     - name: "$TBC_TRACKING_IMAGE"
-      command: ["--service", "openshift", "2.0.0" ]
+      command: ["--service", "openshift", "2.1.0" ]
   before_script:
     - *os-scripts
     - install_ca_certs "${CUSTOM_CA_CERTS:-$DEFAULT_CA_CERTS}"