Manage `podAntiAffinity` and number of replicas for Control Plane Ingress Controller #3617

TeddyAndrieux · 2021-11-30T06:33:20Z

Component:

'cp ingress'

Context:

See: #3574

Summary:

Add an entry in bootstrap configuration for Control Plane Ingress controller in order to set up affinity

NOTE: In this PR we only handle soft and hard podAntiAffinity

bert-e · 2021-11-30T06:33:22Z

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-11-30T06:33:27Z

Integration data created

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

this pull request will merge improvement/add-anti-affinity-for-ingress-controller into
development/2.11
w/123.0/improvement/add-anti-affinity-for-ingress-controller will be merged into development/123.0

The following branches will NOT be impacted:

development/2.0
development/2.1
development/2.10
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-11-30T06:33:29Z

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:

This commit add ability to configure `podAntiAffinity` for the control plane ingress controller from bootstrap config. NOTE: This is only used when MetalLB is enabled as otherwise the control plane ingress controller is deployed as a DaemonSet. Render chart to salt state using ``` ./charts/render.py ingress-nginx-control-plane --namespace metalk8s-ingress \ charts/ingress-nginx-control-plane-deployment.yaml charts/ingress-nginx/ \ > salt/metalk8s/addons/nginx-ingress-control-plane/deployed/chart-deployment.sls ``` See: #3574

…ller This commit add ability to configure the number of replicas for the control plane ingress controller from bootstrap config. NOTE: This is only used when MetalLB is enabled as otherwise the control plane ingress controller is deployed as a DaemonSet. NOTE: As a side effect of replicaCount change in the helm chart it's remove the PodDisruptionBudget object, but this one was not used for the moment Render chart to salt state using ``` ./charts/render.py ingress-nginx-control-plane --namespace metalk8s-ingress \ charts/ingress-nginx-control-plane-deployment.yaml charts/ingress-nginx/ \ > salt/metalk8s/addons/nginx-ingress-control-plane/deployed/chart-deployment.sls ```

bert-e · 2021-11-30T06:37:23Z

History mismatch

Merge commit #aca6ed1f5e10143f779753079954c5bfdd6a375b on the integration branch
w/123.0/improvement/add-anti-affinity-for-ingress-controller is merging a branch which is neither the current
branch improvement/add-anti-affinity-for-ingress-controller nor the development branch
development/123.0.

It is likely due to a rebase of the branch improvement/add-anti-affinity-for-ingress-controller 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-11-30T06:37:29Z

/reset

bert-e · 2021-11-30T06:37:34Z

Reset complete

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

bert-e · 2021-11-30T06:37:39Z

Integration data created

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

this pull request will merge improvement/add-anti-affinity-for-ingress-controller into
development/2.11
w/123.0/improvement/add-anti-affinity-for-ingress-controller will be merged into development/123.0

The following branches will NOT be impacted:

development/2.0
development/2.1
development/2.10
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-11-30T06:37:41Z

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-11-30T09:56:21Z

History mismatch

Merge commit #b595a7bc3066059411323456fc63e618d6ae5fd6 on the integration branch
w/123.0/improvement/add-anti-affinity-for-ingress-controller is merging a branch which is neither the current
branch improvement/add-anti-affinity-for-ingress-controller nor the development branch
development/123.0.

It is likely due to a rebase of the branch improvement/add-anti-affinity-for-ingress-controller 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-11-30T09:56:56Z

/reset

bert-e · 2021-11-30T09:57:01Z

Reset complete

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

bert-e · 2021-11-30T09:57:07Z

Integration data created

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

this pull request will merge improvement/add-anti-affinity-for-ingress-controller into
development/2.11
w/123.0/improvement/add-anti-affinity-for-ingress-controller will be merged into development/123.0

The following branches will NOT be impacted:

development/2.0
development/2.1
development/2.10
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-11-30T09:57:20Z

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:

salt/_pillar/metalk8s.py

bert-e · 2021-11-30T10:05:24Z

History mismatch

Merge commit #16aa1b6e8580dce0ebb80d09bc9dea3f11d7a3ed on the integration branch
w/123.0/improvement/add-anti-affinity-for-ingress-controller is merging a branch which is neither the current
branch improvement/add-anti-affinity-for-ingress-controller nor the development branch
development/123.0.

It is likely due to a rebase of the branch improvement/add-anti-affinity-for-ingress-controller 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-11-30T10:05:46Z

/reset

bert-e · 2021-11-30T10:05:53Z

Reset complete

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

bert-e · 2021-11-30T10:05:58Z

Integration data created

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

this pull request will merge improvement/add-anti-affinity-for-ingress-controller into
development/2.11
w/123.0/improvement/add-anti-affinity-for-ingress-controller will be merged into development/123.0

The following branches will NOT be impacted:

development/2.0
development/2.1
development/2.10
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

salt/_pillar/metalk8s.py

bert-e · 2021-11-30T10:06:00Z

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:

Instead of having logic in the SLS to set the number of replicas and the affinity for the CoreDNS deployment, set it directly from the MetalK8s pillar

bert-e · 2021-11-30T10:07:05Z

History mismatch

Merge commit #8bca59513a0b78da56c4b03ba57f58c8ec62b9fb on the integration branch
w/123.0/improvement/add-anti-affinity-for-ingress-controller is merging a branch which is neither the current
branch improvement/add-anti-affinity-for-ingress-controller nor the development branch
development/123.0.

It is likely due to a rebase of the branch improvement/add-anti-affinity-for-ingress-controller 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-11-30T10:07:27Z

/reset

bert-e · 2021-11-30T10:07:32Z

Reset complete

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

bert-e · 2021-11-30T10:07:37Z

Integration data created

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

