Skip to content

Power VS: Create Remaining TF Resources#5780

Merged
openshift-merge-robot merged 5 commits intoopenshift:masterfrom
clnperez:upstream-vpc-nw
Apr 29, 2022
Merged

Power VS: Create Remaining TF Resources#5780
openshift-merge-robot merged 5 commits intoopenshift:masterfrom
clnperez:upstream-vpc-nw

Conversation

@clnperez
Copy link
Copy Markdown
Contributor

@clnperez clnperez commented Apr 6, 2022

Add the creation of the VPC in IBM Cloud to connect in to the load
balancers, the DHCP Network in Power VS, and the Cloud Connection (a GRE
tunnel wrapper) to connect the two.

This PR also adds time as a Terraform provider because of the way the
IP addresses are retrieved for the server instances. With traditional
Power VS networks, Power VS assigns a static IP. With v1 of the DHCP
service created for IPI, the DHCP server on the private network assigns
the IP. As a result, there is a small amount of time needed to wait between
the instance creation and the IP retrieval from the list of leases.

It also reorganizes some of the resource creation due to this difference in
behavior from the network we did early development with.

Signed-off-by: Christy Norman christy@linux.vnet.ibm.com

@openshift-ci openshift-ci Bot requested review from jhixson74 and jstuever April 6, 2022 20:14
@clnperez
Copy link
Copy Markdown
Contributor Author

clnperez commented Apr 6, 2022

depends on #5614 and #5615

@Prashanth684
Copy link
Copy Markdown
Contributor

splitting the vendoring into a separate commit would help

@clnperez
Copy link
Copy Markdown
Contributor Author

clnperez commented Apr 7, 2022

i'd like to get a 2nd opinion on that from @rna-afk . it's vendoring but its also a new tf provider's vendoring -- as opposed to the normal vendoring for the installer binary

@clnperez
Copy link
Copy Markdown
Contributor Author

clnperez commented Apr 7, 2022

or maybe even from @staebler since he's done most of the tf changes wrt all that

@rna-afk
Copy link
Copy Markdown
Contributor

rna-afk commented Apr 7, 2022

I think it's best to move them to another commit. Would make it easier to read the tf files since terraform changes are just mostly vendor changes

@staebler
Copy link
Copy Markdown
Contributor

staebler commented Apr 7, 2022

or maybe even from @staebler since he's done most of the tf changes wrt all that

I am 100% in support of splitting this PR into multiple commits, with the vendor being one contained commit. At a glance, this is the minimum that I would do.

  1. Commit for adding the new terraform provider.
  2. Commit for vendoring the dependencies of the new provider.
  3. Commit for the tf files.
  4. Commit for the rest.

@patrickdillon
Copy link
Copy Markdown
Contributor

+1. Having vendoring in separate commits makes reviewing much easier.

@clnperez
Copy link
Copy Markdown
Contributor Author

just what i was looking for @staebler. thanks and will do

@openshift-ci openshift-ci Bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 12, 2022
@clnperez
Copy link
Copy Markdown
Contributor Author

got those split up and will fix the merge conflicts. heading out the door for a bit but wanted to get the first half done

@openshift-ci openshift-ci Bot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Apr 12, 2022
@openshift-ci openshift-ci Bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 14, 2022
@clnperez clnperez force-pushed the upstream-vpc-nw branch 3 times, most recently from 3375d26 to 5f9dc3e Compare April 18, 2022 19:37
@clnperez
Copy link
Copy Markdown
Contributor Author

@rna-afk @patrickdillon i don't know why verify-vendor always seems to fail for me. any suggestions? i'm still using go 1.17, and no matter whether i run go mod tidy/vendor using the container or not, nothing changes.

@clnperez
Copy link
Copy Markdown
Contributor Author

ah. rebasing and re-pushing worked even though it didn't change anything i could see 🤷🏻‍♀️

@clnperez
Copy link
Copy Markdown
Contributor Author

actually that didn't work either. i was looking at verify-codegen, not verify-vendor. there was only an issue with one repo, so i just manually moved the dependency version in go.mod:

github.com/vmware/govmomi v0.24.0 => github.com/vmware/govmomi v0.27.4

@openshift-ci openshift-ci Bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 18, 2022
@openshift-ci openshift-ci Bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 19, 2022
@clnperez
Copy link
Copy Markdown
Contributor Author

PR was rebased. PTAL @patrickdillon @rna-afk

@clnperez
Copy link
Copy Markdown
Contributor Author

/test e2e-aws

Copy link
Copy Markdown
Contributor

@patrickdillon patrickdillon left a comment

Choose a reason for hiding this comment

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

I am fine with merging this with the understanding that a later PR will add a separate bootstrap phase.

Can you remove the file .swp file: data/data/powervs/cluster/master/lb/.variables.tf.swp

Then I will approve, lgtm

@clnperez
Copy link
Copy Markdown
Contributor Author

removed that file and re-pushed. @miyamotoh fyi

@patrickdillon
Copy link
Copy Markdown
Contributor

/approve

will LGTM after tests

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Apr 28, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: patrickdillon

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

The pull request process is described here

Details 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

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 28, 2022
@patrickdillon
Copy link
Copy Markdown
Contributor

/retest

@patrickdillon
Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Apr 28, 2022
@openshift-bot
Copy link
Copy Markdown
Contributor

/retest-required

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

@openshift-ci openshift-ci Bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 29, 2022
in order to wait for Power VS machines to have DHCP addresses assigned

Signed-off-by: Christy Norman <christy@linux.vnet.ibm.com>
Signed-off-by: Christy Norman <christy@linux.vnet.ibm.com>
Create Network, VPC, Cloud Connection

Signed-off-by: Christy Norman <christy@linux.vnet.ibm.com>
Signed-off-by: Christy Norman <christy@linux.vnet.ibm.com>
differentiating from the vendor commit in the same patch series that is adding a new terraform provider (time)

Signed-off-by: Christy Norman <christy@linux.vnet.ibm.com>
@openshift-ci openshift-ci Bot removed lgtm Indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Apr 29, 2022
@clnperez
Copy link
Copy Markdown
Contributor Author

@patrickdillon a nutanix commit caused a merge conflict. fixed but needs a new approve, etc.

@rna-afk
Copy link
Copy Markdown
Contributor

rna-afk commented Apr 29, 2022

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Apr 29, 2022
@openshift-bot
Copy link
Copy Markdown
Contributor

/retest-required

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

1 similar comment
@openshift-bot
Copy link
Copy Markdown
Contributor

/retest-required

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

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Apr 29, 2022

@clnperez: 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/okd-e2e-aws a1a6498 link false /test okd-e2e-aws
ci/prow/e2e-metal-ipi a1a6498 link false /test e2e-metal-ipi
ci/prow/e2e-ibmcloud a1a6498 link false /test e2e-ibmcloud
ci/prow/e2e-openstack a1a6498 link false /test e2e-openstack
ci/prow/e2e-crc a1a6498 link false /test e2e-crc
ci/prow/e2e-azure a1a6498 link false /test e2e-azure
ci/prow/e2e-libvirt a1a6498 link false /test e2e-libvirt
ci/prow/e2e-gcp a1a6498 link false /test e2e-gcp

Full PR test history. Your PR dashboard.

Details

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants