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

Automated cherry pick of #7898 8691 8764 8965: Update Weave Net to version 2.6.2 #9058

Conversation

hakman
Copy link
Member

@hakman hakman commented May 4, 2020

Cherry pick of #7898 #8691 #8764 #8965 on release-1.17.

#7898: Update Weave Net to version 2.6.0
#8691: Update Weave Net to version 2.6.1
#8764: Update Weave Net to version 2.6.2
#8965: Fix missing changes in Weave manifest

For details on the cherry pick process, see the cherry pick requests page.

@k8s-ci-robot k8s-ci-robot added this to the v1.17 milestone May 4, 2020
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels May 4, 2020
@k8s-ci-robot k8s-ci-robot requested review from justinsb and rifelpet May 4, 2020 12:15
@hakman hakman changed the title Automated cherry pick of #7874: mark weavenet-pod as system-critical #7898: Update Weave Net to version 2.6.0 #8691: Update Weave Net to version 2.6.1 #8764: Update Weave Net to version 2.6.2 #8965: Fix missing changes in Weave manifest Automated cherry pick of #7874 7898 8691 8764 8965: Update Weave Net to version 2.6.2 May 4, 2020
@hakman hakman force-pushed the automated-cherry-pick-of-#7874-#7898-#8691-#8764-#8965-upstream-release-1.17 branch 3 times, most recently from 44f4c8d to 35533d9 Compare May 4, 2020 12:40
@hakman hakman force-pushed the automated-cherry-pick-of-#7874-#7898-#8691-#8764-#8965-upstream-release-1.17 branch from 35533d9 to 2e9d9f6 Compare May 4, 2020 12:48
@hakman hakman changed the title Automated cherry pick of #7874 7898 8691 8764 8965: Update Weave Net to version 2.6.2 Automated cherry pick of #7898 8691 8764 8965: Update Weave Net to version 2.6.2 May 4, 2020
@hakman
Copy link
Member Author

hakman commented May 4, 2020

Simple changes, but had to go through many commits.
The only thing that is on master and not part of 1.17 is the support for extra args from #8265. That PR should remain just in 1.18.

@hakman
Copy link
Member Author

hakman commented May 4, 2020

/cc @rifelpet

@olemarkus
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 4, 2020
@rifelpet
Copy link
Member

rifelpet commented May 4, 2020

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hakman, rifelpet

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 4, 2020
@k8s-ci-robot k8s-ci-robot merged commit cc44ed0 into kubernetes:release-1.17 May 4, 2020
@hakman
Copy link
Member Author

hakman commented May 5, 2020

Thanks @rifelpet

@hakman hakman deleted the automated-cherry-pick-of-#7874-#7898-#8691-#8764-#8965-upstream-release-1.17 branch June 5, 2020 03:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants