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.

Sign up for GitHub

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

Jump to bottom

charts,salt,build,tests: Bump Dex chart to v0.6.3 #3519

Merged
merged 2 commits into from
Sep 3, 2021
Merged

charts,salt,build,tests: Bump Dex chart to v0.6.3 #3519

merged 2 commits into from
Sep 3, 2021

Conversation

TeddyAndrieux
Copy link
Collaborator

In order to use new v1 APIVersion for CRD creation of Dex, bump Dex
chart version (v0.6.3) and Dex container image (v2.30.0)

Since the default directory used for Dex frontend template changed, it also
change the directory for Scality theme.

The way to authenticate to Dex changed a bit as well that's why some
changes were needed in the tests.

NOTE: Let's wait for #3518 to be merged first as we will have conflict in changelog

@TeddyAndrieux TeddyAndrieux added complexity:easy Something that requires less than a day to fix kind:dependencies Pull requests that update a dependency file labels Sep 1, 2021
@TeddyAndrieux TeddyAndrieux added this to the MetalK8s 2.11.0 milestone Sep 1, 2021
@TeddyAndrieux TeddyAndrieux requested a review from a team September 1, 2021 15:22
@TeddyAndrieux TeddyAndrieux force-pushed the improvement/bump-dex-version branch from b2eb995 to 60f4cf1 Compare September 1, 2021 15:23
@TeddyAndrieux TeddyAndrieux force-pushed the improvement/bump-nginx-ingress-controller branch from 8e509e2 to ef29a60 Compare September 2, 2021 22:44
Base automatically changed from improvement/bump-nginx-ingress-controller to development/2.11 September 3, 2021 07:31
@bert-e
Copy link
Contributor

bert-e commented Sep 3, 2021

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
Copy link
Contributor

bert-e commented Sep 3, 2021

Conflict

There is a conflict between your branch improvement/bump-dex-version and the
destination branch development/2.11.

Please resolve the conflict on the feature branch (improvement/bump-dex-version).

git fetch && \
git checkout origin/improvement/bump-dex-version && \
git merge origin/development/2.11

Resolve merge conflicts and commit

git push origin HEAD:improvement/bump-dex-version

@TeddyAndrieux
charts/render.py: Skip tests when rendering helm chart
7672736 
Since we do not want to deploy some "tests" as part of our salt state in
production let's use `--skip-tests` from `helm template` command
@TeddyAndrieux
charts,salt,build,tests: Bump Dex chart to v0.6.3
c2e7379 
In order to use new v1 APIVersion for CRD creation of Dex, bump Dex
chart version and Dex container image.

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

Patch chart to use HTTPS in the Ingress
See dexidp/helm-charts#15

Since the default directory used for Dex frontend template changed, it
also change the directory for Scality theme.

The way to authenticate to Dex changed a bit as well that's why some
changes were needed in the tests.

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
```
@TeddyAndrieux TeddyAndrieux force-pushed the improvement/bump-dex-version branch from 60f4cf1 to c2e7379 Compare September 3, 2021 07:32
@bert-e
Copy link
Contributor

bert-e commented Sep 3, 2021

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
Copy link
Collaborator Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Sep 3, 2021

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

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
Copy link
Contributor

bert-e commented Sep 3, 2021

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

  • ✔️ development/2.11

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.

@bert-e bert-e merged commit c2e7379 into development/2.11 Sep 3, 2021
@bert-e bert-e deleted the improvement/bump-dex-version branch September 3, 2021 09:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sayf-eddine-scality sayf-eddine-scality sayf-eddine-scality approved these changes

Assignees
No one assigned
Labels
complexity:easy Something that requires less than a day to fix kind:dependencies Pull requests that update a dependency file
Projects
None yet
Milestone
MetalK8s 2.11.0
Development

Successfully merging this pull request may close these issues.
3 participants
@TeddyAndrieux @bert-e @sayf-eddine-scality