From fd5bb4694028b1b8d98ae7045204bbdb9a06b1da Mon Sep 17 00:00:00 2001
From: Timo Furrer <tfurrer@gitlab.com>
Date: Wed, 24 Jan 2024 16:43:01 +0100
Subject: [PATCH] Introduce OpenTofu 1.6.1
---
.gitlab-ci.yml | 3 ++-
.gitlab/README.md.template | 6 +++---
README.md | 9 +++++----
templates/apply.yml | 3 ++-
templates/destroy.yml | 3 ++-
templates/fmt.yml | 3 ++-
templates/full-pipeline.yml | 3 ++-
templates/plan.yml | 3 ++-
templates/validate-plan-apply.yml | 3 ++-
templates/validate.yml | 3 ++-
10 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d99450a..ac10e48 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,6 +42,7 @@ stages:
.opentofu-versions:
parallel:
matrix:
+ - OPENTOFU_VERSION: '1.6.1'
- OPENTOFU_VERSION: '1.6.0'
- OPENTOFU_VERSION: '1.6.0-rc1'
@@ -50,7 +51,7 @@ variables:
DOCKER_DIND_IMAGE: "docker:24.0.7-dind"
# OpenTofu variables
- LATEST_OPENTOFU_VERSION: '1.6.0'
+ LATEST_OPENTOFU_VERSION: '1.6.1'
# OpenTofu image build variables:
PLATFORMS: linux/amd64,linux/arm64
diff --git a/.gitlab/README.md.template b/.gitlab/README.md.template
index 73a6804..d69eb2e 100644
--- a/.gitlab/README.md.template
+++ b/.gitlab/README.md.template
@@ -49,7 +49,7 @@ include:
# to find the correctly associated images. # This can be removed
# once https://gitlab.com/gitlab-org/gitlab/-/issues/438275 is solved.
version: latest
- opentofu_version: 1.6.0
+ opentofu_version: 1.6.1
stages: [validate, build, deploy, cleanup]
@@ -63,7 +63,7 @@ include:
# to find the correctly associated images. # This can be removed
# once https://gitlab.com/gitlab-org/gitlab/-/issues/438275 is solved.
version: 0.0.0-alpha1
- opentofu_version: 1.6.0
+ opentofu_version: 1.6.1
stages: [validate, build, deploy, cleanup]
```
@@ -90,7 +90,7 @@ include:
# to find the correctly associated images. # This can be removed
# once https://gitlab.com/gitlab-org/gitlab/-/issues/438275 is solved.
version: latest
- opentofu_version: 1.6.0
+ opentofu_version: 1.6.1
root_dir: tofu/
```
diff --git a/README.md b/README.md
index 08835ac..059f8ec 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ include:
# to find the correctly associated images. # This can be removed
# once https://gitlab.com/gitlab-org/gitlab/-/issues/438275 is solved.
version: latest
- opentofu_version: 1.6.0
+ opentofu_version: 1.6.1
stages: [validate, build, deploy, cleanup]
@@ -65,7 +65,7 @@ include:
# to find the correctly associated images. # This can be removed
# once https://gitlab.com/gitlab-org/gitlab/-/issues/438275 is solved.
version: 0.0.0-alpha1
- opentofu_version: 1.6.0
+ opentofu_version: 1.6.1
stages: [validate, build, deploy, cleanup]
```
@@ -92,7 +92,7 @@ include:
# to find the correctly associated images. # This can be removed
# once https://gitlab.com/gitlab-org/gitlab/-/issues/438275 is solved.
version: latest
- opentofu_version: 1.6.0
+ opentofu_version: 1.6.1
root_dir: tofu/
```
@@ -118,7 +118,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.0` | OpenTofu version that should be used. Must be one of `1.6.0`, `1.6.0-rc1`. |
+| `opentofu_version` | `1.6.1` | OpenTofu version that should be used. Must be one of `1.6.1`, `1.6.0`, `1.6.0-rc1`. |
| `root_dir` | `${CI_PROJECT_DIR}` | Root directory for the OpenTofu project. |
| `state_name` | `default` | Remote OpenTofu state name. |
| `auto_apply` | `false` | Whether the apply job is manual or automatically run. |
@@ -130,6 +130,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.6.1`](https://github.com/opentofu/opentofu/releases/tag/v1.6.1)
- [`1.6.0`](https://github.com/opentofu/opentofu/releases/tag/v1.6.0)
- [`1.6.0-rc1`](https://github.com/opentofu/opentofu/releases/tag/v1.6.0-rc1)
diff --git a/templates/apply.yml b/templates/apply.yml
index 01316f3..cc1a6d5 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.0'
+ default: '1.6.1'
options:
- '$OPENTOFU_VERSION'
+ - '1.6.1'
- '1.6.0'
- '1.6.0-rc1'
description: 'OpenTofu version that should be used.'
diff --git a/templates/destroy.yml b/templates/destroy.yml
index 8b343dc..d8547c4 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.0'
+ default: '1.6.1'
options:
- '$OPENTOFU_VERSION'
+ - '1.6.1'
- '1.6.0'
- '1.6.0-rc1'
description: 'OpenTofu version that should be used.'
diff --git a/templates/fmt.yml b/templates/fmt.yml
index aaea90d..730f1a8 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.0'
+ default: '1.6.1'
options:
- '$OPENTOFU_VERSION'
+ - '1.6.1'
- '1.6.0'
- '1.6.0-rc1'
description: 'OpenTofu version that should be used.'
diff --git a/templates/full-pipeline.yml b/templates/full-pipeline.yml
index efe637a..c26e870 100644
--- a/templates/full-pipeline.yml
+++ b/templates/full-pipeline.yml
@@ -22,9 +22,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.0'
+ default: '1.6.1'
options:
- '$OPENTOFU_VERSION'
+ - '1.6.1'
- '1.6.0'
- '1.6.0-rc1'
description: 'OpenTofu version that should be used.'
diff --git a/templates/plan.yml b/templates/plan.yml
index a2a618d..061d4c5 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.0'
+ default: '1.6.1'
options:
- '$OPENTOFU_VERSION'
+ - '1.6.1'
- '1.6.0'
- '1.6.0-rc1'
description: 'OpenTofu version that should be used.'
diff --git a/templates/validate-plan-apply.yml b/templates/validate-plan-apply.yml
index 56d65a9..5bc7078 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.0'
+ default: '1.6.1'
options:
- '$OPENTOFU_VERSION'
+ - '1.6.1'
- '1.6.0'
- '1.6.0-rc1'
description: 'OpenTofu version that should be used.'
diff --git a/templates/validate.yml b/templates/validate.yml
index a37813b..241ffec 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.0'
+ default: '1.6.1'
options:
- '$OPENTOFU_VERSION'
+ - '1.6.1'
- '1.6.0'
- '1.6.0-rc1'
description: 'OpenTofu version that should be used.'
--
GitLab