Manage `podAntiAffinity` for dex #3614

TeddyAndrieux · 2021-11-25T18:22:46Z

Component:

'authentication'

Context:

Summary:

Add an entry in CSC configuration for Dex in order to set up affinity

NOTE: In this PR we only handle soft and hard

In some helm chart, some value are rendered as YAML but we want to use a salt function in jinja to "compute" this yaml part, since it's rendered as YAML the resulting SLS will the salt execution module quoted, which result in an invalid YAML

bert-e · 2021-11-25T18:22: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-11-25T18:22:52Z

Integration data created

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

this pull request will merge improvement/add-anti-affinity-for-dex into
development/2.11
w/123.0/improvement/add-anti-affinity-for-dex 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-25T18:22:54Z

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-25T18:25:20Z

History mismatch

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

It is likely due to a rebase of the branch improvement/add-anti-affinity-for-dex 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-25T18:26:44Z

/reset

bert-e · 2021-11-25T18:26:49Z

Reset complete

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

bert-e · 2021-11-25T18:26:54Z

Integration data created

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

this pull request will merge improvement/add-anti-affinity-for-dex into
development/2.11
w/123.0/improvement/add-anti-affinity-for-dex 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-25T18:26:56Z

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:

Since we want to expose a really simple way to setup Pod affinity we do not use the exact same syntax as what need to provided in the Kubernetes objects, in order to convert from "simple syntax" to "kubernetes syntax" we add this execution module See: #3574

Instead of computing the PodAntiAffinity from pillar directly in the SLS as jinja use the dedicated function `get_pod_affinity` for it. In order to allow support in the future for other type of `affinity` add an extra `affinity` layer in the config

This commit add ability to configure `podAntiAffinity` for Dex from CSC. Patche the Dex helm chart to add support for `strategy` on Dex deployment, as the default one does not make sense for our Dex deployment See dexidp/helm-charts#66 Render chart to salt state using ``` ./charts/render.py dex charts/dex.yaml charts/dex \ --namespace metalk8s-auth \ --service-config dex metalk8s-dex-config \ metalk8s/addons/dex/config/dex.yaml.j2 metalk8s-auth \ > salt/metalk8s/addons/dex/deployed/chart.sls ``` See: #3574

bert-e · 2021-11-29T13:36:45Z

History mismatch

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

It is likely due to a rebase of the branch improvement/add-anti-affinity-for-dex 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-29T13:38:11Z

/reset

bert-e · 2021-11-29T13:38:16Z

Reset complete

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

bert-e · 2021-11-29T13:38:22Z

Integration data created

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

this pull request will merge improvement/add-anti-affinity-for-dex into
development/2.11
w/123.0/improvement/add-anti-affinity-for-dex 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-29T13:38:24Z

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-29T18:38:09Z

/approve

bert-e · 2021-11-29T19:31:41Z

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-29T22:03:54Z

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.

TeddyAndrieux added 2 commits November 25, 2021 19:08

eve: Add hard podAntiAffinity on DNS in bootstrap restore

e6b8768

TeddyAndrieux requested a review from a team November 25, 2021 18:22

TeddyAndrieux force-pushed the improvement/add-anti-affinity-for-dex branch from cc15346 to d2b786a Compare November 25, 2021 18:25

TeddyAndrieux added 3 commits November 29, 2021 14:36

TeddyAndrieux force-pushed the improvement/add-anti-affinity-for-dex branch from d2b786a to 5edb900 Compare November 29, 2021 13:36

alexandre-allard approved these changes Nov 29, 2021

View reviewed changes

bert-e merged commit ce068d2 into development/2.11 Nov 29, 2021

bert-e deleted the improvement/add-anti-affinity-for-dex branch November 29, 2021 22:03

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Manage `podAntiAffinity` for dex #3614

Manage `podAntiAffinity` for dex #3614

TeddyAndrieux commented Nov 25, 2021

bert-e commented Nov 25, 2021

bert-e commented Nov 25, 2021

bert-e commented Nov 25, 2021

bert-e commented Nov 25, 2021

TeddyAndrieux commented Nov 25, 2021

bert-e commented Nov 25, 2021

bert-e commented Nov 25, 2021

bert-e commented Nov 25, 2021

bert-e commented Nov 29, 2021

TeddyAndrieux commented Nov 29, 2021

bert-e commented Nov 29, 2021

bert-e commented Nov 29, 2021

bert-e commented Nov 29, 2021

TeddyAndrieux commented Nov 29, 2021

bert-e commented Nov 29, 2021

bert-e commented Nov 29, 2021

Manage podAntiAffinity for dex #3614

Manage podAntiAffinity for dex #3614

Conversation

TeddyAndrieux commented Nov 25, 2021

bert-e commented Nov 25, 2021

Hello teddyandrieux,

bert-e commented Nov 25, 2021

Integration data created

bert-e commented Nov 25, 2021

Waiting for approval

bert-e commented Nov 25, 2021

History mismatch

TeddyAndrieux commented Nov 25, 2021

bert-e commented Nov 25, 2021

Reset complete

bert-e commented Nov 25, 2021

Integration data created

bert-e commented Nov 25, 2021

Waiting for approval

bert-e commented Nov 29, 2021

History mismatch

TeddyAndrieux commented Nov 29, 2021

bert-e commented Nov 29, 2021

Reset complete

bert-e commented Nov 29, 2021

Integration data created

bert-e commented Nov 29, 2021

Waiting for approval

TeddyAndrieux commented Nov 29, 2021

bert-e commented Nov 29, 2021

In the queue

bert-e commented Nov 29, 2021

Manage `podAntiAffinity` for dex #3614

Manage `podAntiAffinity` for dex #3614