Skip to content

Commit

Permalink
Upgrade to terraform 1.x
Browse files Browse the repository at this point in the history
  • Loading branch information
aidy committed Mar 25, 2022
1 parent cd29671 commit 1f973e2
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/actions/terratest/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM golang:1.17.3-alpine3.13

WORKDIR /

ARG TERRAFORM_VERSION=0.14.11
ARG TERRAFORM_VERSION=1.0.11
ARG KUBECTL_VERSION=1.20.5
ARG KUBECTL_SHA=7f9dbb80190945a5077dc5f4230202c22f68f9bd7f20c213c3cf5a74abf55e56

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- uses: actions/checkout@main
- uses: hashicorp/setup-terraform@v1
with:
terraform_version: 0.14.11
terraform_version: 1.0.11
- name: 'Terraform Format'
run: terraform fmt -check -recursive
- name: 'Terraform Init cluster'
Expand Down Expand Up @@ -73,4 +73,4 @@ jobs:
- name: 'Terratest'
uses: ./.github/actions/terratest
with:
args: "-run TestTerraformAwsEksCluster"
args: "-run TestTerraformAwsEksCluster"
2 changes: 1 addition & 1 deletion .terraform-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.14.11
1.0.11
3 changes: 3 additions & 0 deletions UPGRADING.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
* Check the notes for the Kubernetes version you are upgrading to at https://docs.aws.amazon.com/eks/latest/userguide/kubernetes-versions.html
* After upgrading the terraform module, remember to follow the [roll nodes](docs/roll_nodes.md) procedure to roll out upgraded nodes to your cluster.

## 1.20 -> 1.21
* [261](https://github.com/cookpad/terraform-aws-eks/issues/267/) 💥 Breaking Change. Modules now require terraform version >=1.0.

## 1.19 -> 1.20
* [247](https://github.com/cookpad/terraform-aws-eks/pull/247) 💥 Breaking Change. The `k8s_version` variable has been removed. Use the correct version of the module for the k8s version you want to use.
* [156](https://github.com/cookpad/terraform-aws-eks/issues/156) 💥 Breaking Change. The root module has been removed. Please refactor using the README as a guide.
Expand Down
2 changes: 1 addition & 1 deletion modules/asg_node_group/versions.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
terraform {
required_version = ">= 0.14"
required_version = ">= 1.0"

required_providers {
aws = {
Expand Down
2 changes: 1 addition & 1 deletion versions.tf
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
terraform {
required_version = ">= 0.14"
required_version = ">= 1.0"
}

0 comments on commit 1f973e2

Please sign in to comment.