chart: template and store Dex backend config in a ConfigMap #2274

Ebaneck · 2020-02-28T11:37:40Z

Component:

'salt', 'kubernetes', 'chart'

Context:

See #2261

Summary:

Have Dex configurations stored and persisted in a ConfigMap.
For Dex/external IDP config, please reference this doc: https://github.com/dexidp/dex/blob/master/Documentation/connectors/ldap.md#configuration

Acceptance criteria:

Working cluster

Closes: #2261

bert-e · 2020-02-28T11:37:43Z

Hello ebaneck,

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 · 2020-02-28T11:37:51Z

Integration data created

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

this pull request will merge feature/2261-template-and-store-dex-external-idp-config into
development/2.5
w/2.6/feature/2261-template-and-store-dex-external-idp-config will be merged into development/2.6

The following branches will NOT be impacted:

development/1.0
development/1.1
development/1.2
development/1.3
development/2.0
development/2.1
development/2.2
development/2.3
development/2.4

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 · 2020-02-28T11:37:53Z

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 · 2020-02-28T11:41:04Z

History mismatch

Merge commit #7ccf27e27b18b113debc54da198af8042d1ce300 on the integration branch
w/2.6/feature/2261-template-and-store-dex-external-idp-config is merging a branch which is neither the current
branch feature/2261-template-and-store-dex-external-idp-config nor the development branch
development/2.6.

It is likely due to a rebase of the branch feature/2261-template-and-store-dex-external-idp-config 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.

salt/metalk8s/addons/dex/deployed/init.sls

salt/metalk8s/addons/dex/deployed/service-configuration.sls

salt/metalk8s/addons/dex/deployed/chart.sls

NicolasT · 2020-03-03T13:59:25Z

salt/metalk8s/addons/dex/deployed/chart.sls

@@ -188,7 +212,7 @@ spec:
  template:
    metadata:
      annotations:
-        checksum/config: 278f2b27e9441887e4070365aa3df2ccf668da0025ebf565605555c2b7b16042
+        checksum/config: 82272216f0373dd6510af9cea925a8642900f1fe7400d2cbcf4ef54e59ac7d9c


We're changing this when needed, right?

I thought this checksum hashes are generated each time we render the charts? Don't we need to use the new values generated?
Also, when are we required to change it ?

salt/metalk8s/addons/dex/deployed/secret.sls

Initially, we do not deploy and manage Dex service configurations using configmaps. This commit adds generic configmaps with service related configurations such that the end user can configure Dex settings directly by editing the related configmaps

charts/render.py

salt/metalk8s/addons/dex/deployed/chart.sls

We need to magically handle the subsititution of jinja looking urls to yaml.

This commit adds and templates the Dex service charts to directly consume configuration values from a ConfigMap

This chart is rendered using the following commmand: ./charts/render.py dex --namespace metalk8s-auth charts/dex.yaml --service-config dex metalk8s-dex-config charts/dex/ > salt/metalk8s/addons/dex/deployed/chart.sls Closes: #2261

Ebaneck · 2020-03-05T13:04:03Z

/reset

bert-e · 2020-03-05T13:04:11Z

Reset complete

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

bert-e · 2020-03-05T13:04:19Z

Integration data created

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

this pull request will merge feature/2261-template-and-store-dex-external-idp-config into
development/2.5
w/2.6/feature/2261-template-and-store-dex-external-idp-config will be merged into development/2.6

The following branches will NOT be impacted:

development/1.0
development/1.1
development/1.2
development/1.3
development/2.0
development/2.1
development/2.2
development/2.3
development/2.4

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 · 2020-03-05T13:04: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:

The following reviewers are expecting changes from the author, or must review again:

@NicolasT

TeddyAndrieux

LGTM

stale

bert-e · 2020-03-06T06:00:01Z

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:

Ebaneck · 2020-03-06T06:00:07Z

/approve

bert-e · 2020-03-06T06:00:18Z

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.5
✔️ development/2.6

The following branches will NOT be impacted:

development/1.0
development/1.1
development/1.2
development/1.3
development/2.0
development/2.1
development/2.2
development/2.3
development/2.4

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 · 2020-03-06T06:00:26Z

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

✔️ development/2.5
✔️ development/2.6

The following branches have NOT changed:

development/1.0
development/1.1
development/1.2
development/1.3
development/2.0
development/2.1
development/2.2
development/2.3
development/2.4

Please check the status of the associated issue None.

Goodbye ebaneck.

Ebaneck requested a review from a team February 28, 2020 11:37

Ebaneck force-pushed the feature/2261-template-and-store-dex-external-idp-config branch from ef71f77 to 137291a Compare February 28, 2020 11:40

