From 2cfdf582d96982fe6bd5618417083f0e4af84e43 Mon Sep 17 00:00:00 2001 From: Ben Brown <ben@demerara.io> Date: Mon, 13 May 2024 07:51:14 +0000 Subject: [PATCH] Add OpenTofu 1.7.0 --- .gitlab-ci.yml | 3 ++- README.md | 3 ++- templates/apply.yml | 3 ++- templates/custom-command.yml | 3 ++- templates/destroy.yml | 3 ++- templates/fmt.yml | 3 ++- templates/full-pipeline.yml | 3 ++- templates/job-templates.yml | 3 ++- templates/plan.yml | 3 ++- templates/test.yml | 3 ++- templates/validate-plan-apply.yml | 3 ++- templates/validate-plan.yml | 3 ++- templates/validate.yml | 3 ++- 13 files changed, 26 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ddb8e76..924ee46 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,6 +52,7 @@ stages: .opentofu-versions: parallel: matrix: + - OPENTOFU_VERSION: '1.7.0' - OPENTOFU_VERSION: '1.7.0-alpha1' - OPENTOFU_VERSION: '1.6.2' - OPENTOFU_VERSION: '1.6.1' @@ -62,7 +63,7 @@ variables: DOCKER_DIND_IMAGE: "docker:26.1.0-dind" # OpenTofu variables - LATEST_OPENTOFU_VERSION: '1.6.2' + LATEST_OPENTOFU_VERSION: '1.7.0' # OpenTofu image build variables: PLATFORMS: linux/amd64,linux/arm64 diff --git a/README.md b/README.md index 4dff8c7..575e425 100644 --- a/README.md +++ b/README.md @@ -182,7 +182,7 @@ Have a look at the individual template spec to learn about the available inputs. | `stage_deploy` | `deploy` | Defines the deploy stage. This stage includes the `apply` job. | | `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.6.2` | OpenTofu version that should be used. Must be one of `1.7.0-alpha1`, `1.6.2`, `1.6.1`, `1.6.0`. | +| `opentofu_version` | `1.7.0` | OpenTofu version that should be used. Must be one of `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_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. | @@ -194,6 +194,7 @@ Have a look at the individual template spec to learn about the available inputs. The following OpenTofu versions are available with this component via the `opentofu_version` input: +- [`1.7.0`](https://github.com/opentofu/opentofu/releases/tag/v1.7.0) - [`1.7.0-alpha1`](https://github.com/opentofu/opentofu/releases/tag/v1.7.0-alpha1) - [`1.6.2`](https://github.com/opentofu/opentofu/releases/tag/v1.6.2) - [`1.6.1`](https://github.com/opentofu/opentofu/releases/tag/v1.6.1) diff --git a/templates/apply.yml b/templates/apply.yml index 05a6447..fd3ac47 100644 --- a/templates/apply.yml +++ b/templates/apply.yml @@ -16,9 +16,10 @@ spec: description: 'Version of this component. Has to be the same as the one in the component include entry.' opentofu_version: - default: '1.6.2' + default: '1.7.0' options: - '$OPENTOFU_VERSION' + - '1.7.0' - '1.7.0-alpha1' - '1.6.2' - '1.6.1' diff --git a/templates/custom-command.yml b/templates/custom-command.yml index 75740aa..6a6ec53 100644 --- a/templates/custom-command.yml +++ b/templates/custom-command.yml @@ -16,9 +16,10 @@ spec: description: 'Version of this component. Has to be the same as the one in the component include entry.' opentofu_version: - default: '1.6.2' + default: '1.7.0' options: - '$OPENTOFU_VERSION' + - '1.7.0' - '1.7.0-alpha1' - '1.6.2' - '1.6.1' diff --git a/templates/destroy.yml b/templates/destroy.yml index aa0a3fa..c21b002 100644 --- a/templates/destroy.yml +++ b/templates/destroy.yml @@ -16,9 +16,10 @@ spec: description: 'Version of this component. Has to be the same as the one in the component include entry.' opentofu_version: - default: '1.6.2' + default: '1.7.0' options: - '$OPENTOFU_VERSION' + - '1.7.0' - '1.7.0-alpha1' - '1.6.2' - '1.6.1' diff --git a/templates/fmt.yml b/templates/fmt.yml index 89c51e1..a321df0 100644 --- a/templates/fmt.yml +++ b/templates/fmt.yml @@ -16,9 +16,10 @@ spec: description: 'Version of this component. Has to be the same as the one in the component include entry.' opentofu_version: - default: '1.6.2' + default: '1.7.0' options: - '$OPENTOFU_VERSION' + - '1.7.0' - '1.7.0-alpha1' - '1.6.2' - '1.6.1' diff --git a/templates/full-pipeline.yml b/templates/full-pipeline.yml index ef3451d..b898931 100644 --- a/templates/full-pipeline.yml +++ b/templates/full-pipeline.yml @@ -25,9 +25,10 @@ spec: description: 'Version of this component. Has to be the same as the one in the component include entry.' opentofu_version: - default: '1.6.2' + default: '1.7.0' options: - '$OPENTOFU_VERSION' + - '1.7.0' - '1.7.0-alpha1' - '1.6.2' - '1.6.1' diff --git a/templates/job-templates.yml b/templates/job-templates.yml index aa435d3..df48d1b 100644 --- a/templates/job-templates.yml +++ b/templates/job-templates.yml @@ -25,9 +25,10 @@ spec: description: 'Version of this component. Has to be the same as the one in the component include entry.' opentofu_version: - default: '1.6.2' + default: '1.7.0' options: - '$OPENTOFU_VERSION' + - '1.7.0' - '1.7.0-alpha1' - '1.6.2' - '1.6.1' diff --git a/templates/plan.yml b/templates/plan.yml index 94d029d..4a59544 100644 --- a/templates/plan.yml +++ b/templates/plan.yml @@ -16,9 +16,10 @@ spec: description: 'Version of this component. Has to be the same as the one in the component include entry.' opentofu_version: - default: '1.6.2' + default: '1.7.0' options: - '$OPENTOFU_VERSION' + - '1.7.0' - '1.7.0-alpha1' - '1.6.2' - '1.6.1' diff --git a/templates/test.yml b/templates/test.yml index 6749b36..5de8c52 100644 --- a/templates/test.yml +++ b/templates/test.yml @@ -16,9 +16,10 @@ spec: description: 'Version of this component. Has to be the same as the one in the component include entry.' opentofu_version: - default: '1.6.2' + default: '1.7.0' options: - '$OPENTOFU_VERSION' + - '1.7.0' - '1.7.0-alpha1' - '1.6.2' - '1.6.1' diff --git a/templates/validate-plan-apply.yml b/templates/validate-plan-apply.yml index aee7d89..7b8c8ec 100644 --- a/templates/validate-plan-apply.yml +++ b/templates/validate-plan-apply.yml @@ -19,9 +19,10 @@ spec: description: 'Version of this component. Has to be the same as the one in the component include entry.' opentofu_version: - default: '1.6.2' + default: '1.7.0' options: - '$OPENTOFU_VERSION' + - '1.7.0' - '1.7.0-alpha1' - '1.6.2' - '1.6.1' diff --git a/templates/validate-plan.yml b/templates/validate-plan.yml index 0caca76..9506905 100644 --- a/templates/validate-plan.yml +++ b/templates/validate-plan.yml @@ -16,9 +16,10 @@ spec: description: 'Version of this component. Has to be the same as the one in the component include entry.' opentofu_version: - default: '1.6.2' + default: '1.7.0' options: - '$OPENTOFU_VERSION' + - '1.7.0' - '1.7.0-alpha1' - '1.6.2' - '1.6.1' diff --git a/templates/validate.yml b/templates/validate.yml index dab203f..774971e 100644 --- a/templates/validate.yml +++ b/templates/validate.yml @@ -16,9 +16,10 @@ spec: description: 'Version of this component. Has to be the same as the one in the component include entry.' opentofu_version: - default: '1.6.2' + default: '1.7.0' options: - '$OPENTOFU_VERSION' + - '1.7.0' - '1.7.0-alpha1' - '1.6.2' - '1.6.1' -- GitLab