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

Update nginx-ingress-controller to version 0.30.0 #2446

Conversation

Ebaneck
Copy link
Contributor

@Ebaneck Ebaneck commented Apr 22, 2020

Component:

'charts', 'nginx-ingress'

Context:

See #2423

Summary:

Bump the Nginx-ingress charts to most recent stable release

Acceptance criteria:

No regression

2020-04-22T11:31:01.35310544Z stdout F NGINX Ingress controller
2020-04-22T11:31:01.353110594Z stdout F   Release:       0.30.0
2020-04-22T11:31:01.353113455Z stdout F   Build:         git-7e65b90c4
2020-04-22T11:31:01.353116684Z stdout F   Repository:    https://github.com/kubernetes/ingress-nginx
2020-04-22T11:31:01.353119765Z stdout F   nginx version: nginx/1.17.8
2020-04-22T11:31:01.353122707Z stdout F 
2020-04-22T11:31:01.353125829Z stdout F -------------------------------------------------------------------------------



Closes: #2423

@Ebaneck Ebaneck requested a review from a team April 22, 2020 11:51
@bert-e
Copy link
Contributor

bert-e commented Apr 22, 2020

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

bert-e commented Apr 22, 2020

Integration data created

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

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

bert-e commented Apr 22, 2020

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

Ebaneck commented Apr 22, 2020

/after_pull_request 2441

@Ebaneck Ebaneck marked this pull request as ready for review April 23, 2020 15:43
@Ebaneck
Copy link
Contributor Author

Ebaneck commented Apr 23, 2020

/approve

@bert-e
Copy link
Contributor

bert-e commented Apr 23, 2020

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

@Ebaneck Ebaneck force-pushed the improvement/2423-upgrade-nginx-ingress-controller-to-0.30.0 branch from aa8e5b8 to 311142c Compare April 23, 2020 17:33
@Ebaneck
Copy link
Contributor Author

Ebaneck commented Apr 23, 2020

/reset

@Ebaneck
Copy link
Contributor Author

Ebaneck commented Apr 23, 2020

/approve

@bert-e
Copy link
Contributor

bert-e commented Apr 23, 2020

Reset complete

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

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Apr 23, 2020

Integration data created

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

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

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Apr 23, 2020

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

@Ebaneck Ebaneck force-pushed the improvement/2423-upgrade-nginx-ingress-controller-to-0.30.0 branch from 311142c to 898bb23 Compare April 27, 2020 09:15
@scality scality deleted a comment from bert-e Apr 27, 2020
@scality scality deleted a comment from bert-e Apr 27, 2020
@bert-e
Copy link
Contributor

bert-e commented Apr 27, 2020

History mismatch

Merge commit #311142c648531c3a4787780998a6bdd23f15d724 on the integration branch
w/2.6/improvement/2423-upgrade-nginx-ingress-controller-to-0.30.0 is merging a branch which is neither the current
branch improvement/2423-upgrade-nginx-ingress-controller-to-0.30.0 nor the development branch
development/2.6.

It is likely due to a rebase of the branch improvement/2423-upgrade-nginx-ingress-controller-to-0.30.0 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.

The following options are set: approve

@Ebaneck
Copy link
Contributor Author

Ebaneck commented Apr 27, 2020

/reset

@bert-e
Copy link
Contributor

bert-e commented Apr 27, 2020

Reset complete

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

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Apr 27, 2020

Integration data created

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

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

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Apr 27, 2020

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

Ebaneck added 2 commits April 28, 2020 12:03
This chart is updated using:

```
$ rm -rf charts/nginx-ingress/
$ helm fetch -d charts --untar stable/nginx-ingress
$ ./charts/render.py nginx-ingress --namespace metalk8s-ingress charts/nginx-ingress.yaml charts/nginx-ingress/ > salt/metalk8s/addons/nginx-ingress/deployed/chart.sls
```
This chart is updated using:

```
$ rm -rf charts/nginx-ingress/
$ helm fetch -d charts --untar stable/nginx-ingress
$ ./charts/render.py nginx-ingress-control-plane --namespace metalk8s-ingress charts/nginx-ingress-control-plane.yaml
charts/nginx-ingress/ > salt/metalk8s/addons/nginx-ingress-control-plane/deployed/chart.sls
```
@Ebaneck Ebaneck force-pushed the improvement/2423-upgrade-nginx-ingress-controller-to-0.30.0 branch from 898bb23 to aeee875 Compare April 28, 2020 10:03
@Ebaneck
Copy link
Contributor Author

Ebaneck commented Apr 28, 2020

/reset

@scality scality deleted a comment from bert-e Apr 28, 2020
@bert-e
Copy link
Contributor

bert-e commented Apr 28, 2020

Reset complete

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

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Apr 28, 2020

Integration data created

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

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

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Apr 28, 2020

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 Apr 28, 2020

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

bert-e commented Apr 28, 2020

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.

@bert-e bert-e merged commit d0ff050 into development/2.5 Apr 28, 2020
@bert-e bert-e deleted the improvement/2423-upgrade-nginx-ingress-controller-to-0.30.0 branch April 28, 2020 14:05
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.

3 participants