Add machines and machinesets for VSphere #2889

patrickdillon · 2020-01-07T16:00:11Z

Adds machines and machinesets for VSphere workers and control plane. Plumbs values through to tfvars.
/cc @jcpowermac

jcpowermac · 2020-01-07T16:50:42Z

cc:
@mtnbikenc
@dav1x

jcpowermac · 2020-01-07T16:52:03Z

pkg/asset/machines/vsphere/machines.go

Template should be the name of the virtual machine template - config.Platform.VSphere.Template

@patrickdillon I am wrong about this. We will download the ova and add it to vSphere. That's still in the backlog.

jcpowermac · 2020-01-07T16:54:33Z

pkg/asset/machines/vsphere/machines.go

@patrickdillon I missed network from types/vsphere/platform.go

jcpowermac · 2020-01-07T17:03:42Z

pkg/asset/machines/worker.go

Based on reviewing other providers it seems MachinePool should contain:
https://github.com/openshift/machine-api-operator/blob/master/pkg/apis/vsphereprovider/v1alpha1/vsphereproviderconfig_types.go#L32-L54

Though I am not sure about Network NetworkSpec.

Hmm maybe not NetworkSpec since that seems to environmental specific.

jcpowermac · 2020-01-07T17:05:35Z

pkg/types/vsphere/platform.go

@patrickdillon can you add

Network string `json:"network,omitempty"`

since I forgot it.

@jcpowermac I can add Network to the Platform. omitempty means it is optional, but it looks like the provider requires a NetworkName: https://github.com/openshift/machine-api-operator/blob/master/pkg/apis/vsphereprovider/v1alpha1/vsphereproviderconfig_types.go#L32 WDYT?

@patrickdillon UPI doesn't need it and if we don't include omitempty then I am assuming it would become required parameter for UPI?

I am trying to gain some background on this, but have to run to another meeting in 5 mins.

UPI doesn't need it

But we do need to pass a value to terraform, right? https://github.com/openshift/installer/pull/2841/files#diff-779e91f6248cdf8645f11e13f8849d28R47

I think we just need to make sure those values match here.

@patrickdillon yeah for IPI terraform and the machine-api-operator:
https://github.com/openshift/machine-api-operator/blob/master/pkg/controller/vsphere/reconciler.go#L324-L325

patrickdillon · 2020-01-09T20:30:33Z

/woof

openshift-ci-robot · 2020-01-09T20:30:34Z

@patrickdillon:

Details

In response to this:

/woof

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.

pkg/tfvars/gcp/gcp.go

jstuever · 2020-01-14T19:41:39Z

/cc @jstuever

jstuever

/lgtm
I didn't see any obvious issues; we'll see when we get all the pieces together.

jstuever · 2020-01-14T20:01:24Z

/assign @jcpowermac

openshift-bot · 2020-01-15T19:55:23Z

/retest

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

openshift-bot · 2020-01-15T20:47:52Z

/retest

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

openshift-bot · 2020-01-15T21:52:40Z

/retest

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

openshift-bot · 2020-01-15T22:44:51Z

/retest

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

openshift-bot · 2020-01-15T22:57:14Z

/retest

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

openshift-bot · 2020-01-15T23:23:27Z

/retest

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

patrickdillon · 2020-01-15T23:36:59Z

/test images
/test e2e-aws-upgrade
/skip

openshift-bot · 2020-01-16T00:15:25Z

/retest

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

patrickdillon · 2020-01-16T00:30:43Z

/skip

openshift-bot · 2020-01-16T00:42:27Z

/retest

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

jcpowermac · 2020-01-16T00:44:43Z

/skip

openshift-bot · 2020-01-16T01:07:20Z

/retest

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

openshift-bot · 2020-01-16T01:20:39Z

/retest

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

openshift-bot · 2020-01-16T01:33:31Z

/retest

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

…odes. Vendors additional vsphere-provider api code using dep ensure.

jcpowermac · 2020-01-16T01:40:08Z

/lgtm

jcpowermac · 2020-01-16T01:55:39Z

/test all

patrickdillon · 2020-01-16T02:12:27Z

/hold
libvirt build image failure is causing all tests to fail

patrickdillon · 2020-01-16T02:25:00Z

/hold cancel
/retest

openshift-bot · 2020-01-16T02:51:18Z

/retest

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

openshift-bot · 2020-01-16T03:04:18Z

/retest

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

openshift-bot · 2020-01-16T03:17:17Z

/retest

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

openshift-bot · 2020-01-16T03:30:30Z