this pull request will merge improvement/add-anti-affinity-for-ingress-controller into
development/2.11
w/123.0/improvement/add-anti-affinity-for-ingress-controller will be merged into development/123.0

The following branches will NOT be impacted:

development/2.0
development/2.1
development/2.10
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-11-30T10:07: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-11-30T12:05:58Z

/approve

bert-e · 2021-11-30T12:06:07Z

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.11
✔️ development/123.0

The following branches will NOT be impacted:

development/2.0
development/2.1
development/2.10
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-11-30T14:59:34Z

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

✔️ development/2.11
✔️ development/123.0

The following branches have NOT changed:

development/2.0
development/2.1
development/2.10
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.

tests: Fix duplicate test scenario function name

bc70ea3

TeddyAndrieux requested a review from a team November 30, 2021 06:33

TeddyAndrieux added 2 commits November 30, 2021 07:34

TeddyAndrieux force-pushed the improvement/add-anti-affinity-for-ingress-controller branch from 9f2ebeb to b595a7b Compare November 30, 2021 06:37

TeddyAndrieux changed the title ~~Improvement/add anti affinity for ingress controller~~ Manage podAntiAffinity and number of replicas for Control Plane Ingress Controller Nov 30, 2021

TeddyAndrieux force-pushed the improvement/add-anti-affinity-for-ingress-controller branch from b595a7b to 16aa1b6 Compare November 30, 2021 09:56

alexandre-allard reviewed Nov 30, 2021

View reviewed changes

salt/_pillar/metalk8s.py Outdated Show resolved Hide resolved

TeddyAndrieux force-pushed the improvement/add-anti-affinity-for-ingress-controller branch from 16aa1b6 to 8bca595 Compare November 30, 2021 10:05

alexandre-allard reviewed Nov 30, 2021

View reviewed changes

salt/_pillar/metalk8s.py Outdated Show resolved Hide resolved

salt: Set CoreDNS affinity and replicas directly in ext_pillar

292547e

Instead of having logic in the SLS to set the number of replicas and the affinity for the CoreDNS deployment, set it directly from the MetalK8s pillar

TeddyAndrieux force-pushed the improvement/add-anti-affinity-for-ingress-controller branch from 8bca595 to 292547e Compare November 30, 2021 10:07

alexandre-allard approved these changes Nov 30, 2021

View reviewed changes

bert-e merged commit 10cf204 into development/2.11 Nov 30, 2021

bert-e deleted the improvement/add-anti-affinity-for-ingress-controller branch November 30, 2021 14:59

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Manage `podAntiAffinity` and number of replicas for Control Plane Ingress Controller #3617

Manage `podAntiAffinity` and number of replicas for Control Plane Ingress Controller #3617

TeddyAndrieux commented Nov 30, 2021 •

edited

Loading

bert-e commented Nov 30, 2021

bert-e commented Nov 30, 2021

bert-e commented Nov 30, 2021

bert-e commented Nov 30, 2021

TeddyAndrieux commented Nov 30, 2021

bert-e commented Nov 30, 2021

bert-e commented Nov 30, 2021

bert-e commented Nov 30, 2021

bert-e commented Nov 30, 2021

TeddyAndrieux commented Nov 30, 2021

bert-e commented Nov 30, 2021

bert-e commented Nov 30, 2021

bert-e commented Nov 30, 2021

bert-e commented Nov 30, 2021

TeddyAndrieux commented Nov 30, 2021

bert-e commented Nov 30, 2021

bert-e commented Nov 30, 2021

bert-e commented Nov 30, 2021

bert-e commented Nov 30, 2021

TeddyAndrieux commented Nov 30, 2021

bert-e commented Nov 30, 2021

bert-e commented Nov 30, 2021

bert-e commented Nov 30, 2021

TeddyAndrieux commented Nov 30, 2021

bert-e commented Nov 30, 2021

bert-e commented Nov 30, 2021

Manage podAntiAffinity and number of replicas for Control Plane Ingress Controller #3617

Manage podAntiAffinity and number of replicas for Control Plane Ingress Controller #3617

Conversation

TeddyAndrieux commented Nov 30, 2021 • edited Loading

bert-e commented Nov 30, 2021

Hello teddyandrieux,

bert-e commented Nov 30, 2021

Integration data created

bert-e commented Nov 30, 2021

Waiting for approval

bert-e commented Nov 30, 2021

History mismatch

TeddyAndrieux commented Nov 30, 2021

bert-e commented Nov 30, 2021

Reset complete

bert-e commented Nov 30, 2021

Integration data created

bert-e commented Nov 30, 2021

Waiting for approval

bert-e commented Nov 30, 2021

History mismatch

TeddyAndrieux commented Nov 30, 2021

bert-e commented Nov 30, 2021

Reset complete

bert-e commented Nov 30, 2021

Integration data created

bert-e commented Nov 30, 2021

Waiting for approval

bert-e commented Nov 30, 2021

History mismatch

TeddyAndrieux commented Nov 30, 2021

bert-e commented Nov 30, 2021

Reset complete

bert-e commented Nov 30, 2021

Integration data created

bert-e commented Nov 30, 2021

Waiting for approval

bert-e commented Nov 30, 2021

History mismatch

TeddyAndrieux commented Nov 30, 2021

bert-e commented Nov 30, 2021

Reset complete

bert-e commented Nov 30, 2021

Integration data created

bert-e commented Nov 30, 2021

Waiting for approval

TeddyAndrieux commented Nov 30, 2021

bert-e commented Nov 30, 2021

In the queue

bert-e commented Nov 30, 2021

Manage `podAntiAffinity` and number of replicas for Control Plane Ingress Controller #3617

Manage `podAntiAffinity` and number of replicas for Control Plane Ingress Controller #3617

TeddyAndrieux commented Nov 30, 2021 •

edited

Loading