Deploy shoots in existing Neutron networks #317
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gardener-robot
added
kind/api-change
Closed
gardener-robot-ci-3
added
reviewed/ok-to-test
|
/assign |
dkistner
reviewed
Jul 23, 2021
docs/usage-as-end-user.md
Outdated
| @@ -62,6 +63,8 @@ If you don't know which floating pools are available look it up in the respectiv | |||
|
|
|||
| With `floatingPoolSubnetName` you can explicitly define to which subnet in the floating pool network (defined via `floatingPoolName`) the router should be attached to. | |||
|
|
|||
| If `networks.id` is an optional field. If it is given, you can specify the uuid of an existing Neutron network (created manually, by other tooling, ...) that should be reused. A new subnet for the Shoot will be created in it. | |||
There was a problem hiding this comment.
Suggested change
| If `networks.id` is an optional field. If it is given, you can specify the uuid of an existing Neutron network (created manually, by other tooling, ...) that should be reused. A new subnet for the Shoot will be created in it. | |
| If `networks.id` is an optional field. If it is given, you can specify the uuid of an existing private Neutron network (created manually, by other tooling, ...) that should be reused. A new subnet for the Shoot will be created in it. |
| @@ -41,6 +41,8 @@ type Networks struct { | |||
| Worker string | |||
| // Workers is a CIDRs of a worker subnet (private) to create (used for the VMs). | |||
| Workers string | |||
| // ID is the name of an existing network that should be reused | |||
There was a problem hiding this comment.
Suggested change
| // ID is the name of an existing network that should be reused | |
| // ID is the name of an existing private network that should be reused. |
pkg/controller/worker/machines.go
Outdated
| @@ -158,6 +163,10 @@ func (w *workerDelegate) generateMachineConfig(ctx context.Context) error { | |||
| }, | |||
| } | |||
|
|
|||
| if !infrastructureStatus.Networks.ManagedPrivateNetwork { | |||
| machineClassSpec["subnetID"] = subnet.ID | |||
There was a problem hiding this comment.
Here we had the discussion if not now always want to pass the subnet id right?
That would force mcm for all new machine to manage also the port. Existing machines would not be rolled as the subnet id is not passed to the worker pool hash, right?
kon-angelo
force-pushed
the
reuse-network
branch
from
b9c2d85
to
f3f8e81
Compare
gardener-robot-ci-1
added
the
reviewed/ok-to-test
gardener-robot-ci-3
removed
the
reviewed/ok-to-test
Co-authored-by: Dominic Kistner <dominic.kistner@sap.com> Co-authored-by: Thomas Buchner <MrBatschner@users.noreply.github.com>
kon-angelo
force-pushed
the
reuse-network
branch
from
f3f8e81
to
ec4fb3b
Compare
gardener-robot-ci-1
added
reviewed/ok-to-test
gardener-robot
added
size/m
gardener-robot-ci-2
added
the
reviewed/ok-to-test
gardener-robot-ci-1
removed
the
reviewed/ok-to-test
dkistner
reviewed
Jul 30, 2021
| @@ -37,6 +37,9 @@ providerSpec: | |||
| availabilityZone: {{ $machineClass.availabilityZone }} | |||
| flavorName: {{ $machineClass.machineType }} | |||
| keyName: {{ $machineClass.keyName }} | |||
| {{- if $machineClass.subnetID }} | |||
There was a problem hiding this comment.
Is that check now still required when we always pass a subnet id?
gardener-robot-ci-3
added
the
reviewed/ok-to-test
gardener-robot-ci-1
removed
the
reviewed/ok-to-test
dkistner
approved these changes
Aug 3, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
How to categorize this PR?
/area control-plane
/kind enhancement
/platform openstack
What this PR does / why we need it:
Allows the creation of shoots into existing user-managed networks.
Which issue(s) this PR fixes:
Fixes #
Special notes for your reviewer:
Release note: