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: Bump NGINX Ingress chart to v4.0.1 #3518

Merged
merged 2 commits into from
Sep 3, 2021
Merged

charts,salt,build: Bump NGINX Ingress chart to v4.0.1 #3518

merged 2 commits into from
Sep 3, 2021

Conversation

TeddyAndrieux
Copy link
Collaborator

@TeddyAndrieux TeddyAndrieux commented Sep 1, 2021 •
edited
Loading

In order to support the newer Kubernetes version 1.22 we need to bump
the version of NGINX Ingress.

The nginx-ingress-controller image has been bump accordingly to v1.0.0

@TeddyAndrieux
charts/render.py: Add "monitoring.coreos.com/v1" API capability
3e3e59e 
This API is deployed by monitoring stack and needed to manage monitoring
objects like ServiceMonitor
@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:15
@bert-e
Copy link
Contributor

bert-e commented Sep 1, 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 1, 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 TeddyAndrieux force-pushed the improvement/bump-nginx-ingress-controller branch from 36ad5d8 to 8e509e2 Compare September 1, 2021 15:16
@TeddyAndrieux TeddyAndrieux mentioned this pull request Sep 1, 2021
Merged
gdemonet
gdemonet previously requested changes Sep 2, 2021
View reviewed changes
CHANGELOG.md Outdated Show resolved Hide resolved
@bert-e
Copy link
Contributor

bert-e commented Sep 2, 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:

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

@TeddyAndrieux
charts,salt,build: Bump NGINX Ingress chart to v4.0.1
ef29a60 
In order to support newer Kubernetes version 1.22 we need to bump
version of NGINX Ingress.

This commit also set the workload plane Ingress Class as default class
for Ingresses.

Upgrade NGINX Ingress chart using:
```
rm -rf charts/ingress-nginx
helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx
helm repo update
helm fetch -d charts --untar ingress-nginx/ingress-nginx
```

Re-render NGINX Ingress salt state using:
```
./charts/render.py ingress-nginx --namespace metalk8s-ingress \
  charts/ingress-nginx.yaml charts/ingress-nginx/ \
  > salt/metalk8s/addons/nginx-ingress/deployed/chart.sls
```

Re-render NGINX Ingress control plane salt states using:
```
./charts/render.py ingress-nginx-control-plane --namespace metalk8s-ingress \
  charts/ingress-nginx-control-plane-daemonset.yaml charts/ingress-nginx/ \
  > salt/metalk8s/addons/nginx-ingress-control-plane/deployed/chart-daemonset.sls
./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
```
@TeddyAndrieux TeddyAndrieux force-pushed the improvement/bump-nginx-ingress-controller branch from 8e509e2 to ef29a60 Compare September 2, 2021 22:44
@TeddyAndrieux
Copy link
Collaborator Author

/approve

@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:

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

The following options are set: approve

@TeddyAndrieux TeddyAndrieux dismissed gdemonet’s stale review September 3, 2021 07:18

changes fixed (and you are not available right now to take a new look so dismiss)

@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:

The following options are set: 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 ef29a60 into development/2.11 Sep 3, 2021
@bert-e bert-e deleted the improvement/bump-nginx-ingress-controller branch September 3, 2021 07:31
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

@gdemonet gdemonet Awaiting requested review from gdemonet

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.
4 participants
@TeddyAndrieux @bert-e @sayf-eddine-scality @gdemonet