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

Update weave template to match source for 2.8.1 #8013

Merged
merged 1 commit into from
Sep 28, 2021
Merged

Update weave template to match source for 2.8.1 #8013

merged 1 commit into from
Sep 28, 2021

Conversation

frankfil
Copy link
Contributor

@frankfil frankfil commented Sep 23, 2021 •
edited by floryut
Loading

What type of PR is this?
/kind bug

What this PR does / why we need it:
Updates the template used to mount the file /etc/machine-id into the container and also updates the template to match the current deployment from Weave 2.8.1.

Which issue(s) this PR fixes:
Fixes #8003

Does this PR introduce a user-facing change?:

[Weave] Update template to match upstream

@k8s-ci-robot k8s-ci-robot added the kind/bug Categorizes issue or PR as related to a bug. label Sep 23, 2021
@k8s-ci-robot
Copy link
Contributor

Welcome @frankfil!

It looks like this is your first PR to kubernetes-sigs/kubespray 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/kubespray has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot
Copy link
Contributor

Hi @frankfil. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Sep 23, 2021
@k8s-ci-robot k8s-ci-robot requested review from bozzo and EppO September 23, 2021 23:43
@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 Sep 23, 2021
floryut
floryut approved these changes Sep 24, 2021
View reviewed changes
Copy link
Member

@floryut floryut left a comment

Choose a reason for hiding this comment

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

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Sep 24, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: floryut, frankfil

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 Sep 24, 2021
oomichi
oomichi reviewed Sep 27, 2021
View reviewed changes
Copy link
Contributor

@oomichi oomichi left a comment

Choose a reason for hiding this comment

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

/cc @oomichi

roles/network_plugin/weave/templates/weave-net.yml.j2
@@ -27,28 +27,28 @@ items:
- list
- watch
- apiGroups:
- networking.k8s.io
- extensions
Copy link
Contributor

Choose a reason for hiding this comment

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

I compared this change with the original manifest of weave-net by downloading it from https://cloud.weave.works/k8s/net?k8s-version=1.23

This apiGroups is networking.k8s.io, not extensions on the original manifest.
Why here is changed?
I guess this adds apiGroups 'extentions` for networkpolicies API, but I am not sure the reason.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I based my changes off of https://github.com/weaveworks/weave/blob/v2.8.1/prog/weave-kube/weave-daemonset-k8s-1.11.yaml I didn't even know the file you linked to was an option.

A quick look shows some of the differences are ordering (which you have commented on below) but some are actual changes like this.

Later on the networking.k8s.io is included so this is partly a change and partly an ordering change.

Would you prefer to go off the file you linked to? There are a bunch of additional timestamped annotations in your version that appear to be set based on the time the file is downloaded. Not sure if it makes sense to include those.

Copy link
Contributor

Choose a reason for hiding this comment

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

Thank you for your explanation, I see that.
I confirmed this change is valid by comparing https://github.com/weaveworks/weave/blob/v2.8.1/prog/weave-kube/weave-daemonset-k8s-1.11.yaml
I am fine to apply the above as the original for updating the manifest.

/lgtm

roles/network_plugin/weave/templates/weave-net.yml.j2
labels:
name: weave-net
namespace: kube-system
Copy link
Contributor

Choose a reason for hiding this comment

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

Why this changes the order of the namespace?
The previous order is the same as the original manifest.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I kept the ordering from the original file and just added in the various Ansible bits from kubespray. I'm happy to change the ordering to make the PR have less changes.

Same applies to your additional comments on ordering below.

roles/network_plugin/weave/templates/weave-net.yml.j2
resources:
- configmaps
resourceNames:
- weave-net
Copy link
Contributor

Choose a reason for hiding this comment

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

ditto: Changing the order which was the same as the original one.

roles/network_plugin/weave/templates/weave-net.yml.j2
labels:
name: weave-net
namespace: kube-system
Copy link
Contributor

Choose a reason for hiding this comment

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

ditto: Changing the order which was the same as the original one.

roles/network_plugin/weave/templates/weave-net.yml.j2
@@ -109,16 +109,16 @@ items:
name: weave-net
namespace: kube-system
spec:
minReadySeconds: 5
# Wait 5 seconds to let pod connect before rolling next pod
Copy link
Contributor

Choose a reason for hiding this comment

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

The original manifest doesn't contain this comment, and the order of minReadySecounds was the same as the old one.

roles/network_plugin/weave/templates/weave-net.yml.j2
@@ -260,6 +266,9 @@ items:
- name: cni-conf
hostPath:
path: /etc
- name: cni-machine-id
hostPath:
path: /etc/machine-id
Copy link
Contributor

Choose a reason for hiding this comment

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

Why doesn't here specify type: FileOrCreate which is specified on the original one?

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 28, 2021
@k8s-ci-robot k8s-ci-robot merged commit eee2eb1 into kubernetes-sigs:master Sep 28, 2021
@floryut floryut added kind/network Network section in the release note and removed kind/bug Categorizes issue or PR as related to a bug. labels Sep 29, 2021
LuckySB pushed a commit to southbridgeio/kubespray that referenced this pull request Oct 23, 2021
@frankfil @LuckySB
Update weave template to match source for 2.8.1 (kubernetes-sigs#8013)
423ee9e
@floryut floryut mentioned this pull request Dec 21, 2021
Closed
sakuraiyuta pushed a commit to sakuraiyuta/kubespray that referenced this pull request Apr 16, 2022
@frankfil @sakuraiyuta
Update weave template to match source for 2.8.1 (kubernetes-sigs#8013)
4f4f6e2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@floryut floryut floryut approved these changes

@bozzo bozzo Awaiting requested review from bozzo

@EppO EppO Awaiting requested review from EppO

@oomichi oomichi Awaiting requested review from oomichi

Assignees

@oomichi oomichi

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. kind/network Network section in the release note lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Weave 2.8.1 fails to start due to missing volume mount
4 participants
@frankfil @k8s-ci-robot @oomichi @floryut