salt: Ensure we do not have multi cidr for Control Plane with MetalLB #3533

TeddyAndrieux · 2021-09-14T07:15:46Z

Today we do not support multiple subnets for the Control Plane network when
MetalLB is enabled, so this commit check that it's not the case

See: #3502

bert-e · 2021-09-14T07:15:48Z

Hello teddyandrieux,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

bert-e · 2021-09-14T07:15:53Z

Integration data created

I have created the integration data for the additional destination branches.

this pull request will merge improvement/no-metallb-when-multi-cp-cidr into
development/2.10
w/2.11/improvement/no-metallb-when-multi-cp-cidr will be merged into development/2.11

The following branches will NOT be impacted:

development/2.0
development/2.1
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6
development/2.7
development/2.8
development/2.9

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

bert-e · 2021-09-14T07:15:55Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

bert-e · 2021-09-14T07:16:19Z

History mismatch

Merge commit #623f74118dec411f6c34abe10ff2e41d82c53033 on the integration branch
w/2.11/improvement/no-metallb-when-multi-cp-cidr is merging a branch which is neither the current
branch improvement/no-metallb-when-multi-cp-cidr nor the development branch
development/2.11.

It is likely due to a rebase of the branch improvement/no-metallb-when-multi-cp-cidr and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

TeddyAndrieux · 2021-09-14T07:16:26Z

/reset

bert-e · 2021-09-14T07:16:30Z

Reset complete

I have successfully deleted this pull request's integration branches.

bert-e · 2021-09-14T07:16:36Z

Integration data created

I have created the integration data for the additional destination branches.

this pull request will merge improvement/no-metallb-when-multi-cp-cidr into
development/2.10
w/2.11/improvement/no-metallb-when-multi-cp-cidr will be merged into development/2.11

The following branches will NOT be impacted:

development/2.0
development/2.1
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6
development/2.7
development/2.8
development/2.9

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

bert-e · 2021-09-14T07:16:38Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

TeddyAndrieux · 2021-09-14T07:21:28Z

CHANGELOG.md

+- Manage Control Plane Ingress Virtual IP with MetalLB is not
+  supported when you have multiple subnet in Control Plane
+  network, now it's properly checked


Not 100% convinced about the sentence 😄 🤔

We usually document the change rather than the issue in this document, so maybe:

Suggested change

- Manage Control Plane Ingress Virtual IP with MetalLB is not

supported when you have multiple subnet in Control Plane

network, now it's properly checked

- Enforce a single subnet for control plane when using a

MetalLB-managed VIP for Ingress

And maybe add a link to the relevant issue and/or discussions you had with the MetalLB guys when investigating this limitation.

Ok fair,
For the link I'm not sure it's needed, we have the link to the PR that have a link to the ticket that talk about it, not sure we want to put the link to the ticket directly in the changelog

gdemonet

Thanks for taking care of this 👍

gdemonet · 2021-09-14T07:29:52Z

CHANGELOG.md

+- Manage Control Plane Ingress Virtual IP with MetalLB is not
+  supported when you have multiple subnet in Control Plane
+  network, now it's properly checked


We usually document the change rather than the issue in this document, so maybe:

Suggested change

- Manage Control Plane Ingress Virtual IP with MetalLB is not

supported when you have multiple subnet in Control Plane

network, now it's properly checked

- Enforce a single subnet for control plane when using a

MetalLB-managed VIP for Ingress

And maybe add a link to the relevant issue and/or discussions you had with the MetalLB guys when investigating this limitation.

salt/_pillar/metalk8s.py

Today we do not support multiple subnets for the Control Plane network when MetalLB is enabled, so this commit check that it's not the case See: #3502

bert-e · 2021-09-14T07:46:10Z

History mismatch

Merge commit #7f82113f6a4d6fbc04c3e4d7872fa2eb65782f64 on the integration branch
w/2.11/improvement/no-metallb-when-multi-cp-cidr is merging a branch which is neither the current
branch improvement/no-metallb-when-multi-cp-cidr nor the development branch
development/2.11.

It is likely due to a rebase of the branch improvement/no-metallb-when-multi-cp-cidr and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

TeddyAndrieux · 2021-09-14T07:47:59Z

/reset

bert-e · 2021-09-14T07:48:05Z

Reset complete

I have successfully deleted this pull request's integration branches.

bert-e · 2021-09-14T07:48:11Z

Integration data created

I have created the integration data for the additional destination branches.

this pull request will merge improvement/no-metallb-when-multi-cp-cidr into
development/2.10
w/2.11/improvement/no-metallb-when-multi-cp-cidr will be merged into development/2.11

The following branches will NOT be impacted:

