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.

Sign up for GitHub

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

Jump to bottom

Bug 1819492: vsphere upi and metal: terraform 0.12.x update, general updates and reorg #3429

Merged
merged 3 commits into from Apr 21, 2020
Merged

Bug 1819492: vsphere upi and metal: terraform 0.12.x update, general updates and reorg #3429

merged 3 commits into from Apr 21, 2020

Conversation

jcpowermac
Copy link
Contributor

  • Update to terraform 0.12.x
  • ipam moved to a module and updated for 0.12
  • creation of vsphere objects moved to module
  • removal of etcd dns records
  • domain dns records separated from creating rhcos node a records
  • create load balancer using openshift haproxy image and an additional
    rhcos virtual machine
  • create dns A record for lb ip and api, api-int, *.apps
  • change virtual machine ignition extra config to file path string vs
    ignition string. Simplifies bootstrap and other instance configuration
  • Updated Dockerfile CI UPI image for 0.12.24

@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 8, 2020
This was referenced Apr 9, 2020
Closed
Merged
@DanyC97 DanyC97 mentioned this pull request Apr 13, 2020
Closed
@LorbusChris
Copy link
Member

@jcpowermac feel free to include/cherry pick the two remaining commits from #3235 on this PR (I've removed the commit regarding vsphere from there)

@sdodson
Copy link
Member

sdodson commented Apr 13, 2020

/test e2e-vsphere-upi

@sdodson
Copy link
Member

sdodson commented Apr 13, 2020

/test e2e-vsphere

@LorbusChris
Copy link
Member

/retest
/test e2e-vsphere-upi

@bparees
Copy link
Contributor

bparees commented Apr 16, 2020

can we get this unstuck?

@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 16, 2020
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 16, 2020
@jcpowermac jcpowermac changed the title [wip] vsphere upi: terraform update, general updates and reorg vsphere upi: terraform update, general updates and reorg Apr 16, 2020
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 16, 2020
@jcpowermac jcpowermac changed the title vsphere upi: terraform update, general updates and reorg vsphere upi and metal: terraform 0.12.x update, general updates and reorg Apr 16, 2020
@jcpowermac
Copy link
Contributor Author

/test e2e-vsphere-upi

@LorbusChris
Copy link
Member

/test e2e-metal

@jcpowermac
Copy link
Contributor Author

vsphere test failure:

Error: cannot locate virtual machine or template with UUID "4236d22e-fd2b-b262-d0e8-301208534da3": Post https://vcsa-ci.vmware.devcluster.openshift.com/sdk: dial tcp: lookup vcsa-ci.vmware.devcluster.openshift.com on 172.30.0.10:53: dial udp 172.30.0.10:53: operation was canceled

/test e2e-vsphere-upi

LorbusChris
LorbusChris reviewed Apr 16, 2020
View reviewed changes
Copy link
Member

@LorbusChris LorbusChris left a comment

Choose a reason for hiding this comment

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

just a nit. I also think it'd be cleaner to amend the metal commit to include the rebase changes.

images/installer/Dockerfile.upi.ci Outdated Show resolved Hide resolved
@jcpowermac
Copy link
Contributor Author

/test e2e-vsphere-upi

@LorbusChris
Copy link
Member

/test e2e-metal
/approve

@jcpowermac
Copy link
Contributor Author

vsphere needs this change:
openshift/release#8373
I will work on figuring out a solution if I have time tomorrow. Most likely next week.

@sdodson
Copy link
Member

sdodson commented Apr 17, 2020

/test e2e-vsphere-upi

1 similar comment
@jcpowermac
Copy link
Contributor Author

/test e2e-vsphere-upi

@jcpowermac
Copy link
Contributor Author

/test e2e-vsphere-upi
vsphere env is really busy with jobs atm

@jcpowermac
Copy link
Contributor Author

vsphere status:

Flaky tests:

[sig-api-machinery] CustomResourcePublishOpenAPI [Privileged:ClusterAdmin] works for CRD without validation schema [Conformance] [Suite:openshift/conformance/parallel/minimal] [Suite:k8s]

Writing JUnit report to /tmp/artifacts/junit/junit_e2e_20200417-143508.xml

1 flakes detected, suite allows passing with only flakes

890 pass, 1451 skip (19m27s)

@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abhinavdahiya, LorbusChris, sdodson

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 [abhinavdahiya,sdodson]

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

@abhinavdahiya
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 20, 2020
@abhinavdahiya
Copy link
Contributor

let's keep the hold untill metal e2e CI job at least completes setup

@LorbusChris
Copy link
Member

I think as of today this also requires a bugzilla/valid-bug label

@jcpowermac jcpowermac changed the title vsphere upi and metal: terraform 0.12.x update, general updates and reorg Bug 1819492: vsphere upi and metal: terraform 0.12.x update, general updates and reorg Apr 20, 2020
@openshift-ci-robot openshift-ci-robot added bugzilla/high bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Apr 20, 2020
@openshift-ci-robot
Copy link
Contributor

