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

Fix missing changes in Weave manifest #8965

Merged
merged 1 commit into from
Apr 28, 2020
Merged

Fix missing changes in Weave manifest #8965

merged 1 commit into from
Apr 28, 2020

Conversation

hakman
Copy link
Member

@hakman hakman commented Apr 23, 2020

Seems that these were missing compared to latest version on the weave site.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 23, 2020
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 23, 2020
@hakman
Copy link
Member Author

hakman commented Apr 25, 2020

/cc @olemarkus

@k8s-ci-robot k8s-ci-robot requested a review from olemarkus April 25, 2020 07:14
olemarkus
olemarkus reviewed Apr 25, 2020
View reviewed changes
upup/models/cloudup/resources/addons/networking.weave/k8s-1.12.yaml.template
@@ -36,6 +36,14 @@ rules:
- get
- list
- watch
- apiGroups:
Copy link
Member

Choose a reason for hiding this comment

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

Does weave actually fetch resources using the deprecated api groups? If not, this is not necessary. It doesn't do any harm either though.

Copy link
Member Author

Choose a reason for hiding this comment

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

Best to keep it as close as possible to their official manifest, I guess. Thanks for checking this.
https://github.com/weaveworks/weave/blob/9f00f78d3b9d5a8a31fdd90ec691095028e2690a/prog/weave-kube/weave-daemonset-k8s-1.11.yaml#L28-L35

@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 Apr 25, 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 Apr 28, 2020
@k8s-ci-robot k8s-ci-robot merged commit 0adf32f into kubernetes:master Apr 28, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.18 milestone Apr 28, 2020
@hakman hakman deleted the weave-fixes branch April 30, 2020 11:40
@hakman hakman mentioned this pull request May 4, 2020
Merged
k8s-ci-robot added a commit that referenced this pull request May 4, 2020
@k8s-ci-robot
Merge pull request #9058 from hakman/automated-cherry-pick-of-#7874-#…
cc44ed0 
…7898-#8691-#8764-#8965-upstream-release-1.17

Automated cherry pick of #7898 8691 8764 8965: Update Weave Net to version 2.6.2
@hakman hakman mentioned this pull request Jun 11, 2020
Merged
k8s-ci-robot added a commit that referenced this pull request Jun 11, 2020
@k8s-ci-robot
Merge pull request #9329 from hakman/automated-cherry-pick-of-#8965-#…
a02dd44 
…9285-upstream-release-1.16

Automated cherry pick of #8965: Fix missing changes in Weave manifest #9285: Update Weave for CVE-2020-13597
oded7hoffman pushed a commit to spotinst/kubernetes-kops that referenced this pull request Jan 23, 2023
@k8s-ci-robot
Merge pull request kubernetes#9329 from hakman/automated-cherry-pick-…
489e358 
…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
@k8s-ci-robot
Merge pull request kubernetes#9329 from hakman/automated-cherry-pick-…
9b986ca 
…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
@k8s-ci-robot
Merge pull request kubernetes#9329 from hakman/automated-cherry-pick-…
ee44203 
…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
Reviewers

@olemarkus olemarkus olemarkus left review comments

@joshbranham joshbranham Awaiting requested review from joshbranham

@robinpercy robinpercy Awaiting requested review from robinpercy

Assignees

@olemarkus olemarkus

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
Milestone
v1.18
Development

Successfully merging this pull request may close these issues.
4 participants
@hakman @olemarkus @rifelpet @k8s-ci-robot