Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit0876800

Browse files
committed
chore: upgrade terraform to 1.10.5
1 parent700a453 commit0876800

File tree

43 files changed

+668
-620
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+668
-620
lines changed

‎.github/actions/setup-tf/action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ runs:
77
-name:Install Terraform
88
uses:hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd# v3.1.2
99
with:
10-
terraform_version:1.9.8
10+
terraform_version:1.10.5
1111
terraform_wrapper:false

‎docs/install/offline.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ environments. However, some changes to your configuration are necessary.
77
>offline with Kubernetes or Docker.
88
99
|| Public deployments| Offline deployments|
10-
|--------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
10+
|------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
1111
| Terraform binary| By default, Coder downloads Terraform binary from[releases.hashicorp.com](https://releases.hashicorp.com)| Terraform binary must be included in`PATH` for the VM or container image.[Supported versions](https://github.com/coder/coder/blob/main/provisioner/terraform/install.go#L23-L24)|
1212
| Terraform registry| Coder templates will attempt to download providers from[registry.terraform.io](https://registry.terraform.io) or[custom source addresses](https://developer.hashicorp.com/terraform/language/providers/requirements#source-addresses) specified in each template|[Custom source addresses](https://developer.hashicorp.com/terraform/language/providers/requirements#source-addresses) can be specified in each Coder template, or a custom registry/mirror can be used. More details below|
1313
| STUN| By default, Coder uses Google's public STUN server for direct workspace connections| STUN can be safely[disabled](../reference/cli/server.md#--derp-server-stun-addresses) users can still connect via[relayed connections](../admin/networking/index.md#-geo-distribution). Alternatively, you can set a[custom DERP server](../reference/cli/server.md#--derp-server-stun-addresses)|
@@ -54,7 +54,7 @@ RUN mkdir -p /opt/terraform
5454
# The below step is optional if you wish to keep the existing version.
5555
# See https://github.com/coder/coder/blob/main/provisioner/terraform/install.go#L23-L24
5656
# for supported Terraform versions.
57-
ARG TERRAFORM_VERSION=1.9.8
57+
ARG TERRAFORM_VERSION=1.10.5
5858
RUN apk update && \
5959
apk del terraform && \
6060
curl -LOs https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip \

‎dogfood/contents/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,9 @@ RUN apt-get update --quiet && apt-get install --yes \
195195
# Configure FIPS-compliant policies
196196
update-crypto-policies --set FIPS
197197

198-
# NOTE: In scripts/Dockerfile.base we specifically install Terraform version 1.9.8.
198+
# NOTE: In scripts/Dockerfile.base we specifically install Terraform version 1.10.5.
199199
# Installing the same version here to match.
200-
RUN wget -O /tmp/terraform.zip"https://releases.hashicorp.com/terraform/1.9.8/terraform_1.9.8_linux_amd64.zip" && \
200+
RUN wget -O /tmp/terraform.zip"https://releases.hashicorp.com/terraform/1.10.5/terraform_1.10.5_linux_amd64.zip" && \
201201
unzip /tmp/terraform.zip -d /usr/local/bin && \
202202
rm -f /tmp/terraform.zip && \
203203
chmod +x /usr/local/bin/terraform && \

‎install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ EOF
273273
main() {
274274
MAINLINE=1
275275
STABLE=0
276-
TERRAFORM_VERSION="1.9.8"
276+
TERRAFORM_VERSION="1.10.5"
277277

278278
if ["${TRACE-}" ];then
279279
set -x

‎provisioner/terraform/install.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ var (
2020
// when Terraform is not available on the system.
2121
// NOTE: Keep this in sync with the version in scripts/Dockerfile.base.
2222
// NOTE: Keep this in sync with the version in install.sh.
23-
TerraformVersion=version.Must(version.NewVersion("1.9.8"))
23+
TerraformVersion=version.Must(version.NewVersion("1.10.5"))
2424

2525
minTerraformVersion=version.Must(version.NewVersion("1.1.0"))
26-
maxTerraformVersion=version.Must(version.NewVersion("1.9.9"))// use .9 to automatically allow patch releases
26+
maxTerraformVersion=version.Must(version.NewVersion("1.10.9"))// use .9 to automatically allow patch releases
2727

2828
terraformMinorVersionMismatch=xerrors.New("Terraform binary minor version mismatch.")
2929
)

‎provisioner/terraform/testdata/calling-module/calling-module.tfplan.json

Lines changed: 12 additions & 11 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎provisioner/terraform/testdata/calling-module/calling-module.tfstate.json

Lines changed: 10 additions & 9 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎provisioner/terraform/testdata/chaining-resources/chaining-resources.tfplan.json

Lines changed: 12 additions & 11 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎provisioner/terraform/testdata/chaining-resources/chaining-resources.tfstate.json

Lines changed: 10 additions & 9 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp