Skip to content

Commit d9d418a

Browse files
zaratsianRobert Bailey
zaratsian
and
Robert Bailey
authored
Upgraded Terraform to >=1.0 (agones-dev#2308)
* initial changes to tf 1.0 * updated scripts to tf 1.0 * updated scripts for tf 1.0 * Updated to Terraform 1.0.8 for build image * updated install doc and cleaned whitespaces Co-authored-by: Robert Bailey <robertbailey@google.com>
1 parent a300d8a commit d9d418a

12 files changed

Lines changed: 102 additions & 46 deletions

File tree

‎build/build-image/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ RUN echo "export PATH=/usr/local/go/bin:/go/bin/:\$PATH" >> /root/.bashrc
105105
RUN echo "export EDITOR=nano" >> /root/.bashrc
106106

107107
# install terraform
108-
RUN wget -nv -O terraform.zip https://releases.hashicorp.com/terraform/0.12.21/terraform_0.12.21_linux_amd64.zip && unzip ./terraform.zip && mv terraform /usr/local/bin/
108+
RUN wget -nv -O terraform.zip https://releases.hashicorp.com/terraform/1.0.8/terraform_1.0.8_linux_amd64.zip && unzip ./terraform.zip && mv terraform /usr/local/bin/
109109

110110
# code generation scripts
111111
COPY *.sh /root/

‎build/terraform/e2e/module.tf‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,18 @@
1616
// Run:
1717
// terraform apply -var project="<YOUR_GCP_ProjectID>"
1818

19-
provider "google" {
20-
version = "~> 2.10"
19+
terraform {
20+
required_version = ">= 1.0.0"
21+
required_providers {
22+
google = {
23+
source = "hashicorp/google"
24+
version = "~> 3.88"
25+
}
26+
helm = {
27+
source = "hashicorp/helm"
28+
version = "~> 2.3"
29+
}
30+
}
2131
}
2232

2333
variable "project" {
@@ -39,9 +49,7 @@ module "gke_cluster" {
3949
}
4050

4151
provider "helm" {
42-
version = "~> 1.2"
4352
kubernetes {
44-
load_config_file = false
4553
host = module.gke_cluster.host
4654
token = module.gke_cluster.token
4755
cluster_ca_certificate = module.gke_cluster.cluster_ca_certificate

‎build/terraform/gke/module.tf‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@
1414

1515

1616
// Run:
17-
// terraform apply -var project="<YOUR_GCP_ProjectID>" [-var agones_version="1.4.0"]
18-
19-
provider "google" {
20-
version = "~> 2.10"
21-
}
22-
23-
provider "google-beta" {
24-
version = "~> 2.10"
17+
// terraform apply -var project="<YOUR_GCP_ProjectID>" [-var agones_version="1.17.0"]
18+
19+
terraform {
20+
required_version = ">= 1.0.0"
21+
required_providers {
22+
google = {
23+
source = "hashicorp/google"
24+
version = "~> 3.88"
25+
}
26+
}
2527
}
2628

2729
variable "project" {
@@ -142,6 +144,7 @@ output "host" {
142144
}
143145
output "token" {
144146
value = module.gke_cluster.token
147+
sensitive = true
145148
}
146149
output "cluster_ca_certificate" {
147150
value = module.gke_cluster.cluster_ca_certificate

‎build/terraform/prow/module.tf‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,14 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
provider "google" {
16-
version = "~> 2.10"
15+
terraform {
16+
required_version = ">= 1.0.0"
17+
required_providers {
18+
google = {
19+
source = "google"
20+
version = "~> 3.88"
21+
}
22+
}
1723
}
1824

1925
variable "project" {

‎examples/terraform-submodules/aks/module.tf‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414

1515

1616
// Run:
17-
// terraform apply [-var agones_version="1.3.0"]
17+
// terraform apply [-var agones_version="1.17.0"]
1818

1919
terraform {
20-
required_version = ">= 0.12.26"
20+
required_version = ">= 1.0.0"
2121
}
2222

2323
// Install latest version of agones
@@ -66,6 +66,10 @@ variable "resource_group_name" {
6666
}
6767

6868
module "aks_cluster" {
69+
// ***************************************************************************************************
70+
// Update ?ref= to the agones release you are installing. For example, ?ref=release-1.17.0 corresponds
71+
// to Agones version 1.17.0
72+
// ***************************************************************************************************
6973
source = "git::https://github.com/googleforgames/agones.git//install/terraform/modules/aks/?ref=main"
7074

7175
client_id = var.client_id
@@ -79,6 +83,10 @@ module "aks_cluster" {
7983
}
8084

8185
module "helm_agones" {
86+
// ***************************************************************************************************
87+
// Update ?ref= to the agones release you are installing. For example, ?ref=release-1.17.0 corresponds
88+
// to Agones version 1.17.0
89+
// ***************************************************************************************************
8290
source = "git::https://github.com/googleforgames/agones.git//install/terraform/modules/helm3/?ref=main"
8391

8492
agones_version = var.agones_version

‎examples/terraform-submodules/eks/module.tf‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,17 @@
1414

1515

1616
// Run:
17-
// terraform apply [-var agones_version="1.4.0"]
17+
// terraform apply [-var agones_version="1.17.0"]
18+
19+
terraform {
20+
required_version = ">= 1.0.0"
21+
required_providers {
22+
aws = {
23+
source = "hashicorp/aws"
24+
version = "~> 3.0"
25+
}
26+
}
27+
}
1828

1929
// Install latest version of agones
2030
variable "agones_version" {
@@ -34,8 +44,7 @@ variable "node_count" {
3444
}
3545

3646
provider "aws" {
37-
version = "~> 2.8"
38-
region = var.region
47+
region = var.region
3948
}
4049

4150
variable "machine_type" { default = "t2.large" }
@@ -49,6 +58,10 @@ variable "feature_gates" {
4958
}
5059

5160
module "eks_cluster" {
61+
// ***************************************************************************************************
62+
// Update ?ref= to the agones release you are installing. For example, ?ref=release-1.17.0 corresponds
63+
// to Agones version 1.17.0
64+
// ***************************************************************************************************
5265
source = "git::https://github.com/googleforgames/agones.git//install/terraform/modules/eks/?ref=main"
5366

5467
machine_type = var.machine_type
@@ -64,6 +77,10 @@ data "aws_eks_cluster_auth" "example" {
6477
// Next Helm module cause "terraform destroy" timeout, unless helm release would be deleted first.
6578
// Therefore "helm delete --purge agones" should be executed from the CLI before executing "terraform destroy".
6679
module "helm_agones" {
80+
// ***************************************************************************************************
81+
// Update ?ref= to the agones release you are installing. For example, ?ref=release-1.17.0 corresponds
82+
// to Agones version 1.17.0
83+
// ***************************************************************************************************
6784
source = "git::https://github.com/googleforgames/agones.git//install/terraform/modules/helm3/?ref=main"
6885

6986
udp_expose = "false"

‎examples/terraform-submodules/gke/module.tf‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@
1414

1515

1616
// Run:
17-
// terraform apply -var project="<YOUR_GCP_ProjectID>" [-var agones_version="1.8.0"]
18-
19-
provider "google" {
20-
version = "~> 2.10"
21-
}
22-
23-
provider "google-beta" {
24-
version = "~> 2.10"
17+
// terraform apply -var project="<YOUR_GCP_ProjectID>" [-var agones_version="1.17.0"]
18+
19+
terraform {
20+
required_version = ">= 1.0.0"
21+
required_providers {
22+
google = {
23+
source = "hashicorp/google"
24+
version = "~> 3.88"
25+
}
26+
}
2527
}
2628

2729
variable "project" {
@@ -79,8 +81,8 @@ variable "windows_machine_type" {
7981

8082
module "gke_cluster" {
8183
// ***************************************************************************************************
82-
// Update ?ref= to the agones release you are installing. For example, ?ref=release-1.8.0 corresponds
83-
// to Agones version 1.8.0
84+
// Update ?ref= to the agones release you are installing. For example, ?ref=release-1.17.0 corresponds
85+
// to Agones version 1.17.0
8486
// ***************************************************************************************************
8587
source = "git::https://github.com/googleforgames/agones.git//install/terraform/modules/gke/?ref=main"
8688

@@ -99,8 +101,8 @@ module "gke_cluster" {
99101

100102
module "helm_agones" {
101103
// ***************************************************************************************************
102-
// Update ?ref= to the agones release you are installing. For example, ?ref=release-1.8.0 corresponds
103-
// to Agones version 1.8.0
104+
// Update ?ref= to the agones release you are installing. For example, ?ref=release-1.17.0 corresponds
105+
// to Agones version 1.17.0
104106
// ***************************************************************************************************
105107
source = "git::https://github.com/googleforgames/agones.git//install/terraform/modules/helm3/?ref=main"
106108

@@ -117,7 +119,8 @@ output "host" {
117119
value = module.gke_cluster.host
118120
}
119121
output "token" {
120-
value = module.gke_cluster.token
122+
value = module.gke_cluster.token
123+
sensitive = true
121124
}
122125
output "cluster_ca_certificate" {
123126
value = module.gke_cluster.cluster_ca_certificate

‎install/terraform/modules/aks/aks.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414

1515

1616
terraform {
17+
required_version = ">= 1.0.0"
1718
required_providers {
1819
azurerm = {
1920
source = "hashicorp/azurerm"
2021
version = "~> 2.66"
2122
}
2223
}
23-
required_version = ">= 0.12.26"
2424
}
2525

2626
provider "azurerm" {

‎install/terraform/modules/eks/eks.tf‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,16 @@
1414

1515

1616
terraform {
17-
required_version = ">= 0.12.6"
17+
required_version = ">= 1.0.0"
18+
required_providers {
19+
aws = {
20+
source = "hashicorp/aws"
21+
version = "~> 3.0"
22+
}
23+
}
1824
}
1925

2026
provider "aws" {
21-
version = ">= 2.55.0"
2227
region = var.region
2328
}
2429

@@ -58,7 +63,7 @@ resource "aws_security_group" "worker_group_mgmt_one" {
5863

5964
module "vpc" {
6065
source = "terraform-aws-modules/vpc/aws"
61-
version = "2.47.0"
66+
version = "~> 3.0"
6267

6368
name = "test-vpc-lt"
6469
cidr = "10.0.0.0/16"

‎install/terraform/modules/gke/cluster.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515

1616
terraform {
17-
required_version = ">= 0.12.6"
17+
required_version = ">= 1.0.0"
1818
}
1919

2020
data "google_client_config" "default" {}

0 commit comments

Comments
 (0)