Ebaneck force-pushed the feature/2261-template-and-store-dex-external-idp-config branch from 137291a to 93edf19 Compare March 2, 2020 10:36

Ebaneck marked this pull request as ready for review March 2, 2020 11:44

TeddyAndrieux reviewed Mar 3, 2020

View reviewed changes

salt/metalk8s/addons/dex/deployed/init.sls Outdated Show resolved Hide resolved

salt/metalk8s/addons/dex/deployed/service-configuration.sls Outdated Show resolved Hide resolved

NicolasT reviewed Mar 3, 2020

View reviewed changes

salt/metalk8s/addons/dex/deployed/service-configuration.sls Outdated Show resolved Hide resolved

NicolasT reviewed Mar 3, 2020

View reviewed changes

salt/metalk8s/addons/dex/deployed/service-configuration.sls Outdated Show resolved Hide resolved

NicolasT reviewed Mar 3, 2020

View reviewed changes

salt/metalk8s/addons/dex/deployed/service-configuration.sls Outdated Show resolved Hide resolved

NicolasT reviewed Mar 3, 2020

View reviewed changes

salt/metalk8s/addons/dex/deployed/chart.sls Outdated Show resolved Hide resolved

NicolasT previously requested changes Mar 3, 2020

View reviewed changes

Ebaneck force-pushed the feature/2261-template-and-store-dex-external-idp-config branch 2 times, most recently from 9a7937c to 9216a2b Compare March 4, 2020 08:36

TeddyAndrieux reviewed Mar 4, 2020

View reviewed changes

salt/metalk8s/addons/dex/deployed/secret.sls Outdated Show resolved Hide resolved

Ebaneck force-pushed the feature/2261-template-and-store-dex-external-idp-config branch 3 times, most recently from fcd0065 to c66ee29 Compare March 5, 2020 10:46

TeddyAndrieux reviewed Mar 5, 2020

View reviewed changes

charts/render.py Outdated Show resolved Hide resolved

salt/metalk8s/addons/dex/deployed/chart.sls Show resolved Hide resolved

salt/metalk8s/addons/dex/deployed/chart.sls Show resolved Hide resolved

Ebaneck added 3 commits March 5, 2020 13:44

chart: Add support for substituting unquoted urls from jinja to yaml

32789a9

We need to magically handle the subsititution of jinja looking urls to yaml.

chart: Template the Dex service charts to use ConfigMap values

47dd01f

This commit adds and templates the Dex service charts to directly consume configuration values from a ConfigMap

Ebaneck force-pushed the feature/2261-template-and-store-dex-external-idp-config branch from c66ee29 to d58300f Compare March 5, 2020 13:03

TeddyAndrieux approved these changes Mar 5, 2020

View reviewed changes

bert-e merged commit d58300f into development/2.5 Mar 6, 2020

bert-e deleted the feature/2261-template-and-store-dex-external-idp-config branch March 6, 2020 06:00

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chart: template and store Dex backend config in a ConfigMap #2274

chart: template and store Dex backend config in a ConfigMap #2274

Ebaneck commented Feb 28, 2020

bert-e commented Feb 28, 2020

bert-e commented Feb 28, 2020

bert-e commented Feb 28, 2020

bert-e commented Feb 28, 2020

NicolasT Mar 3, 2020

Ebaneck Mar 3, 2020

Ebaneck commented Mar 5, 2020

bert-e commented Mar 5, 2020

bert-e commented Mar 5, 2020

bert-e commented Mar 5, 2020

TeddyAndrieux left a comment

bert-e commented Mar 6, 2020

Ebaneck commented Mar 6, 2020

bert-e commented Mar 6, 2020

bert-e commented Mar 6, 2020

chart: template and store Dex backend config in a ConfigMap #2274

chart: template and store Dex backend config in a ConfigMap #2274

Conversation

Ebaneck commented Feb 28, 2020

bert-e commented Feb 28, 2020

Hello ebaneck,

bert-e commented Feb 28, 2020

Integration data created

bert-e commented Feb 28, 2020

Waiting for approval

bert-e commented Feb 28, 2020

History mismatch

NicolasT Mar 3, 2020

Choose a reason for hiding this comment

Ebaneck Mar 3, 2020

Choose a reason for hiding this comment

Ebaneck commented Mar 5, 2020

bert-e commented Mar 5, 2020

Reset complete

bert-e commented Mar 5, 2020

Integration data created

bert-e commented Mar 5, 2020

Waiting for approval

TeddyAndrieux left a comment

Choose a reason for hiding this comment

bert-e commented Mar 6, 2020

Waiting for approval

Ebaneck commented Mar 6, 2020

bert-e commented Mar 6, 2020

In the queue

bert-e commented Mar 6, 2020