Bug 1981941: Upgrade terraform to 0.14.6 #4729

jhixson74 · 2021-03-09T23:56:23Z

This updates the installer to use Terraform 0.14.6.

Terraform 0.13.x updated the on-disk layout of the plugins directory, how to access offline plugins, and a lock file used for plugin versions. plugin_versions_generate.go has been added which generates plugin_versions.go. All terraform plugin files the installer uses have been updated to use the plugin version. All terraform config files have been updated to use the local providers. A terraform.rc file has been added to specify where the local providers are.

A temporary vendor path for terraform is in this PR that allows the location of the new plugin version lock file to be overridden. Once I can get everything green it will be added to our local terraform fork.

https://issues.redhat.com/browse/CORS-1520

https://www.terraform.io/docs/language/providers/requirements.html
https://www.terraform.io/docs/language/dependency-lock.html

jhixson74 · 2021-03-10T18:43:21Z

/test e2e-azure
/test e2e-gcp

jhixson74 · 2021-03-10T21:36:42Z

/test e2e-azure
/test e2e-gcp

jhixson74 · 2021-03-12T03:24:18Z

/retest

jhixson74 · 2021-03-12T19:22:38Z

/retest
/test e2e-azure
/test e2e-gcp

jhixson74 · 2021-03-18T21:32:32Z

/test e2e-azure
/test e2e-gcp

jhixson74 · 2021-03-19T00:40:49Z

/test e2e-gcp
/test e2e-openstack

staebler

This looks really good. I have some concerns about how we are going about determining the version for the providers, but the overall course of this is spectacular.

pkg/terraform/exec/plugins/plugin_versions_generate.go

pkg/asset/cluster/cluster.go

pkg/terraform/exec/plugins/aws.go

pkg/terraform/exec/plugins/plugin_versions_generate.go

staebler · 2021-03-24T22:50:01Z

pkg/terraform/exec/plugins/plugin_versions_generate.go

+			url = fmt.Sprintf("https://%s", path)
+		}
+
+		// git clone if directory doesn't exist, else git pull


I don't quite follow why we need to get the repo and get the tags. Why is the version declared for the module not sufficient? Even if it is a psuedo version, it still starts with a semver.

Following up on this, I do notice that the semver in the psuedo version is not the same as the semver that terraform expects. I assume this is because of the dastardly v2 missing in many of the provider modules.

staebler

I also get a one-line change in vendor/github.com/hashicorp/terraform-plugin-test/v2/helper.go when I run go mod vendor.