development/2.0
development/2.1
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6
development/2.7
development/2.8
development/2.9

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

bert-e · 2021-09-14T07:48:13Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

TeddyAndrieux · 2021-09-14T11:49:42Z

/approve

bert-e · 2021-09-14T13:17:22Z

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

✔️ development/2.10
✔️ development/2.11

The following branches will NOT be impacted:

development/2.0
development/2.1
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6
development/2.7
development/2.8
development/2.9

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

Any commit you add on the source branch will trigger a new cycle after the
current queue is merged.
Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

bert-e · 2021-09-14T14:43:31Z

I have successfully merged the changeset of this pull request
into targetted development branches:

✔️ development/2.10
✔️ development/2.11

The following branches have NOT changed:

development/2.0
development/2.1
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6
development/2.7
development/2.8
development/2.9

Please check the status of the associated issue None.

Goodbye teddyandrieux.

TeddyAndrieux added kind:bug Something isn't working topic:networking Networking-related issues complexity:easy Something that requires less than a day to fix labels Sep 14, 2021

TeddyAndrieux added this to the MetalK8s 2.10.3 milestone Sep 14, 2021

TeddyAndrieux requested a review from a team September 14, 2021 07:15

TeddyAndrieux force-pushed the improvement/no-metallb-when-multi-cp-cidr branch from 623f741 to 7f82113 Compare September 14, 2021 07:16

TeddyAndrieux commented Sep 14, 2021

View reviewed changes

gdemonet reviewed Sep 14, 2021

View reviewed changes

salt: Ensure we do not have multi cidr for Control Plane with MetalLB

f6345ba

Today we do not support multiple subnets for the Control Plane network when MetalLB is enabled, so this commit check that it's not the case See: #3502

TeddyAndrieux force-pushed the improvement/no-metallb-when-multi-cp-cidr branch from 7f82113 to f6345ba Compare September 14, 2021 07:46

alexandre-allard approved these changes Sep 14, 2021

View reviewed changes

bert-e merged commit f6345ba into development/2.10 Sep 14, 2021

bert-e deleted the improvement/no-metallb-when-multi-cp-cidr branch September 14, 2021 14:43

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

salt: Ensure we do not have multi cidr for Control Plane with MetalLB #3533

salt: Ensure we do not have multi cidr for Control Plane with MetalLB #3533

TeddyAndrieux commented Sep 14, 2021

bert-e commented Sep 14, 2021

bert-e commented Sep 14, 2021

bert-e commented Sep 14, 2021

bert-e commented Sep 14, 2021

TeddyAndrieux commented Sep 14, 2021

bert-e commented Sep 14, 2021

bert-e commented Sep 14, 2021

bert-e commented Sep 14, 2021

TeddyAndrieux Sep 14, 2021

gdemonet Sep 14, 2021

TeddyAndrieux Sep 14, 2021

gdemonet left a comment

gdemonet Sep 14, 2021

bert-e commented Sep 14, 2021

TeddyAndrieux commented Sep 14, 2021

bert-e commented Sep 14, 2021

bert-e commented Sep 14, 2021

bert-e commented Sep 14, 2021

TeddyAndrieux commented Sep 14, 2021

bert-e commented Sep 14, 2021

bert-e commented Sep 14, 2021

salt: Ensure we do not have multi cidr for Control Plane with MetalLB #3533

salt: Ensure we do not have multi cidr for Control Plane with MetalLB #3533

Conversation

TeddyAndrieux commented Sep 14, 2021

bert-e commented Sep 14, 2021

Hello teddyandrieux,

bert-e commented Sep 14, 2021

Integration data created

bert-e commented Sep 14, 2021

Waiting for approval

bert-e commented Sep 14, 2021

History mismatch

TeddyAndrieux commented Sep 14, 2021

bert-e commented Sep 14, 2021

Reset complete

bert-e commented Sep 14, 2021

Integration data created

bert-e commented Sep 14, 2021

Waiting for approval

TeddyAndrieux Sep 14, 2021

Choose a reason for hiding this comment

gdemonet Sep 14, 2021

Choose a reason for hiding this comment

TeddyAndrieux Sep 14, 2021

Choose a reason for hiding this comment

gdemonet left a comment

Choose a reason for hiding this comment

gdemonet Sep 14, 2021

Choose a reason for hiding this comment

bert-e commented Sep 14, 2021

History mismatch

TeddyAndrieux commented Sep 14, 2021

bert-e commented Sep 14, 2021

Reset complete

bert-e commented Sep 14, 2021

Integration data created

bert-e commented Sep 14, 2021

Waiting for approval

TeddyAndrieux commented Sep 14, 2021

bert-e commented Sep 14, 2021

In the queue

bert-e commented Sep 14, 2021