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

calico: Update to Calico 3.17.0 #2943

Merged
merged 2 commits into from
Nov 27, 2020
Merged

calico: Update to Calico 3.17.0 #2943

merged 2 commits into from
Nov 27, 2020

Conversation

TeddyAndrieux
Copy link
Collaborator

@TeddyAndrieux TeddyAndrieux commented Nov 25, 2020 •
edited
Loading

Deployment manifest updated based on upstream from
https://docs.projectcalico.org/v3.17/manifests/calico.yaml.

And Calico binaries sha256 updated from
https://github.com/projectcalico/cni-plugin/releases/tag/v3.17.0

@TeddyAndrieux TeddyAndrieux added topic:networking Networking-related issues topic:deployment Bugs in or enhancements to deployment stages complexity:easy Something that requires less than a day to fix labels Nov 25, 2020
@TeddyAndrieux TeddyAndrieux requested a review from a team November 25, 2020 13:44
@bert-e
Copy link
Contributor

bert-e commented Nov 25, 2020

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 Nov 25, 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:

@bert-e
Copy link
Contributor

bert-e commented Nov 25, 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 reviewers are expecting changes from the author, or must review again:

@TeddyAndrieux TeddyAndrieux force-pushed the improvement/bump-calico-version branch 4 times, most recently from 7f343ef to cff507f Compare November 26, 2020 12:53
@TeddyAndrieux TeddyAndrieux requested review from NicolasT and a team November 26, 2020 12:53
NicolasT
NicolasT previously approved these changes Nov 26, 2020
View reviewed changes
@bert-e
Copy link
Contributor

bert-e commented Nov 26, 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:

@TeddyAndrieux
Copy link
Collaborator Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Nov 26, 2020

Build failed

The build for commit did not succeed in branch improvement/bump-calico-version.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Nov 27, 2020

Conflict with a changeset in the queue

The changeset in this pull request conflicts with another changeset
already in the queue. Please wait for the current queue to merge into
the development branch. The conflict will then appear in this pull
request and can be sorted on the feature branch directly.

This changeset has not been added to the queue.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Nov 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

@TeddyAndrieux
salt: Add support for PodDisruptionBudget in metalk8s_kubernetes
bd6833a 
Add support for `policy/v1beta1` `PodDisruptionBudget` in our
`metalk8s_kubernetes` custom Salt module to manage kubernetes objects
@TeddyAndrieux
calico: Update to Calico 3.17.0
8360457 
Deployment manifest updated based on upstream from
https://docs.projectcalico.org/v3.17/manifests/calico.yaml.

And Calico binaries sha256 updated from
https://github.com/projectcalico/cni-plugin/releases/tag/v3.17.0
@bert-e
Copy link
Contributor

bert-e commented Nov 27, 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.7

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
  • development/2.5
  • development/2.6

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 Nov 27, 2020

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

  • ✔️ development/2.7

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
  • development/2.5
  • development/2.6

Please check the status of the associated issue None.

Goodbye teddyandrieux.

@bert-e bert-e merged commit 8360457 into development/2.7 Nov 27, 2020
@bert-e bert-e deleted the improvement/bump-calico-version branch November 27, 2020 16:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@NicolasT NicolasT NicolasT approved these changes

Assignees
No one assigned
Labels
complexity:easy Something that requires less than a day to fix topic:deployment Bugs in or enhancements to deployment stages topic:networking Networking-related issues
Projects
None yet
Milestone
No milestone
Development

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