OpenStack: Custom API and Ingress vip addresses#3366

Merged

openshift-merge-robot merged 1 commit intoopenshift:masterfrom

iamemilio:custom_vips

Apr 8, 2020

iamemilio commented Mar 27, 2020 •

edited

Loading

Customers may want to plumb the networking that enables external access to the cluster in a number of ways. To make their job easier, this feature allows them to select fixed IP addresses that they can reach the API and apps ingress at in their OpenShift cluster. This allows them to use/reuse pre-existing routing and external access schemes more easily. This adds an additional optional set of values to the openstack platform section of the install config as follows:

platform:
  openstack:
    cloud: ...
    apiVIP: "10.0.0.35"
    ingressVIP: "10.0.0.19"

Note that the default values have not changed. APIVIP still defaults to the 5 on the machineNetwork, and IngressVIP still defaults to the 7.

openshift-ci-robot requested review from jhixson74 and jstuever

March 27, 2020 18:37

iamemilio force-pushed the custom_vips branch from 432218c to e753c9a Compare

March 27, 2020 18:48

iamemilio mentioned this pull request

4.5: OpenStack: support customer provisioned subnets openshift/enhancements#246

Merged

iamemilio force-pushed the custom_vips branch from e753c9a to aa03f4b Compare

March 27, 2020 18:59

Author

iamemilio commented Mar 27, 2020

openshift-ci-robot requested a review from Fedosin

March 27, 2020 19:08

Author

iamemilio commented Mar 27, 2020

/label platform/openstack

openshift-ci-robot added the platform/openstack label

iamemilio force-pushed the custom_vips branch from aa03f4b to 1c16b16 Compare

March 30, 2020 17:18

openshift-ci-robot added the needs-rebase label

iamemilio force-pushed the custom_vips branch from 1c16b16 to fe38c8d Compare

March 30, 2020 17:19

openshift-ci-robot removed the needs-rebase label

iamemilio force-pushed the custom_vips branch from fe38c8d to 8b90571 Compare

March 30, 2020 18:44

Contributor

jstuever commented Mar 30, 2020

/cc @adduarte
/uncc @jstuever

openshift-ci-robot requested review from adduarte and removed request for jstuever

March 30, 2020 23:34

Author

iamemilio commented Mar 31, 2020

/retest

iamemilio force-pushed the custom_vips branch from 8b90571 to bc86246 Compare

March 31, 2020 14:03

Fedosin reviewed

View reviewed changes

pkg/types/openstack/platform.go Outdated

Contributor

Fedosin Mar 31, 2020

APIVIP is the static IP...

pkg/types/openstack/platform.go Outdated

Contributor

Fedosin Mar 31, 2020

IngressVIP is the static IP...

Fedosin reviewed

View reviewed changes

pkg/types/openstack/validation/platform.go Outdated

Contributor

Fedosin Mar 31, 2020

fldPath.Child("ingressVIP")

pkg/types/openstack/validation/platform.go Outdated

Contributor

Fedosin Mar 31, 2020

fldPath.Child("ingressVIP")

Author

iamemilio commented Mar 31, 2020

/hold race condition for ports

openshift-ci-robot added the do-not-merge/hold label

iamemilio force-pushed the custom_vips branch from bc86246 to 3562683 Compare

April 1, 2020 19:41

Author

iamemilio commented Apr 1, 2020

/hold cancel

openshift-ci-robot removed the do-not-merge/hold label

iamemilio force-pushed the custom_vips branch from 3562683 to 05d6608 Compare

April 1, 2020 20:12

Author

iamemilio commented Apr 1, 2020

/retest

Contributor

Fedosin commented Apr 3, 2020

/lgtm

openshift-ci-robot assigned Fedosin

abhinavdahiya reviewed

View reviewed changes

pkg/types/openstack/platform.go Outdated

Contributor

abhinavdahiya Apr 8, 2020

machinesNetwork -> machineNetwork

also it seems like we pick the 5th host in the first network range of the list.

abhinavdahiya reviewed

View reviewed changes

pkg/types/openstack/validation/platform.go Outdated

Contributor

abhinavdahiya Apr 8, 2020

machineNetwork[0]