@jcpowermac: This pull request references Bugzilla bug 1819492, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.5.0) matches configured target release for branch (4.5.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1819492: vsphere upi and metal: terraform 0.12.x update, general updates and reorg

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.

@sdodson
Copy link
Member

sdodson commented Apr 20, 2020

/test e2e-metal

1 similar comment
@jcpowermac
Copy link
Contributor Author

/test e2e-metal

@LorbusChris
Copy link
Member

/retest

@sdodson
Copy link
Member

sdodson commented Apr 20, 2020

Packet and matchbox problems maybe auth in https://prow.svc.ci.openshift.org/view/gcs/origin-ci-test/pr-logs/pull/openshift_installer/3429/pull-ci-openshift-installer-master-e2e-metal/214
Terraform provider installation problems in https://prow.svc.ci.openshift.org/view/gcs/origin-ci-test/pr-logs/pull/openshift_installer/3429/pull-ci-openshift-installer-master-e2e-metal/215
/test e2e-metal

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Apr 21, 2020 •
edited

@jcpowermac: The following tests failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/prow/e2e-vsphere c66f34f link /test e2e-vsphere
ci/prow/e2e-ovirt 62baf0d link /test e2e-ovirt

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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.

@LorbusChris
Copy link
Member

/test e2e-metal

@LorbusChris
Copy link
Member

let's keep the hold untill metal e2e CI job at least completes setup

metal e2e has passed.

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 21, 2020
@sdodson
Copy link
Member

sdodson commented Apr 21, 2020

/override e2e-aws
/override e2e-aws-upgrade
irrelevant

@openshift-ci-robot
Copy link
Contributor

@sdodson: /override requires a failed status context to operate on.
The following unknown contexts were given:

  • e2e-aws
  • e2e-aws-upgrade

Only the following contexts were expected:

  • ci/prow/e2e-aws
  • ci/prow/e2e-aws-fips
  • ci/prow/e2e-aws-scaleup-rhel7
  • ci/prow/e2e-aws-upgrade
  • ci/prow/e2e-libvirt
  • ci/prow/e2e-metal
  • ci/prow/e2e-openstack
  • ci/prow/e2e-ovirt
  • ci/prow/e2e-vsphere-upi
  • ci/prow/gofmt
  • ci/prow/golint
  • ci/prow/govet
  • ci/prow/images
  • ci/prow/shellcheck
  • ci/prow/tf-fmt
  • ci/prow/tf-lint
  • ci/prow/unit
  • ci/prow/verify-vendor
  • ci/prow/yaml-lint
  • tide

In response to this:

/override e2e-aws
/override e2e-aws-upgrade
irrelevant

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.

@sdodson
Copy link
Member

sdodson commented Apr 21, 2020

/override ci/prow/e2e-aws
/override ci/prow/e2e-aws-upgrade
irrelevant

@openshift-ci-robot
Copy link
Contributor

@sdodson: Overrode contexts on behalf of sdodson: ci/prow/e2e-aws, ci/prow/e2e-aws-upgrade

In response to this:

/override ci/prow/e2e-aws
/override ci/prow/e2e-aws-upgrade
irrelevant

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
Copy link
Contributor

/retest

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

@openshift-merge-robot openshift-merge-robot merged commit 83213bd into openshift:master Apr 21, 2020
@openshift-ci-robot
Copy link
Contributor

@jcpowermac: All pull requests linked via external trackers have merged: openshift/installer#3429. Bugzilla bug 1819492 has been moved to the MODIFIED state.

In response to this:

Bug 1819492: vsphere upi and metal: terraform 0.12.x update, general updates and reorg

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.

@jcpowermac
Copy link
Contributor Author

/cherry-pick release-4.4

@openshift-cherrypick-robot
Copy link

@jcpowermac: #3429 failed to apply on top of branch "release-4.4":

Applying: upi/metal: Terraform 0.12.x syntax updates
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	upi/metal/main.tf
Falling back to patching base and 3-way merge...
Auto-merging upi/metal/main.tf
CONFLICT (content): Merge conflict in upi/metal/main.tf
Patch failed at 0002 upi/metal: Terraform 0.12.x syntax updates

In response to this:

/cherry-pick release-4.4

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.

LorbusChris pushed a commit to LorbusChris/installer that referenced this pull request Apr 22, 2020
@jcpowermac @LorbusChris
UPSTREAM openshift#3429: vsphere upi: terraform update, general updat…
c1fe0d2 
…es and reorg

- Update to terraform 0.12.x
- ipam moved to a module and updated for 0.12
- creation of vsphere objects moved to module
- removal of etcd dns records
- domain dns records separated from creating rhcos node a records
- create load balancer using openshift haproxy image and an additional
rhcos virtual machine
- create dns A record for lb ip and api, api-int, *.apps
- change virtual machine ignition extra config to file path string vs
ignition string.  Simplifies bootstrap and other instance configuration
- Updated Dockerfile CI UPI image for 0.12.24
LorbusChris added a commit to LorbusChris/installer that referenced this pull request Apr 22, 2020
@LorbusChris
UPSTREAM openshift#3429: upi/metal: Terraform 0.12.x syntax updates
f17e3eb
@jcpowermac jcpowermac mentioned this pull request Apr 22, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@abhinavdahiya abhinavdahiya abhinavdahiya left review comments

@patrickdillon patrickdillon patrickdillon left review comments

@LorbusChris LorbusChris LorbusChris left review comments

@mtnbikenc mtnbikenc Awaiting requested review from mtnbikenc

Assignees

@abhinavdahiya abhinavdahiya

@patrickdillon patrickdillon

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
10 participants
@jcpowermac @LorbusChris @sdodson @bparees @patrickdillon @abhinavdahiya @openshift-ci-robot @openshift-bot @openshift-cherrypick-robot @openshift-merge-robot