Skip to content

Commit 990a33a

Browse files
coder-backporter-app[bot]droopy4096coder[bot]
authored
fix: bump bundled terraform to 1.17.2 (#32110) for 2.29 (#32182)
Backport of #32110 Original PR: #32110 — fix: bump bundled terraform to 1.17.2 Merge commit: 872105c Requested by: @droopy4096 Also includes a backport of #29279 (refresh dogfood apt keyrings, rename google-cloud-sdk to google-cloud-cli) so the dogfood `build_image` job can pass on release/2.29. HashiCorp's apt repo is now signed with a key (FC9CA96ACA026560) missing from this branch's keyring. --------- Co-authored-by: Dmitry Makovey <dmakovey@yahoo.com> Co-authored-by: coder[bot] <137810501+coder[bot]@users.noreply.github.com>
1 parent 8585c29 commit 990a33a

12 files changed

Lines changed: 13 additions & 13 deletions

File tree

‎.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.17.1
10+
terraform_version: 1.17.2
1111
terraform_wrapper: false

‎docs/install/airgap.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ RUN mkdir -p /opt/terraform
5353
# The below step is optional if you wish to keep the existing version.
5454
# See https://github.com/coder/coder/blob/main/provisioner/terraform/install.go#L23-L24
5555
# for supported Terraform versions.
56-
ARG TERRAFORM_VERSION=1.17.1
56+
ARG TERRAFORM_VERSION=1.17.2
5757
RUN apk update && \
5858
curl -LOs https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip \
5959
&& unzip -o terraform_${TERRAFORM_VERSION}_linux_amd64.zip \

‎dogfood/coder/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@ RUN sed -i 's|http://archive.ubuntu.com/ubuntu/|http://mirrors.edge.kernel.org/u
159159
gettext-base \
160160
git \
161161
gnupg \
162-
google-cloud-sdk \
163-
google-cloud-sdk-datastore-emulator \
162+
google-cloud-cli \
163+
google-cloud-cli-datastore-emulator \
164164
graphviz \
165165
helix \
166166
htop \
@@ -212,9 +212,9 @@ RUN sed -i 's|http://archive.ubuntu.com/ubuntu/|http://mirrors.edge.kernel.org/u
212212
# Configure FIPS-compliant policies
213213
update-crypto-policies --set FIPS
214214

215-
# NOTE: In scripts/Dockerfile.base we specifically install Terraform version 1.17.1.
215+
# NOTE: In scripts/Dockerfile.base we specifically install Terraform version 1.17.2.
216216
# Installing the same version here to match.
217-
RUN wget -O /tmp/terraform.zip "https://releases.hashicorp.com/terraform/1.17.1/terraform_1.17.1_linux_amd64.zip" && \
217+
RUN wget -O /tmp/terraform.zip "https://releases.hashicorp.com/terraform/1.17.2/terraform_1.17.2_linux_amd64.zip" && \
218218
unzip /tmp/terraform.zip -d /usr/local/bin && \
219219
rm -f /tmp/terraform.zip && \
220220
chmod +x /usr/local/bin/terraform && \

‎dogfood/coder/files/etc/apt/preferences.d/google-cloud‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ Pin: origin packages.cloud.google.com
44
Pin-Priority: 1
55

66
# Google Cloud SDK for gcloud and gsutil CLI tools
7-
Package: google-cloud-sdk
7+
Package: google-cloud-cli
88
Pin: origin packages.cloud.google.com
99
Pin-Priority: 500
1010

1111
# Datastore emulator for working with the licensor
12-
Package: google-cloud-sdk-datastore-emulator
12+
Package: google-cloud-cli-datastore-emulator
1313
Pin: origin packages.cloud.google.com
1414
Pin-Priority: 500
1515

2.21 KB
Binary file not shown.
-1.18 KB
Binary file not shown.
-1.63 KB
Binary file not shown.

‎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.17.1"
276+
TERRAFORM_VERSION="1.17.2"
277277

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

‎provisioner/terraform/install.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ var (
2222
// when Terraform is not available on the system.
2323
// NOTE: Keep this in sync with the version in scripts/Dockerfile.base.
2424
// NOTE: Keep this in sync with the version in install.sh.
25-
TerraformVersion = version.Must(version.NewVersion("1.17.1"))
25+
TerraformVersion = version.Must(version.NewVersion("1.17.2"))
2626

2727
minTerraformVersion = version.Must(version.NewVersion("1.1.0"))
2828
maxTerraformVersion = version.Must(version.NewVersion("1.17.9")) // use .9 to automatically allow patch releases
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.17.1
1+
1.17.2

0 commit comments

Comments
 (0)