abhinavdahiya reviewed

View reviewed changes

pkg/types/openstack/validation/platform.go Outdated

Comment on lines 70 to 74

Contributor

abhinavdahiya Apr 8, 2020

the 2 step check is same for API and ingress VIP, so maybe use one function for both..

abhinavdahiya reviewed

View reviewed changes

pkg/types/openstack/validation/platform_test.go Outdated

Comment on lines 28 to 32

Contributor

abhinavdahiya Apr 8, 2020

Suggested change

      
            		MachineNetwork: []types.MachineNetworkEntry{
          
            			{
          
            				CIDR: *ipnet.MustParseCIDR("10.0.0.0/16"),
          
            			},
          
            		},
          
            		MachineNetwork: []types.MachineNetworkEntry{{
          
            				CIDR: *ipnet.MustParseCIDR("10.0.0.0/16"),
          
            		}},

abhinavdahiya reviewed

View reviewed changes

pkg/types/openstack/validation/platform_test.go Outdated

Contributor

abhinavdahiya Apr 8, 2020

🤣

Contributor

abhinavdahiya commented Apr 8, 2020

few nits, but i'll leave them upto openstack-approvers

/approve

/hold just to give people some time to fix the nits, please free to remove.

openshift-ci-robot added the do-not-merge/hold label

Contributor

openshift-ci-robot commented Apr 8, 2020

[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

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [abhinavdahiya]

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 added the approved label


          custom API and Ingress vip addresses

ecf8a2c

co-authored-by: Fedosin mfedosin@redhat.com

iamemilio force-pushed the custom_vips branch from 05d6608 to ecf8a2c Compare

April 8, 2020 13:34

openshift-ci-robot removed the lgtm label

Contributor

Fedosin commented Apr 8, 2020

/lgtm

openshift-ci-robot added the lgtm label

Contributor

Fedosin commented Apr 8, 2020

/retest

Author

iamemilio commented Apr 8, 2020

/hold cancel

openshift-ci-robot removed the do-not-merge/hold label

Contributor

openshift-bot commented Apr 8, 2020

/retest

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

9 similar comments

Contributor

openshift-bot commented Apr 8, 2020

/retest

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

Contributor

openshift-bot commented Apr 8, 2020

/retest

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

Contributor

openshift-bot commented Apr 8, 2020

/retest

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

Contributor

openshift-bot commented Apr 8, 2020

/retest

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

Contributor

openshift-bot commented Apr 8, 2020

/retest

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

Contributor

openshift-bot commented Apr 8, 2020

/retest

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

Contributor

openshift-bot commented Apr 8, 2020

/retest

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

Contributor

openshift-bot commented Apr 8, 2020

/retest

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

Contributor

openshift-bot commented Apr 8, 2020

/retest

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

Contributor

openshift-ci-robot commented Apr 8, 2020

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

Test name	Commit	Details	Rerun command
ci/prow/e2e-aws-scaleup-rhel7	`ecf8a2c`	link	`/test e2e-aws-scaleup-rhel7`
ci/prow/e2e-libvirt	`ecf8a2c`	link	`/test e2e-libvirt`

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-merge-robot merged commit 5e597cc into openshift:master

wking reviewed

View reviewed changes

docs/user/openstack/customization.md

               * `region` (deprecated string): The OpenStack region where the cluster will be created. Currently this value is not used by the installer.
               * `trunkSupport` (optional string): Whether OpenStack ports can be trunked (`1` for true or `0` for false)
-              * `clusterOSImage` (optional string): Either a URL with `http(s)` or `file` scheme to override the default OS image for cluster nodes or an existing Glance image name.
+              * `clusterOSimage` (optional string): Either a URL with `http(s)` or `file` scheme to override the default OS image for cluster nodes or an existing Glance image name.

Member

wking Apr 10, 2020

This needs to match the Go JSON serialization. Fixed via #3439.

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

Reviewers

wking wking left review comments

jhixson74 Awaiting requested review from jhixson74

adduarte Awaiting requested review from adduarte

+2 more reviewers

abhinavdahiya abhinavdahiya left review comments

Fedosin Fedosin left review comments

Labels

approved lgtm platform/openstack