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

vSphere: Add IPI-specific validation. #3372

Merged

Conversation

patrickdillon
Copy link
Contributor

@patrickdillon patrickdillon commented Mar 30, 2020

vSphere IPI requires fields in the install-config that are optional in UPI, specifically cluster, network, and the VIPs. In order to not break previous working IPI installs 7e82337 performs this IPI-specific validation when creating tfvars.

Jira: CORS-1354
Related: openshift/release#7989

Refactors VIP checks into a reusable helper function, adding a distinction between required/invalid VIPs, and updating tests accordingly.
Adds platform validation when loading install config.
@abhinavdahiya
Copy link
Contributor

Using ipi UPI in code imo is not great! Let's find more appropriate names

Secondly, I think we should not overload the tfvars asset, rather create a new one that can perform this validation like the permissions check...

@patrickdillon patrickdillon force-pushed the vsphere-ipi-validate branch 3 times, most recently from 1ff3573 to 17b7357 Compare April 1, 2020 01:37
@patrickdillon
Copy link
Contributor Author

Using ipi UPI in code imo is not great! Let's find more appropriate names

Secondly, I think we should not overload the tfvars asset, rather create a new one that can perform this validation like the permissions check...

@abhinavdahiya PTAL also please check the related PR openshift/release#7989

@abhinavdahiya
Copy link
Contributor

/test e2e-vsphere
/test e2e-vsphere-upi

// ValidateForProvisioning performs platform validation specifically for installer-
// provisioned infrastructure. In this case, self-hosted networking is a requirement
// when the installer creates infrastructure for vSphere clusters.
func ValidateForProvisioning(ic *types.InstallConfig) error {
Copy link
Contributor

Choose a reason for hiding this comment

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

shouldn't this call the Validate ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't think so? Validate would already be called when loading installconfig asset in cd4aee1

@abhinavdahiya
Copy link
Contributor

/approve

overall looks good, just few comments.

@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abhinavdahiya

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

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 2, 2020
This commit creates a new asset to perform platform validation specifically for cluster creation. This is useful for when UPI and IPI install configs may have different requirements. In the case of vSphere, IPI requires cluster and VIPs but these are optional in UPI.

IPI requires the following fields which are optional for UPI:
- Network
- Cluster
- APIVIP
- IngressVIP
- DNSVIP
Generated with:
$ openshift-install graph | dot -Tsvg >docs/design/resource_dep.svg

using:
$ dot -V
dot - graphviz version 2.40.1 (0)
@abhinavdahiya
Copy link
Contributor

/test e2e-vsphere
/test e2e-vpshere-upi

LGTM, just waiting for these jobs to finish

@abhinavdahiya
Copy link
Contributor

/test e2e-vsphere-upi

@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 2, 2020
@openshift-bot
Copy link
Contributor

/retest

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

1 similar comment
@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

2 similar comments
@openshift-bot
Copy link
Contributor

/retest

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

@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 b74e391 into openshift:master Apr 2, 2020
@openshift-ci-robot
Copy link
Contributor

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

Test name Commit Details Rerun command
ci/prow/e2e-libvirt c7540c0 link /test e2e-libvirt
ci/prow/e2e-vsphere-upi c7540c0 link /test e2e-vsphere-upi
ci/prow/e2e-vsphere c7540c0 link /test e2e-vsphere
ci/prow/e2e-aws-scaleup-rhel7 c7540c0 link /test e2e-aws-scaleup-rhel7

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.

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.

None yet

5 participants