diff --git a/vendor/github.com/hashicorp/terraform-plugin-test/v2/helper.go b/vendor/github.com/hashicorp/terraform-plugin-test/v2/helper.go
index 87a15b30e..a2cc47050 100644
--- a/vendor/github.com/hashicorp/terraform-plugin-test/v2/helper.go
+++ b/vendor/github.com/hashicorp/terraform-plugin-test/v2/helper.go
@@ -145,7 +145,7 @@ func symlinkAuxiliaryProviders(pluginDir string) error {
                if filenameExt == ".zip" {
                        _, err = os.Stat(path)
                        if os.IsNotExist(err) {
-                               zipDecompressor.Decompress(path, filepath.Join(auxiliaryProviderDir, filename), false, 0000)
+                               zipDecompressor.Decompress(path, filepath.Join(auxiliaryProviderDir, filename), false)
                        } else if err != nil {
                                return fmt.Errorf("Unexpected error: %s", err)
                        }

go.mod

Update terraform-provider-aws to 3.1.0 Update terraform-provider-azure to 2.48.0 Update terraform-provider-google to 3.40.0

Update plugin directory to use new terraform plugin paths. Add environment variable that sets location of terraform.rc so that local terraform plugins can be used. New terraform provider requirements are documented here: https://www.terraform.io/docs/language/providers/requirements.html

Add terraform.rc and update terraform modules to specify terraform version and local provider locations.

staebler · 2021-12-14T15:10:32Z

/test e2e-gcp
/test e2e-azure
/test e2e-azurestack

staebler · 2021-12-14T18:03:07Z

Tests are passing to the extent expected.
Let's wait for #5484 to merge so that we can get a good signal for ovirt and openstack.
/approve

staebler · 2021-12-15T13:14:29Z

/test e2e-openstack
/test e2e-ovirt

staebler · 2021-12-15T16:42:15Z

/lgtm
/approve

openshift-ci · 2021-12-15T16:43:01Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: staebler

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:

~~OWNERS~~ [staebler]

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

openshift-bot · 2021-12-15T16:57:29Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-12-15T22:15:10Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-12-15T22:28:11Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-12-16T01:00:26Z

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

openshift-ci · 2021-12-16T01:00:28Z

@openshift-bot: This pull request references Bugzilla bug 1981941, which is invalid:

expected the bug to target the "4.10.0" release, but it targets "---" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

/bugzilla refresh

Recalculating validity in case the underlying Bugzilla bug has changed.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

staebler · 2021-12-16T01:34:27Z

/bugzilla refresh

openshift-ci · 2021-12-16T01:34:33Z

@staebler: This pull request references Bugzilla bug 1981941, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.10.0) matches configured target release for branch (4.10.0)
bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

No GitHub users were found matching the public email listed for the QA contact in Bugzilla (gpei@redhat.com), skipping review request.

In response to this:

/bugzilla refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

openshift-bot · 2021-12-16T02:55:13Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2021-12-16T04:56:01Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-ci · 2021-12-16T05:45:55Z

@jhixson74: All pull requests linked via external trackers have merged:

openshift/installer#4729

Bugzilla bug 1981941 has been moved to the MODIFIED state.

In response to this:

Bug 1981941: Upgrade terraform to 0.14.6

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

openshift-ci · 2021-12-16T07:20:59Z

@jhixson74: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-openstack	`45516ea`	link	false	`/test e2e-openstack`
ci/prow/e2e-ovirt	`45516ea`	link	false	`/test e2e-ovirt`

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

Signed-off-by: Hiro Miyamoto <miyamotoh@us.ibm.com>

…ift-powervs#98) Signed-off-by: Hiro Miyamoto <miyamotoh@us.ibm.com>

openshift-ci-robot requested review from EmilienM and fabianofranz March 9, 2021 23:58

jhixson74 force-pushed the master_update_terraform_0.14.6 branch 7 times, most recently from 7727105 to 598340b Compare March 10, 2021 00:59

jhixson74 force-pushed the master_update_terraform_0.14.6 branch 2 times, most recently from 71af547 to 8bb4f1f Compare March 10, 2021 21:36

jhixson74 force-pushed the master_update_terraform_0.14.6 branch 7 times, most recently from 025f137 to 5c93088 Compare March 11, 2021 19:19

jhixson74 force-pushed the master_update_terraform_0.14.6 branch 2 times, most recently from 4cd1f4d to 06f77d7 Compare March 18, 2021 21:28

jhixson74 force-pushed the master_update_terraform_0.14.6 branch from 06f77d7 to 1c9bb61 Compare March 24, 2021 21:04

staebler reviewed Mar 24, 2021

View reviewed changes

staebler reviewed Mar 25, 2021

View reviewed changes

go.mod Outdated Show resolved Hide resolved

jhixson74 mentioned this pull request Mar 25, 2021

Update terraform-provider-google to v3.40.0 #4792

Closed

jhixson74 added 4 commits December 14, 2021 09:52

Upgrade to Terraform 0.14.6: update go.mod

e45cddb

Update terraform-provider-aws to 3.1.0 Update terraform-provider-azure to 2.48.0 Update terraform-provider-google to 3.40.0

Upgrade to Terraform 0.14.6: update vendor

b79e5f5

Upgrade to Terraform 0.14.6: update terraform files

45516ea

Add terraform.rc and update terraform modules to specify terraform version and local provider locations.

staebler force-pushed the master_update_terraform_0.14.6 branch from 9b94a71 to 45516ea Compare December 14, 2021 15:00

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 14, 2021

openshift-ci bot assigned staebler Dec 15, 2021

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 15, 2021

openshift-ci bot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Dec 16, 2021

openshift-merge-robot merged commit 1c44377 into openshift:master Dec 16, 2021

miyamotoh added a commit to miyamotoh/installer that referenced this pull request Jan 20, 2022

Adding versions.tf to keep up with upstream PR openshift#4729

06c495d

Signed-off-by: Hiro Miyamoto <miyamotoh@us.ibm.com>

clnperez pushed a commit to openshift-powervs/installer that referenced this pull request Jan 20, 2022

Adding versions.tf to keep up with upstream PR openshift#4729 (#98)

4e35656

Signed-off-by: Hiro Miyamoto <miyamotoh@us.ibm.com>

mjturek pushed a commit to mjturek/installer that referenced this pull request Feb 25, 2022

Adding versions.tf to keep up with upstream PR openshift#4729 (opensh…

2598b04

…ift-powervs#98) Signed-off-by: Hiro Miyamoto <miyamotoh@us.ibm.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bug 1981941: Upgrade terraform to 0.14.6 #4729

Bug 1981941: Upgrade terraform to 0.14.6 #4729

jhixson74 commented Mar 9, 2021 •

edited

Loading

jhixson74 commented Mar 10, 2021

jhixson74 commented Mar 10, 2021

jhixson74 commented Mar 12, 2021

jhixson74 commented Mar 12, 2021

jhixson74 commented Mar 18, 2021

jhixson74 commented Mar 19, 2021

staebler left a comment

staebler Mar 24, 2021

staebler Apr 1, 2021

staebler left a comment •

edited

Loading

staebler commented Dec 14, 2021

staebler commented Dec 14, 2021

staebler commented Dec 15, 2021

staebler commented Dec 15, 2021

openshift-ci bot commented Dec 15, 2021

openshift-bot commented Dec 15, 2021

openshift-bot commented Dec 15, 2021

openshift-bot commented Dec 15, 2021

openshift-bot commented Dec 16, 2021

openshift-ci bot commented Dec 16, 2021

staebler commented Dec 16, 2021

openshift-ci bot commented Dec 16, 2021

openshift-bot commented Dec 16, 2021

openshift-bot commented Dec 16, 2021

openshift-ci bot commented Dec 16, 2021

openshift-ci bot commented Dec 16, 2021

Bug 1981941: Upgrade terraform to 0.14.6 #4729

Bug 1981941: Upgrade terraform to 0.14.6 #4729

Conversation

jhixson74 commented Mar 9, 2021 • edited Loading

jhixson74 commented Mar 10, 2021

jhixson74 commented Mar 10, 2021

jhixson74 commented Mar 12, 2021

jhixson74 commented Mar 12, 2021

jhixson74 commented Mar 18, 2021

jhixson74 commented Mar 19, 2021

staebler left a comment

Choose a reason for hiding this comment

staebler Mar 24, 2021

Choose a reason for hiding this comment

staebler Apr 1, 2021

Choose a reason for hiding this comment

staebler left a comment • edited Loading

Choose a reason for hiding this comment

staebler commented Dec 14, 2021

staebler commented Dec 14, 2021

staebler commented Dec 15, 2021

staebler commented Dec 15, 2021

openshift-ci bot commented Dec 15, 2021

openshift-bot commented Dec 15, 2021

openshift-bot commented Dec 15, 2021

openshift-bot commented Dec 15, 2021

openshift-bot commented Dec 16, 2021

openshift-ci bot commented Dec 16, 2021

staebler commented Dec 16, 2021

openshift-ci bot commented Dec 16, 2021

openshift-bot commented Dec 16, 2021

openshift-bot commented Dec 16, 2021

openshift-ci bot commented Dec 16, 2021

openshift-ci bot commented Dec 16, 2021

jhixson74 commented Mar 9, 2021 •

edited

Loading

staebler left a comment •

edited

Loading