Skip to content
Snippets Groups Projects
Commit 8c3ef949 authored by Timo Furrer's avatar Timo Furrer
Browse files

Merge branch 'support-opentofu-1.6.2' into 'main'

Support OpenTofu 1.6.2

See merge request components/opentofu!43
parents 6dec06a1 874e94a1
No related branches found
No related tags found
No related merge requests found
...@@ -45,16 +45,16 @@ stages: ...@@ -45,16 +45,16 @@ stages:
.opentofu-versions: .opentofu-versions:
parallel: parallel:
matrix: matrix:
- OPENTOFU_VERSION: '1.6.2'
- OPENTOFU_VERSION: '1.6.1' - OPENTOFU_VERSION: '1.6.1'
- OPENTOFU_VERSION: '1.6.0' - OPENTOFU_VERSION: '1.6.0'
- OPENTOFU_VERSION: '1.6.0-rc1'
variables: variables:
# Pipeline configuration # Pipeline configuration
DOCKER_DIND_IMAGE: "docker:25.0.3-dind" DOCKER_DIND_IMAGE: "docker:25.0.3-dind"
# OpenTofu variables # OpenTofu variables
LATEST_OPENTOFU_VERSION: '1.6.1' LATEST_OPENTOFU_VERSION: '1.6.2'
# OpenTofu image build variables: # OpenTofu image build variables:
PLATFORMS: linux/amd64,linux/arm64 PLATFORMS: linux/amd64,linux/arm64
......
...@@ -180,7 +180,7 @@ Have a look at the individual template spec to learn about the available inputs. ...@@ -180,7 +180,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_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. | | `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. | | `version` | `latest` | Version of this component. Has to be the same as the one in the component include entry. |
| `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`. | | `opentofu_version` | `1.6.2` | OpenTofu version that should be used. Must be one of `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_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`. | | `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. | | `root_dir` | `${CI_PROJECT_DIR}` | Root directory for the OpenTofu project. |
...@@ -192,9 +192,9 @@ Have a look at the individual template spec to learn about the available inputs. ...@@ -192,9 +192,9 @@ 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: The following OpenTofu versions are available with this component via the `opentofu_version` input:
- [`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) - [`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`](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)
### Variables ### Variables
......
...@@ -16,12 +16,12 @@ spec: ...@@ -16,12 +16,12 @@ spec:
description: 'Version of this component. Has to be the same as the one in the component include entry.' description: 'Version of this component. Has to be the same as the one in the component include entry.'
opentofu_version: opentofu_version:
default: '1.6.1' default: '1.6.2'
options: options:
- '$OPENTOFU_VERSION' - '$OPENTOFU_VERSION'
- '1.6.2'
- '1.6.1' - '1.6.1'
- '1.6.0' - '1.6.0'
- '1.6.0-rc1'
description: 'OpenTofu version that should be used.' description: 'OpenTofu version that should be used.'
# Images # Images
......
...@@ -16,12 +16,12 @@ spec: ...@@ -16,12 +16,12 @@ spec:
description: 'Version of this component. Has to be the same as the one in the component include entry.' description: 'Version of this component. Has to be the same as the one in the component include entry.'
opentofu_version: opentofu_version:
default: '1.6.1' default: '1.6.2'
options: options:
- '$OPENTOFU_VERSION' - '$OPENTOFU_VERSION'
- '1.6.2'
- '1.6.1' - '1.6.1'
- '1.6.0' - '1.6.0'
- '1.6.0-rc1'
description: 'OpenTofu version that should be used.' description: 'OpenTofu version that should be used.'
# Images # Images
......
...@@ -16,12 +16,12 @@ spec: ...@@ -16,12 +16,12 @@ spec:
description: 'Version of this component. Has to be the same as the one in the component include entry.' description: 'Version of this component. Has to be the same as the one in the component include entry.'
opentofu_version: opentofu_version:
default: '1.6.1' default: '1.6.2'
options: options:
- '$OPENTOFU_VERSION' - '$OPENTOFU_VERSION'
- '1.6.2'
- '1.6.1' - '1.6.1'
- '1.6.0' - '1.6.0'
- '1.6.0-rc1'
description: 'OpenTofu version that should be used.' description: 'OpenTofu version that should be used.'
# Images # Images
......
...@@ -16,12 +16,12 @@ spec: ...@@ -16,12 +16,12 @@ spec:
description: 'Version of this component. Has to be the same as the one in the component include entry.' description: 'Version of this component. Has to be the same as the one in the component include entry.'
opentofu_version: opentofu_version:
default: '1.6.1' default: '1.6.2'
options: options:
- '$OPENTOFU_VERSION' - '$OPENTOFU_VERSION'
- '1.6.2'
- '1.6.1' - '1.6.1'
- '1.6.0' - '1.6.0'
- '1.6.0-rc1'
description: 'OpenTofu version that should be used.' description: 'OpenTofu version that should be used.'
# Images # Images
......
...@@ -22,12 +22,12 @@ spec: ...@@ -22,12 +22,12 @@ spec:
description: 'Version of this component. Has to be the same as the one in the component include entry.' description: 'Version of this component. Has to be the same as the one in the component include entry.'
opentofu_version: opentofu_version:
default: '1.6.1' default: '1.6.2'
options: options:
- '$OPENTOFU_VERSION' - '$OPENTOFU_VERSION'
- '1.6.2'
- '1.6.1' - '1.6.1'
- '1.6.0' - '1.6.0'
- '1.6.0-rc1'
description: 'OpenTofu version that should be used.' description: 'OpenTofu version that should be used.'
# Images # Images
......
...@@ -22,12 +22,12 @@ spec: ...@@ -22,12 +22,12 @@ spec:
description: 'Version of this component. Has to be the same as the one in the component include entry.' description: 'Version of this component. Has to be the same as the one in the component include entry.'
opentofu_version: opentofu_version:
default: '1.6.1' default: '1.6.2'
options: options:
- '$OPENTOFU_VERSION' - '$OPENTOFU_VERSION'
- '1.6.2'
- '1.6.1' - '1.6.1'
- '1.6.0' - '1.6.0'
- '1.6.0-rc1'
description: 'OpenTofu version that should be used.' description: 'OpenTofu version that should be used.'
# Images # Images
......
...@@ -16,12 +16,12 @@ spec: ...@@ -16,12 +16,12 @@ spec:
description: 'Version of this component. Has to be the same as the one in the component include entry.' description: 'Version of this component. Has to be the same as the one in the component include entry.'
opentofu_version: opentofu_version:
default: '1.6.1' default: '1.6.2'
options: options:
- '$OPENTOFU_VERSION' - '$OPENTOFU_VERSION'
- '1.6.2'
- '1.6.1' - '1.6.1'
- '1.6.0' - '1.6.0'
- '1.6.0-rc1'
description: 'OpenTofu version that should be used.' description: 'OpenTofu version that should be used.'
# Images # Images
......
...@@ -19,12 +19,12 @@ spec: ...@@ -19,12 +19,12 @@ spec:
description: 'Version of this component. Has to be the same as the one in the component include entry.' description: 'Version of this component. Has to be the same as the one in the component include entry.'
opentofu_version: opentofu_version:
default: '1.6.1' default: '1.6.2'
options: options:
- '$OPENTOFU_VERSION' - '$OPENTOFU_VERSION'
- '1.6.2'
- '1.6.1' - '1.6.1'
- '1.6.0' - '1.6.0'
- '1.6.0-rc1'
description: 'OpenTofu version that should be used.' description: 'OpenTofu version that should be used.'
# Images # Images
......
...@@ -16,12 +16,12 @@ spec: ...@@ -16,12 +16,12 @@ spec:
description: 'Version of this component. Has to be the same as the one in the component include entry.' description: 'Version of this component. Has to be the same as the one in the component include entry.'
opentofu_version: opentofu_version:
default: '1.6.1' default: '1.6.2'
options: options:
- '$OPENTOFU_VERSION' - '$OPENTOFU_VERSION'
- '1.6.2'
- '1.6.1' - '1.6.1'
- '1.6.0' - '1.6.0'
- '1.6.0-rc1'
description: 'OpenTofu version that should be used.' description: 'OpenTofu version that should be used.'
# Images # Images
......
...@@ -16,12 +16,12 @@ spec: ...@@ -16,12 +16,12 @@ spec:
description: 'Version of this component. Has to be the same as the one in the component include entry.' description: 'Version of this component. Has to be the same as the one in the component include entry.'
opentofu_version: opentofu_version:
default: '1.6.1' default: '1.6.2'
options: options:
- '$OPENTOFU_VERSION' - '$OPENTOFU_VERSION'
- '1.6.2'
- '1.6.1' - '1.6.1'
- '1.6.0' - '1.6.0'
- '1.6.0-rc1'
description: 'OpenTofu version that should be used.' description: 'OpenTofu version that should be used.'
# Images # Images
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment