Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

charts,salt,build,tests: Bump Dex chart to v0.8.2 #3765

Merged
merged 5 commits into from
Jun 2, 2022

Conversation

JBWatenbergScality
Copy link
Contributor

rm -rf charts/dex
helm repo add dex https://charts.dexidp.io
helm repo update
helm fetch -d charts --untar dex/dex

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

Component:

Context:

Summary:

Acceptance criteria:


Closes: #ISSUE_NUMBER

@JBWatenbergScality JBWatenbergScality requested a review from a team as a code owner May 11, 2022 09:29
@bert-e

This comment was marked as spam.

@bert-e

This comment was marked as outdated.

Copy link
Contributor

@gdemonet gdemonet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a few things to add in the CHANGELOG, otherwise LGTM

CHANGELOG.md Outdated Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
charts/dex/values.yaml Show resolved Hide resolved
@bert-e

This comment was marked as outdated.

Comment on lines 4 to 6
{{- if .Values.https.enabled -}}
{{- $svcPort = .Values.service.ports.https.port -}}
{{- end }}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's sad but since this ticket is not done upstream dexidp/helm-charts#15
We need to restore this "manual patch"

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch! Btw, we should likely consider a more predictable way for applying these patches, maybe something similar to what they do in https://github.com/scality/Zenko

@bert-e

This comment was marked as outdated.

@bert-e

This comment was marked as outdated.

@bert-e

This comment was marked as outdated.

@bert-e

This comment was marked as outdated.

Copy link
Contributor

@gdemonet gdemonet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, looks like this change isn't working, I see the tests fail with 502 when attempting to reach Dex (yes, this info is lost in 30k+ lines of traceback....... 😮‍💨). I'll try to run it in debug and investigate. Also, I'll rebase your branch on the latest dev, because of #3781

@bert-e

This comment was marked as outdated.

Copy link
Collaborator

@TeddyAndrieux TeddyAndrieux left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Btw Dex 2.31.2 just get released (with the new zlib version, so CVE fix) maybe worth bumping the image

salt/metalk8s/addons/dex/deployed/chart.sls Outdated Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
@gdemonet
Copy link
Contributor

gdemonet commented Jun 1, 2022

Now tests are failing with the latest version of Dex, we can see in its logs:

http: URL query contains semicolon, which is no longer a supported separator; parts of the query may be stripped when parsed; see golang.org/issue/25192

Dex is working fine with browser access though, so this really has to do with our queries from the test runner. Investigating...


Edit: I thought this came from our way of encoding query parameters, but it actually came from the login URL we extract from the HTML response sent by Dex when we "navigate" to the "login page". The fix in 6cca5bf should be sufficient.

gdemonet
gdemonet previously approved these changes Jun 1, 2022
@bert-e

This comment was marked as outdated.

@bert-e

This comment was marked as resolved.

JBWatenbergScality and others added 5 commits June 1, 2022 14:45
```
rm -rf charts/dex
helm repo add dex https://charts.dexidp.io
helm repo update
helm fetch -d charts --untar dex/dex
```

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
```
…clusterrolebinding, dex role and roleBinding on post downgrade
This bumps the base image from alpine:3.15.1 to 3.16.0, which gets rid
of the latest zlib CVE
(https://nvd.nist.gov/vuln/detail/CVE-2018-25032).

See dexidp/dex@v2.31.1...v2.31.2
This URL was extracted from the generated HTML returned by Dex, however
it contains a semicolon, which is not accepted by the latest Go http
library, used by Dex. So our test was broken, since the POST request was
rejected with a 400 status.
@bert-e
Copy link
Contributor

bert-e commented Jun 1, 2022

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:

@JBWatenbergScality
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Jun 1, 2022

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 options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Jun 2, 2022

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/123.0

The following branches will NOT be impacted:

  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • 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
Copy link
Contributor

bert-e commented Jun 2, 2022

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

  • ✔️ development/123.0

The following branches have NOT changed:

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

@bert-e bert-e merged commit 1bbf69c into development/123.0 Jun 2, 2022
@bert-e bert-e deleted the improvement/bump-dex branch June 2, 2022 18:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants