diff --git a/.gitlab/README.md.template b/.gitlab/README.md.template index 2120dba08024c808a71cb3853c909daa041965e8..8bbc4cc24fd7c29ddd6b82bc82c1fa40fe75d477 100644 --- a/.gitlab/README.md.template +++ b/.gitlab/README.md.template @@ -235,10 +235,10 @@ and as the `version` input. Check out the [Usage](#Usage) section for examples. Each component release deploys the following images: -- `$CI_REGISTRY/components/opentofu/gitlab-opentofu:<VERSION>-opentofu<OPENTOFU_VERSION>` -- `$CI_REGISTRY/components/opentofu/gitlab-opentofu:<VERSION>-opentofu` +- `$CI_TEMPLATE_REGISTRY_HOST/components/opentofu/gitlab-opentofu:<VERSION>-opentofu<OPENTOFU_VERSION>` +- `$CI_TEMPLATE_REGISTRY_HOST/components/opentofu/gitlab-opentofu:<VERSION>-opentofu` - Includes the latest stable OpenTofu version at the time of releasing the component -- `$CI_REGISTRY/components/opentofu/gitlab-opentofu:<VERSION>` +- `$CI_TEMPLATE_REGISTRY_HOST/components/opentofu/gitlab-opentofu:<VERSION>` - Includes the latest stable OpenTofu version at the time of releasing the component In the above examples `<VERSION>` references the component version and `<OPENTOFU_VERSION>` diff --git a/README.md b/README.md index 9d5fcd40fdd6f43c06e5b47ab352e291c47c032e..fa5b763b472901e9d4ae91b64f13f0fa68f63193 100644 --- a/README.md +++ b/README.md @@ -176,7 +176,7 @@ Have a look at the individual template spec to learn about the available inputs. | `stage_cleanup` | `cleanup` | Defines the cleanup stage. This stage includes the `destroy` and `delete-state` jobs. | | `version` | `latest` | Version of this component. Has to be the same as the one in the component include entry. | | `opentofu_version` | `1.7.2` | OpenTofu version that should be used. Must be one of `1.7.2`, `1.7.1`, `1.7.0`, `1.7.0-alpha1`, `1.6.2`, `1.6.1`, `1.6.0`. | -| `image_registry_base` | `$CI_REGISTRY/components/opentofu` | Host URI to the job images. Will be combined with `image_name` to construct the actual image URI. | +| `image_registry_base` | `$CI_TEMPLATE_REGISTRY_HOST/components/opentofu` | Host URI to the job images. Will be combined with `image_name` to construct the actual image URI. | | `image_name` | `gitlab-opentofu` | Image name for the job images. Hosted under `image_registry_base`. | | `root_dir` | `${CI_PROJECT_DIR}` | Root directory for the OpenTofu project. | | `state_name` | `default` | Remote OpenTofu state name. | @@ -262,10 +262,10 @@ and as the `version` input. Check out the [Usage](#Usage) section for examples. Each component release deploys the following images: -- `$CI_REGISTRY/components/opentofu/gitlab-opentofu:<VERSION>-opentofu<OPENTOFU_VERSION>` -- `$CI_REGISTRY/components/opentofu/gitlab-opentofu:<VERSION>-opentofu` +- `$CI_TEMPLATE_REGISTRY_HOST/components/opentofu/gitlab-opentofu:<VERSION>-opentofu<OPENTOFU_VERSION>` +- `$CI_TEMPLATE_REGISTRY_HOST/components/opentofu/gitlab-opentofu:<VERSION>-opentofu` - Includes the latest stable OpenTofu version at the time of releasing the component -- `$CI_REGISTRY/components/opentofu/gitlab-opentofu:<VERSION>` +- `$CI_TEMPLATE_REGISTRY_HOST/components/opentofu/gitlab-opentofu:<VERSION>` - Includes the latest stable OpenTofu version at the time of releasing the component In the above examples `<VERSION>` references the component version and `<OPENTOFU_VERSION>` diff --git a/templates/apply.yml b/templates/apply.yml index a660401c3b7e1a5352747f95c4af9fdc5d01fa70..0dca33a1300cf7dc4b29334bcbdb1c4f4d8e0ef9 100644 --- a/templates/apply.yml +++ b/templates/apply.yml @@ -30,14 +30,14 @@ spec: # Images image_registry_base: - default: '$CI_REGISTRY/components/opentofu' + default: '$CI_TEMPLATE_REGISTRY_HOST/components/opentofu' description: 'Host URI to the job images. Will be combined with `image_name` to construct the actual image URI.' # FIXME: not yet possible because of https://gitlab.com/gitlab-org/gitlab/-/issues/438722 # gitlab_opentofu_image: # # FIXME: This should reference the component tag that is used. # # Currently, blocked by https://gitlab.com/gitlab-org/gitlab/-/issues/438275 - # # default: '$CI_REGISTRY/components/opentofu/gitlab-opentofu:$[[ inputs.opentofu_version ]]' - # default: '$CI_REGISTRY/components/opentofu/gitlab-opentofu:$[[ inputs.version ]]-opentofu$[[ inputs.opentofu_version ]]' + # # default: '$CI_TEMPLATE_REGISTRY_HOST/components/opentofu/gitlab-opentofu:$[[ inputs.opentofu_version ]]' + # default: '$CI_TEMPLATE_REGISTRY_HOST/components/opentofu/gitlab-opentofu:$[[ inputs.version ]]-opentofu$[[ inputs.opentofu_version ]]' # description: 'Tag of the gitlab-opentofu image.' image_name: diff --git a/templates/custom-command.yml b/templates/custom-command.yml index 3ac56360024497fd878505e3bd2128506777b5a9..ca21089c885f1bff61efcd26ccb75e8491c2c029 100644 --- a/templates/custom-command.yml +++ b/templates/custom-command.yml @@ -30,14 +30,14 @@ spec: # Images image_registry_base: - default: '$CI_REGISTRY/components/opentofu' + default: '$CI_TEMPLATE_REGISTRY_HOST/components/opentofu' description: 'Host URI to the job images. Will be combined with `image_name` to construct the actual image URI.' # FIXME: not yet possible because of https://gitlab.com/gitlab-org/gitlab/-/issues/438722 # gitlab_opentofu_image: # # FIXME: This should reference the component tag that is used. # # Currently, blocked by https://gitlab.com/gitlab-org/gitlab/-/issues/438275 - # # default: '$CI_REGISTRY/components/opentofu/gitlab-opentofu:$[[ inputs.opentofu_version ]]' - # default: '$CI_REGISTRY/components/opentofu/gitlab-opentofu:$[[ inputs.version ]]-opentofu$[[ inputs.opentofu_version ]]' + # # default: '$CI_TEMPLATE_REGISTRY_HOST/components/opentofu/gitlab-opentofu:$[[ inputs.opentofu_version ]]' + # default: '$CI_TEMPLATE_REGISTRY_HOST/components/opentofu/gitlab-opentofu:$[[ inputs.version ]]-opentofu$[[ inputs.opentofu_version ]]' # description: 'Tag of the gitlab-opentofu image.' image_name: diff --git a/templates/destroy.yml b/templates/destroy.yml index 9422858cdd3e0909c2db8bfcf1d25419752b6615..d444793f8c5d5ce310339e4b113356984a556d1b 100644 --- a/templates/destroy.yml +++ b/templates/destroy.yml @@ -30,14 +30,14 @@ spec: # Images image_registry_base: - default: '$CI_REGISTRY/components/opentofu' + default: '$CI_TEMPLATE_REGISTRY_HOST/components/opentofu' description: 'Host URI to the job images. Will be combined with `image_name` to construct the actual image URI.' # FIXME: not yet possible because of https://gitlab.com/gitlab-org/gitlab/-/issues/438722 # gitlab_opentofu_image: # # FIXME: This should reference the component tag that is used. # # Currently, blocked by https://gitlab.com/gitlab-org/gitlab/-/issues/438275 - # # default: '$CI_REGISTRY/components/opentofu/gitlab-opentofu:$[[ inputs.opentofu_version ]]' - # default: '$CI_REGISTRY/components/opentofu/gitlab-opentofu:$[[ inputs.version ]]-opentofu$[[ inputs.opentofu_version ]]' + # # default: '$CI_TEMPLATE_REGISTRY_HOST/components/opentofu/gitlab-opentofu:$[[ inputs.opentofu_version ]]' + # default: '$CI_TEMPLATE_REGISTRY_HOST/components/opentofu/gitlab-opentofu:$[[ inputs.version ]]-opentofu$[[ inputs.opentofu_version ]]' # description: 'Tag of the gitlab-opentofu image.' image_name: diff --git a/templates/fmt.yml b/templates/fmt.yml index fe8ff9c7a3be35ec3537f6f112d5e4dd53c5e291..a14d672c8f8a0c96fd6374e6829acf35be5893d0 100644 --- a/templates/fmt.yml +++ b/templates/fmt.yml @@ -30,14 +30,14 @@ spec: # Images image_registry_base: - default: '$CI_REGISTRY/components/opentofu' + default: '$CI_TEMPLATE_REGISTRY_HOST/components/opentofu' description: 'Host URI to the job images. Will be combined with `image_name` to construct the actual image URI.' # FIXME: not yet possible because of https://gitlab.com/gitlab-org/gitlab/-/issues/438722 # gitlab_opentofu_image: # # FIXME: This should reference the component tag that is used. # # Currently, blocked by https://gitlab.com/gitlab-org/gitlab/-/issues/438275 - # # default: '$CI_REGISTRY/components/opentofu/gitlab-opentofu:$[[ inputs.opentofu_version ]]' - # default: '$CI_REGISTRY/components/opentofu/gitlab-opentofu:$[[ inputs.version ]]-opentofu$[[ inputs.opentofu_version ]]' + # # default: '$CI_TEMPLATE_REGISTRY_HOST/components/opentofu/gitlab-opentofu:$[[ inputs.opentofu_version ]]' + # default: '$CI_TEMPLATE_REGISTRY_HOST/components/opentofu/gitlab-opentofu:$[[ inputs.version ]]-opentofu$[[ inputs.opentofu_version ]]' # description: 'Tag of the gitlab-opentofu image.' image_name: diff --git a/templates/full-pipeline.yml b/templates/full-pipeline.yml index 1fcfeb259ac8488cc9debb69bcc9765ce31efec7..f7d90d0b5b4ae46bc6f5ab08ada0df84be2df5ac 100644 --- a/templates/full-pipeline.yml +++ b/templates/full-pipeline.yml @@ -39,14 +39,14 @@ spec: # Images image_registry_base: - default: '$CI_REGISTRY/components/opentofu' + default: '$CI_TEMPLATE_REGISTRY_HOST/components/opentofu' description: 'Host URI to the job images. Will be combined with `image_name` to construct the actual image URI.' # FIXME: not yet possible because of https://gitlab.com/gitlab-org/gitlab/-/issues/438722 # gitlab_opentofu_image: # # FIXME: This should reference the component tag that is used. # # Currently, blocked by https://gitlab.com/gitlab-org/gitlab/-/issues/438275 - # # default: '$CI_REGISTRY/components/opentofu/gitlab-opentofu:$[[ inputs.opentofu_version ]]' - # default: '$CI_REGISTRY/components/opentofu/gitlab-opentofu:$[[ inputs.version ]]-opentofu$[[ inputs.opentofu_version ]]' + # # default: '$CI_TEMPLATE_REGISTRY_HOST/components/opentofu/gitlab-opentofu:$[[ inputs.opentofu_version ]]' + # default: '$CI_TEMPLATE_REGISTRY_HOST/components/opentofu/gitlab-opentofu:$[[ inputs.version ]]-opentofu$[[ inputs.opentofu_version ]]' # description: 'Tag of the gitlab-opentofu image.' image_name: diff --git a/templates/graph.yml b/templates/graph.yml index bb39c8ce553f5bfb3a1684f5e144b9ef955686f4..96ed04e131f4e9eabb28e21b00ec8684167e954d 100644 --- a/templates/graph.yml +++ b/templates/graph.yml @@ -30,14 +30,14 @@ spec: # Images image_registry_base: - default: '$CI_REGISTRY/components/opentofu' + default: '$CI_TEMPLATE_REGISTRY_HOST/components/opentofu' description: 'Host URI to the job images. Will be combined with `image_name` to construct the actual image URI.' # FIXME: not yet possible because of https://gitlab.com/gitlab-org/gitlab/-/issues/438722 # gitlab_opentofu_image: # # FIXME: This should reference the component tag that is used. # # Currently, blocked by https://gitlab.com/gitlab-org/gitlab/-/issues/438275 - # # default: '$CI_REGISTRY/components/opentofu/gitlab-opentofu:$[[ inputs.opentofu_version ]]' - # default: '$CI_REGISTRY/components/opentofu/gitlab-opentofu:$[[ inputs.version ]]-opentofu$[[ inputs.opentofu_version ]]' + # # default: '$CI_TEMPLATE_REGISTRY_HOST/components/opentofu/gitlab-opentofu:$[[ inputs.opentofu_version ]]' + # default: '$CI_TEMPLATE_REGISTRY_HOST/components/opentofu/gitlab-opentofu:$[[ inputs.version ]]-opentofu$[[ inputs.opentofu_version ]]' # description: 'Tag of the gitlab-opentofu image.' image_name: diff --git a/templates/job-templates.yml b/templates/job-templates.yml index 394637ccef53883874c8e6e7da05f310e346d928..8e3c507697a791a8dc45de5d7c74a7edd73fd9c0 100644 --- a/templates/job-templates.yml +++ b/templates/job-templates.yml @@ -39,14 +39,14 @@ spec: # Images image_registry_base: - default: '$CI_REGISTRY/components/opentofu' + default: '$CI_TEMPLATE_REGISTRY_HOST/components/opentofu' description: 'Host URI to the job images. Will be combined with `image_name` to construct the actual image URI.' # FIXME: not yet possible because of https://gitlab.com/gitlab-org/gitlab/-/issues/438722 # gitlab_opentofu_image: # # FIXME: This should reference the component tag that is used. # # Currently, blocked by https://gitlab.com/gitlab-org/gitlab/-/issues/438275 - # # default: '$CI_REGISTRY/components/opentofu/gitlab-opentofu:$[[ inputs.opentofu_version ]]' - # default: '$CI_REGISTRY/components/opentofu/gitlab-opentofu:$[[ inputs.version ]]-opentofu$[[ inputs.opentofu_version ]]' + # # default: '$CI_TEMPLATE_REGISTRY_HOST/components/opentofu/gitlab-opentofu:$[[ inputs.opentofu_version ]]' + # default: '$CI_TEMPLATE_REGISTRY_HOST/components/opentofu/gitlab-opentofu:$[[ inputs.version ]]-opentofu$[[ inputs.opentofu_version ]]' # description: 'Tag of the gitlab-opentofu image.' image_name: diff --git a/templates/plan.yml b/templates/plan.yml index 5509b16c4c1dc5e3ed9a4e8b954ba454763b336c..6c73d5b0053d347affb57d79576d5490ed511caf 100644 --- a/templates/plan.yml +++ b/templates/plan.yml @@ -30,14 +30,14 @@ spec: # Images image_registry_base: - default: '$CI_REGISTRY/components/opentofu' + default: '$CI_TEMPLATE_REGISTRY_HOST/components/opentofu' description: 'Host URI to the job images. Will be combined with `image_name` to construct the actual image URI.' # FIXME: not yet possible because of https://gitlab.com/gitlab-org/gitlab/-/issues/438722 # gitlab_opentofu_image: # # FIXME: This should reference the component tag that is used. # # Currently, blocked by https://gitlab.com/gitlab-org/gitlab/-/issues/438275 - # # default: '$CI_REGISTRY/components/opentofu/gitlab-opentofu:$[[ inputs.opentofu_version ]]' - # default: '$CI_REGISTRY/components/opentofu/gitlab-opentofu:$[[ inputs.version ]]-opentofu$[[ inputs.opentofu_version ]]' + # # default: '$CI_TEMPLATE_REGISTRY_HOST/components/opentofu/gitlab-opentofu:$[[ inputs.opentofu_version ]]' + # default: '$CI_TEMPLATE_REGISTRY_HOST/components/opentofu/gitlab-opentofu:$[[ inputs.version ]]-opentofu$[[ inputs.opentofu_version ]]' # description: 'Tag of the gitlab-opentofu image.' image_name: diff --git a/templates/test.yml b/templates/test.yml index e98dac606acb78dd3e8668780491a76190a942fe..97366222aa9ef472b005355935a208eed149b932 100644 --- a/templates/test.yml +++ b/templates/test.yml @@ -30,14 +30,14 @@ spec: # Images image_registry_base: - default: '$CI_REGISTRY/components/opentofu' + default: '$CI_TEMPLATE_REGISTRY_HOST/components/opentofu' description: 'Host URI to the job images. Will be combined with `image_name` to construct the actual image URI.' # FIXME: not yet possible because of https://gitlab.com/gitlab-org/gitlab/-/issues/438722 # gitlab_opentofu_image: # # FIXME: This should reference the component tag that is used. # # Currently, blocked by https://gitlab.com/gitlab-org/gitlab/-/issues/438275 - # # default: '$CI_REGISTRY/components/opentofu/gitlab-opentofu:$[[ inputs.opentofu_version ]]' - # default: '$CI_REGISTRY/components/opentofu/gitlab-opentofu:$[[ inputs.version ]]-opentofu$[[ inputs.opentofu_version ]]' + # # default: '$CI_TEMPLATE_REGISTRY_HOST/components/opentofu/gitlab-opentofu:$[[ inputs.opentofu_version ]]' + # default: '$CI_TEMPLATE_REGISTRY_HOST/components/opentofu/gitlab-opentofu:$[[ inputs.version ]]-opentofu$[[ inputs.opentofu_version ]]' # description: 'Tag of the gitlab-opentofu image.' image_name: diff --git a/templates/validate-plan-apply.yml b/templates/validate-plan-apply.yml index 7448a5210d9e00610132412e021e732e40a0abe4..8946b01ed9e9aeca102ed5961794617d9405ddf4 100644 --- a/templates/validate-plan-apply.yml +++ b/templates/validate-plan-apply.yml @@ -33,14 +33,14 @@ spec: # Images image_registry_base: - default: '$CI_REGISTRY/components/opentofu' + default: '$CI_TEMPLATE_REGISTRY_HOST/components/opentofu' description: 'Host URI to the job images. Will be combined with `image_name` to construct the actual image URI.' # FIXME: not yet possible because of https://gitlab.com/gitlab-org/gitlab/-/issues/438722 # gitlab_opentofu_image: # # FIXME: This should reference the component tag that is used. # # Currently, blocked by https://gitlab.com/gitlab-org/gitlab/-/issues/438275 - # # default: '$CI_REGISTRY/components/opentofu/gitlab-opentofu:$[[ inputs.opentofu_version ]]' - # default: '$CI_REGISTRY/components/opentofu/gitlab-opentofu:$[[ inputs.version ]]-opentofu$[[ inputs.opentofu_version ]]' + # # default: '$CI_TEMPLATE_REGISTRY_HOST/components/opentofu/gitlab-opentofu:$[[ inputs.opentofu_version ]]' + # default: '$CI_TEMPLATE_REGISTRY_HOST/components/opentofu/gitlab-opentofu:$[[ inputs.version ]]-opentofu$[[ inputs.opentofu_version ]]' # description: 'Tag of the gitlab-opentofu image.' image_name: diff --git a/templates/validate-plan-destroy.yml b/templates/validate-plan-destroy.yml index c611e8259c01c38b4b60fd6ed6cfae016a70d152..f61b4c19ceb88a0fa310631af1f6beab2fa1c2e5 100644 --- a/templates/validate-plan-destroy.yml +++ b/templates/validate-plan-destroy.yml @@ -33,14 +33,14 @@ spec: # Images image_registry_base: - default: '$CI_REGISTRY/components/opentofu' + default: '$CI_TEMPLATE_REGISTRY_HOST/components/opentofu' description: 'Host URI to the job images. Will be combined with `image_name` to construct the actual image URI.' # FIXME: not yet possible because of https://gitlab.com/gitlab-org/gitlab/-/issues/438722 # gitlab_opentofu_image: # # FIXME: This should reference the component tag that is used. # # Currently, blocked by https://gitlab.com/gitlab-org/gitlab/-/issues/438275 - # # default: '$CI_REGISTRY/components/opentofu/gitlab-opentofu:$[[ inputs.opentofu_version ]]' - # default: '$CI_REGISTRY/components/opentofu/gitlab-opentofu:$[[ inputs.version ]]-opentofu$[[ inputs.opentofu_version ]]' + # # default: '$CI_TEMPLATE_REGISTRY_HOST/components/opentofu/gitlab-opentofu:$[[ inputs.opentofu_version ]]' + # default: '$CI_TEMPLATE_REGISTRY_HOST/components/opentofu/gitlab-opentofu:$[[ inputs.version ]]-opentofu$[[ inputs.opentofu_version ]]' # description: 'Tag of the gitlab-opentofu image.' image_name: diff --git a/templates/validate-plan.yml b/templates/validate-plan.yml index 305e8474ab4fc636a5a94eded4e5d8558431bba0..a5edc2aa51d91612f9257d12ccaac815392c83f9 100644 --- a/templates/validate-plan.yml +++ b/templates/validate-plan.yml @@ -30,14 +30,14 @@ spec: # Images image_registry_base: - default: '$CI_REGISTRY/components/opentofu' + default: '$CI_TEMPLATE_REGISTRY_HOST/components/opentofu' description: 'Host URI to the job images. Will be combined with `image_name` to construct the actual image URI.' # FIXME: not yet possible because of https://gitlab.com/gitlab-org/gitlab/-/issues/438722 # gitlab_opentofu_image: # # FIXME: This should reference the component tag that is used. # # Currently, blocked by https://gitlab.com/gitlab-org/gitlab/-/issues/438275 - # # default: '$CI_REGISTRY/components/opentofu/gitlab-opentofu:$[[ inputs.opentofu_version ]]' - # default: '$CI_REGISTRY/components/opentofu/gitlab-opentofu:$[[ inputs.version ]]-opentofu$[[ inputs.opentofu_version ]]' + # # default: '$CI_TEMPLATE_REGISTRY_HOST/components/opentofu/gitlab-opentofu:$[[ inputs.opentofu_version ]]' + # default: '$CI_TEMPLATE_REGISTRY_HOST/components/opentofu/gitlab-opentofu:$[[ inputs.version ]]-opentofu$[[ inputs.opentofu_version ]]' # description: 'Tag of the gitlab-opentofu image.' image_name: diff --git a/templates/validate.yml b/templates/validate.yml index 41f44a72b0b57e07fd4c6b455976dc1d37d1bed1..8ce6e44c21aac98bf62318b006dc49d2c1c3c807 100644 --- a/templates/validate.yml +++ b/templates/validate.yml @@ -30,14 +30,14 @@ spec: # Images image_registry_base: - default: '$CI_REGISTRY/components/opentofu' + default: '$CI_TEMPLATE_REGISTRY_HOST/components/opentofu' description: 'Host URI to the job images. Will be combined with `image_name` to construct the actual image URI.' # FIXME: not yet possible because of https://gitlab.com/gitlab-org/gitlab/-/issues/438722 # gitlab_opentofu_image: # # FIXME: This should reference the component tag that is used. # # Currently, blocked by https://gitlab.com/gitlab-org/gitlab/-/issues/438275 - # # default: '$CI_REGISTRY/components/opentofu/gitlab-opentofu:$[[ inputs.opentofu_version ]]' - # default: '$CI_REGISTRY/components/opentofu/gitlab-opentofu:$[[ inputs.version ]]-opentofu$[[ inputs.opentofu_version ]]' + # # default: '$CI_TEMPLATE_REGISTRY_HOST/components/opentofu/gitlab-opentofu:$[[ inputs.opentofu_version ]]' + # default: '$CI_TEMPLATE_REGISTRY_HOST/components/opentofu/gitlab-opentofu:$[[ inputs.version ]]-opentofu$[[ inputs.opentofu_version ]]' # description: 'Tag of the gitlab-opentofu image.' image_name: