From 7f23d067d8d703d9b146f05e6d9814818b3ebdc9 Mon Sep 17 00:00:00 2001 From: Timo Furrer <tfurrer@gitlab.com> Date: Mon, 13 May 2024 10:08:56 +0200 Subject: [PATCH] Support OpenTofu 1.7.1 --- .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 924ee46..398e9eb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,6 +52,7 @@ stages: .opentofu-versions: parallel: matrix: + - OPENTOFU_VERSION: '1.7.1' - OPENTOFU_VERSION: '1.7.0' - OPENTOFU_VERSION: '1.7.0-alpha1' - OPENTOFU_VERSION: '1.6.2' @@ -63,7 +64,7 @@ variables: DOCKER_DIND_IMAGE: "docker:26.1.0-dind" # OpenTofu variables - LATEST_OPENTOFU_VERSION: '1.7.0' + LATEST_OPENTOFU_VERSION: '1.7.1' # OpenTofu image build variables: PLATFORMS: linux/amd64,linux/arm64 diff --git a/README.md b/README.md index 575e425..acb6fdb 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.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`. | +| `opentofu_version` | `1.7.1` | OpenTofu version that should be used. Must be one of `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_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.1`](https://github.com/opentofu/opentofu/releases/tag/v1.7.1) - [`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) diff --git a/templates/apply.yml b/templates/apply.yml index fd3ac47..b4c321f 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.7.0' + default: '1.7.1' options: - '$OPENTOFU_VERSION' + - '1.7.1' - '1.7.0' - '1.7.0-alpha1' - '1.6.2' diff --git a/templates/custom-command.yml b/templates/custom-command.yml index 6a6ec53..f1f9f90 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.7.0' + default: '1.7.1' options: - '$OPENTOFU_VERSION' + - '1.7.1' - '1.7.0' - '1.7.0-alpha1' - '1.6.2' diff --git a/templates/destroy.yml b/templates/destroy.yml index c21b002..97cb736 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.7.0' + default: '1.7.1' options: - '$OPENTOFU_VERSION' + - '1.7.1' - '1.7.0' - '1.7.0-alpha1' - '1.6.2' diff --git a/templates/fmt.yml b/templates/fmt.yml index a321df0..57fa7b2 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.7.0' + default: '1.7.1' options: - '$OPENTOFU_VERSION' + - '1.7.1' - '1.7.0' - '1.7.0-alpha1' - '1.6.2' diff --git a/templates/full-pipeline.yml b/templates/full-pipeline.yml index b898931..ccc7b46 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.7.0' + default: '1.7.1' options: - '$OPENTOFU_VERSION' + - '1.7.1' - '1.7.0' - '1.7.0-alpha1' - '1.6.2' diff --git a/templates/job-templates.yml b/templates/job-templates.yml index df48d1b..e6a0fe8 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.7.0' + default: '1.7.1' options: - '$OPENTOFU_VERSION' + - '1.7.1' - '1.7.0' - '1.7.0-alpha1' - '1.6.2' diff --git a/templates/plan.yml b/templates/plan.yml index 4a59544..7441ebd 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.7.0' + default: '1.7.1' options: - '$OPENTOFU_VERSION' + - '1.7.1' - '1.7.0' - '1.7.0-alpha1' - '1.6.2' diff --git a/templates/test.yml b/templates/test.yml index 5de8c52..29767e4 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.7.0' + default: '1.7.1' options: - '$OPENTOFU_VERSION' + - '1.7.1' - '1.7.0' - '1.7.0-alpha1' - '1.6.2' diff --git a/templates/validate-plan-apply.yml b/templates/validate-plan-apply.yml index 7b8c8ec..5d670f5 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.7.0' + default: '1.7.1' options: - '$OPENTOFU_VERSION' + - '1.7.1' - '1.7.0' - '1.7.0-alpha1' - '1.6.2' diff --git a/templates/validate-plan.yml b/templates/validate-plan.yml index 9506905..2bd9f33 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.7.0' + default: '1.7.1' options: - '$OPENTOFU_VERSION' + - '1.7.1' - '1.7.0' - '1.7.0-alpha1' - '1.6.2' diff --git a/templates/validate.yml b/templates/validate.yml index 774971e..2b1b407 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.7.0' + default: '1.7.1' options: - '$OPENTOFU_VERSION' + - '1.7.1' - '1.7.0' - '1.7.0-alpha1' - '1.6.2' -- GitLab