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 3.36.0 #3649

Merged
merged 3 commits into from
Dec 31, 2021
Merged

charts,salt,build: Bump NGINX Ingress chart to 3.36.0 #3649

merged 3 commits into from
Dec 31, 2021

Conversation

JBWatenbergScality
Copy link
Contributor

Component:

charts,salt,build

Context:

In order to get this fix kubernetes/ingress-nginx#7445 we have to bump nginx controller to 0.49.0+. To do so I upgraded the helm charts to 3.36.0 in order to ensure compatibility.

Summary:

In Metalk8s 2.10 we may encounter the issue described in kubernetes/ingress-nginx#7445 before applying this patch.

@JBWatenbergScality
charts,salt,build: Bump NGINX Ingress chart to 3.36.0
b1496ae 
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 --version 3.36.0
```

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
```
@bert-e
Copy link
Contributor

bert-e commented Dec 29, 2021

Hello jbwatenbergscality,

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 Dec 29, 2021

Conflict

A conflict has been raised during the creation of
integration branch w/2.11/improvement/bump-nginx-ingress with contents from improvement/bump-nginx-ingress
and development/2.11.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/2.11/improvement/bump-nginx-ingress origin/development/2.11
 $ git merge origin/improvement/bump-nginx-ingress
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.11/improvement/bump-nginx-ingress

@JBWatenbergScality JBWatenbergScality marked this pull request as ready for review December 29, 2021 15:19
@JBWatenbergScality JBWatenbergScality requested a review from a team as a code owner December 29, 2021 15:19
@bert-e
Copy link
Contributor

bert-e commented Dec 29, 2021

Integration data created

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

The following branches will NOT be impacted:

  • development/2.0
  • development/2.1
  • 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

@JBWatenbergScality
Copy link
Contributor Author

/status

@bert-e
Copy link
Contributor

bert-e commented Dec 29, 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:

@JBWatenbergScality
salt: Generated salt states from the helm charts is using nginx contr…
65f2497 
…oller 0.49.0 but we would like to use 0.49.3, hence I'm patching the state manually here
@bert-e
Copy link
Contributor

bert-e commented Dec 31, 2021

Conflict

A conflict has been raised during the update of
integration branch w/2.11/improvement/bump-nginx-ingress with contents from improvement/bump-nginx-ingress
and development/2.11.

Please resolve the conflict on the integration branch (w/2.11/improvement/bump-nginx-ingress).

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout w/2.11/improvement/bump-nginx-ingress
 $ git pull  # or "git reset --hard origin/w/2.11/improvement/bump-nginx-ingress"
 $ git merge origin/development/2.11
 $ # <intense conflict resolution>
 $ git commit
 $ git merge origin/improvement/bump-nginx-ingress
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.11/improvement/bump-nginx-ingress

@JBWatenbergScality
Copy link
Contributor Author

/status

@bert-e
Copy link
Contributor

bert-e commented Dec 31, 2021

Status

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Dec 31, 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:

@JBWatenbergScality
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Dec 31, 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.10

  • ✔️ development/2.11

  • ✔️ development/123.0

The following branches will NOT be impacted:

  • development/2.0
  • development/2.1
  • 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 Dec 31, 2021

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

  • ✔️ development/2.10

  • ✔️ development/2.11

  • ✔️ development/123.0

The following branches have NOT changed:

  • development/2.0
  • development/2.1
  • 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 65f2497 into development/2.10 Dec 31, 2021
@bert-e bert-e deleted the improvement/bump-nginx-ingress branch December 31, 2021 12:57
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

@thomasdanan thomasdanan thomasdanan approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@JBWatenbergScality @bert-e @thomasdanan @sayf-eddine-scality