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 #8965: Fix missing changes in Weave manifest #9285: Update Weave for CVE-2020-13597 #9329

Conversation

hakman
Copy link
Member

@hakman hakman commented Jun 11, 2020

Cherry pick of #8965 #9285 on release-1.16.

#8965: Fix missing changes in Weave manifest
#9285: Update Weave for CVE-2020-13597

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

@k8s-ci-robot k8s-ci-robot added this to the v1.16 milestone Jun 11, 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 Jun 11, 2020
@hakman hakman force-pushed the automated-cherry-pick-of-#8965-#9285-upstream-release-1.16 branch from 90e1ff3 to e3677d3 Compare June 11, 2020 05:59
@hakman hakman force-pushed the automated-cherry-pick-of-#8965-#9285-upstream-release-1.16 branch from e3677d3 to f3ca5b7 Compare June 11, 2020 06:02
labels:
name: weave-net
role.kubernetes.io/networking: "1"
namespace: kube-system
spec:
# Wait 5 seconds to let pod connect before rolling next pod
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should that comment also be moved with the field itself?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. I will add a note to do it with the next release. I don't think it's ok to do it in this cherry-pick.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ohh, I didn't notice that it's a CP, sorry!

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

np. good catch.

@moshevayner
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 Jun 11, 2020
@rifelpet
Copy link
Member

/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 Jun 11, 2020
@k8s-ci-robot k8s-ci-robot merged commit a02dd44 into kubernetes:release-1.16 Jun 11, 2020
@hakman hakman deleted the automated-cherry-pick-of-#8965-#9285-upstream-release-1.16 branch July 1, 2020 03:07
oded7hoffman pushed a commit to spotinst/kubernetes-kops that referenced this pull request Jan 23, 2023
…of-#8965-kubernetes#9285-upstream-release-1.16

Automated cherry pick of kubernetes#8965: Fix missing changes in Weave manifest kubernetes#9285: Update Weave for CVE-2020-13597
oded7hoffman pushed a commit to spotinst/kubernetes-kops that referenced this pull request Jan 23, 2023
…of-#8965-kubernetes#9285-upstream-release-1.16

Automated cherry pick of kubernetes#8965: Fix missing changes in Weave manifest kubernetes#9285: Update Weave for CVE-2020-13597
oded7hoffman pushed a commit to spotinst/kubernetes-kops that referenced this pull request Jan 23, 2023
…of-#8965-kubernetes#9285-upstream-release-1.16

Automated cherry pick of kubernetes#8965: Fix missing changes in Weave manifest kubernetes#9285: Update Weave for CVE-2020-13597
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.

4 participants