/retest

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

openshift-ci-robot · 2020-01-16T04:04:21Z

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

Test name	Commit	Details	Rerun command
ci/prow/e2e-libvirt	`903d13c`	link	`/test e2e-libvirt`
ci/prow/e2e-openstack	`903d13c`	link	`/test e2e-openstack`
ci/prow/e2e-ovirt	`903d13c`	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.

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.

openshift-ci-robot requested a review from jcpowermac January 7, 2020 16:00

openshift-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jan 7, 2020

jcpowermac reviewed Jan 7, 2020

View reviewed changes

patrickdillon force-pushed the vsphere-machinesets-cors-1318 branch from 0fe9fa5 to 9c5d8cf Compare January 10, 2020 16:50

openshift-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jan 10, 2020

patrickdillon force-pushed the vsphere-machinesets-cors-1318 branch from 9c5d8cf to 3837fcc Compare January 10, 2020 17:02

openshift-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jan 10, 2020

jcpowermac reviewed Jan 10, 2020

View reviewed changes

pkg/tfvars/gcp/gcp.go Outdated Show resolved Hide resolved

patrickdillon force-pushed the vsphere-machinesets-cors-1318 branch 2 times, most recently from 91b6692 to fcf7f64 Compare January 10, 2020 17:27

openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jan 10, 2020

patrickdillon force-pushed the vsphere-machinesets-cors-1318 branch from fcf7f64 to 180ec05 Compare January 14, 2020 19:01

patrickdillon changed the title ~~WIP: Add machines and machinesets for VSphere~~ Add machines and machinesets for VSphere Jan 14, 2020

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 Jan 14, 2020

patrickdillon force-pushed the vsphere-machinesets-cors-1318 branch from 180ec05 to 12d7e49 Compare January 14, 2020 19:05

openshift-ci-robot requested a review from jstuever January 14, 2020 19:41

jstuever approved these changes Jan 14, 2020

View reviewed changes

openshift-ci-robot assigned jstuever Jan 14, 2020

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 14, 2020

jstuever removed their assignment Jan 14, 2020

openshift-ci-robot assigned jcpowermac Jan 14, 2020

Add machine and machineset definitions for control plane and worker n…

903d13c

…odes. Vendors additional vsphere-provider api code using dep ensure.

patrickdillon force-pushed the vsphere-machinesets-cors-1318 branch from 656723c to 903d13c Compare January 16, 2020 01:37

openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Jan 16, 2020

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 16, 2020

openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 16, 2020

openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 16, 2020

openshift-merge-robot merged commit 4856db5 into openshift:master Jan 16, 2020

Add machines and machinesets for VSphere #2889

Add machines and machinesets for VSphere #2889

Uh oh!

Conversation

patrickdillon commented Jan 7, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jcpowermac commented Jan 7, 2020

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

patrickdillon Jan 7, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

patrickdillon commented Jan 9, 2020

Uh oh!

openshift-ci-robot commented Jan 9, 2020

Uh oh!

Uh oh!

jstuever commented Jan 14, 2020

Uh oh!

jstuever left a comment

Choose a reason for hiding this comment

Uh oh!

jstuever commented Jan 14, 2020

Uh oh!

openshift-bot commented Jan 15, 2020

Uh oh!

openshift-bot commented Jan 15, 2020

Uh oh!

openshift-bot commented Jan 15, 2020

Uh oh!

openshift-bot commented Jan 15, 2020

Uh oh!

openshift-bot commented Jan 15, 2020

Uh oh!

openshift-bot commented Jan 15, 2020

Uh oh!

patrickdillon commented Jan 15, 2020

Uh oh!

openshift-bot commented Jan 16, 2020

Uh oh!

patrickdillon commented Jan 16, 2020

Uh oh!

openshift-bot commented Jan 16, 2020

Uh oh!

jcpowermac commented Jan 16, 2020

Uh oh!

openshift-bot commented Jan 16, 2020

Uh oh!

openshift-bot commented Jan 16, 2020

Uh oh!

openshift-bot commented Jan 16, 2020

Uh oh!

jcpowermac commented Jan 16, 2020

Uh oh!

jcpowermac commented Jan 16, 2020

Uh oh!

patrickdillon commented Jan 16, 2020

Uh oh!

patrickdillon commented Jan 16, 2020

Uh oh!

openshift-bot commented Jan 16, 2020

patrickdillon commented Jan 7, 2020 •

edited

Loading

patrickdillon Jan 7, 2020 •

edited

Loading