Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgraded Terraform to >=1.0 #2308

Merged
merged 7 commits into from
Oct 20, 2021
Merged

Conversation

zaratsian
Copy link
Contributor

What this PR does / Why we need it:

Upgrades Terraform deployment scripts to support version >= 1.0.0 across build, install, and example directories.

Which issue(s) this PR fixes:

#2142

Special notes for your reviewer:

I scanned the existing repo and believe that I've accounted for all Terraform scripts. Please let me know if you see any other terraform files or dependencies that also need to be updated as part of this PR.

@google-cla google-cla bot added the cla: yes label Oct 12, 2021
@zaratsian zaratsian changed the title Upgraded Terraform to >=1.0 #2142 Upgraded Terraform to >=1.0 Oct 12, 2021
@agones-bot
Copy link
Collaborator

Build Failed 😱

Build Id: 41890df6-6c6a-48c6-a063-c2f0a8f3202f

To get permission to view the Cloud Build view, join the agones-discuss Google Group.

@markmandel
Copy link
Member

I should take this for an actual spin, but I'm also figuring we should update:

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/

To update the local terraform used on our build tools as well.

@agones-bot
Copy link
Collaborator

Build Failed 😱

Build Id: b827105d-81c0-4008-9cc4-081722decdbe

To get permission to view the Cloud Build view, join the agones-discuss Google Group.

@roberthbailey
Copy link
Member

I'm not sure how far behind main you are, but the build failed on the link checker to a couple of sites where we have disabled link checking (because tests weren't passing). Trying fetching and rebasing onto upstream/main to see if that helps the tests pass.

@agones-bot
Copy link
Collaborator

Build Failed 😱

Build Id: bf95321b-bdce-4cad-b4f9-3e42a03afc80

To get permission to view the Cloud Build view, join the agones-discuss Google Group.

@zaratsian
Copy link
Contributor Author

zaratsian commented Oct 13, 2021

@markmandel, good call on updating the build-image. I missed that Terraform mention initially. It's in there now, and will install Terraform 1.0.8.

@roberthbailey, thanks for checking out the failed tests. I checked it out and was behind main. I updated the fork and will rebase now. The latest test seems to past all but step 21:e2e-feature-gates (fleetautoscaler_test.go:88: error waiting for fleet condition on fleet simple-fleet-kmm8f).

@agones-bot
Copy link
Collaborator

Build Succeeded 👏

Build Id: d23310c5-5c47-4730-adfc-f500a300008c

The following development artifacts have been built, and will exist for the next 30 days:

A preview of the website (the last 30 builds are retained):

To install this version:

  • git fetch https://github.com/googleforgames/agones.git pull/2308/head:pr_2308 && git checkout pr_2308
  • helm install ./install/helm/agones --namespace agones-system --name agones --set agones.image.tag=1.19.0-2f1c759

Copy link
Member

@roberthbailey roberthbailey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for working on this! I haven't had a chance to test it yet, but I did have one question about the change to the helm provider.

build/terraform/e2e/module.tf Show resolved Hide resolved
Copy link
Member

@roberthbailey roberthbailey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please update https://github.com/googleforgames/agones/blob/main/site/content/en/docs/Installation/Terraform/_index.md to change the supported version of Terraform to 1.0.0?

Copy link
Member

@roberthbailey roberthbailey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested out the terraform and it worked great! Can you fix the whitespace and update the docs and we can get this merged?

provider "google" {
version = "~> 2.10"
terraform {
required_version = ">= 1.0.0"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: This line has extra whitespace at the end.

// terraform apply -var project="<YOUR_GCP_ProjectID>" [-var agones_version="1.17.0"]

terraform {
required_version = ">= 1.0.0"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: This line has extra whitespace at the end.

provider "google" {
version = "~> 2.10"
terraform {
required_version = ">= 1.0.0"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: This line has extra whitespace at the end.

// terraform apply [-var agones_version="1.17.0"]

terraform {
required_version = ">= 1.0.0"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: This line has extra whitespace at the end.

// terraform apply -var project="<YOUR_GCP_ProjectID>" [-var agones_version="1.17.0"]

terraform {
required_version = ">= 1.0.0"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: This line has extra whitespace at the end.

@@ -14,11 +14,16 @@


terraform {
required_version = ">= 0.12.6"
required_version = ">= 1.0.0"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: This line has extra whitespace at the end.

@agones-bot
Copy link
Collaborator

Build Succeeded 👏

Build Id: 4c30bc84-2d94-422b-98ca-a37dfff386b4

The following development artifacts have been built, and will exist for the next 30 days:

A preview of the website (the last 30 builds are retained):

To install this version:

  • git fetch https://github.com/googleforgames/agones.git pull/2308/head:pr_2308 && git checkout pr_2308
  • helm install ./install/helm/agones --namespace agones-system --name agones --set agones.image.tag=1.19.0-9c1e469

@zaratsian
Copy link
Contributor Author

zaratsian commented Oct 20, 2021

Thanks for the review @roberthbailey! I've cleaned up the whitespaces and updated/tested the site doc as well. Please let me know if you see any additional changes that are required.

@agones-bot
Copy link
Collaborator

Build Succeeded 👏

Build Id: e8cd88b2-1c95-4e72-a42e-2d15c56b164f

The following development artifacts have been built, and will exist for the next 30 days:

A preview of the website (the last 30 builds are retained):

To install this version:

  • git fetch https://github.com/googleforgames/agones.git pull/2308/head:pr_2308 && git checkout pr_2308
  • helm install ./install/helm/agones --namespace agones-system --name agones --set agones.image.tag=1.19.0-658e56a

@google-oss-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: roberthbailey, zaratsian

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@agones-bot
Copy link
Collaborator

Build Succeeded 👏

Build Id: 30ff1ef2-7eef-49c7-8f0b-036ffe648238

The following development artifacts have been built, and will exist for the next 30 days:

A preview of the website (the last 30 builds are retained):

To install this version:

  • git fetch https://github.com/googleforgames/agones.git pull/2308/head:pr_2308 && git checkout pr_2308
  • helm install ./install/helm/agones --namespace agones-system --name agones --set agones.image.tag=1.19.0-574f298

@roberthbailey roberthbailey merged commit d9d418a into googleforgames:main Oct 20, 2021
@roberthbailey roberthbailey added this to the 1.19.0 milestone Nov 1, 2021
@SaitejaTamma SaitejaTamma added the kind/feature New features for Agones label Nov 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants