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

Adding ability to configure resources for weave (#8113) #8216

Merged
merged 1 commit into from
Jan 3, 2020
Merged

Adding ability to configure resources for weave (#8113) #8216

merged 1 commit into from
Jan 3, 2020

Conversation

mmerrill3
Copy link
Contributor

This is a PR to address #8113 whereby kops users can gain the ability to configure resources for the weave and weave-npc containers inside the weave daemonset.
Signed-off-by: mmerrill3 michael.merrill@vonage.com

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Dec 28, 2019
@k8s-ci-robot
Copy link
Contributor

Hi @mmerrill3. Thanks for your PR.

I'm waiting for a kubernetes 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 needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Dec 28, 2019
@mmerrill3
Copy link
Contributor Author

/assign @gambol99

@mmerrill3 mmerrill3 force-pushed the feature/issue-8113-weave-resources branch from 8fbbfec to b38bafe Compare December 28, 2019 23:06
Adding ability to configure resources for weave (kubernetes#8113)
b38bafe 
Signed-off-by: mmerrill3 <michael.merrill@vonage.com>
@rifelpet
Copy link
Member

/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 Dec 28, 2019
@mmerrill3
Copy link
Contributor Author

/test pull-kops-e2e-kubernetes-aws

1 similar comment
@rifelpet
Copy link
Member

/test pull-kops-e2e-kubernetes-aws

@mikesplain
Copy link
Contributor

Thanks @mmerrill3!

/lgtm
/approve

Fixes: #8113

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 3, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mikesplain, mmerrill3

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 Jan 3, 2020
@k8s-ci-robot k8s-ci-robot merged commit 2b24f69 into kubernetes:master Jan 3, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.18 milestone Jan 3, 2020
@mmerrill3 mmerrill3 deleted the feature/issue-8113-weave-resources branch January 3, 2020 17:16
@hakman
Copy link
Member

hakman commented Jan 9, 2020

@mmerrill3 @mikesplain @rifelpet Any chance this broke the weave plugin? My gu
https://testgrid.k8s.io/sig-cluster-lifecycle-kops#kops-aws-weave
https://storage.googleapis.com/kubernetes-jenkins/logs/ci-kubernetes-e2e-kops-aws-weave/1214998660220194818/artifacts/ip-172-20-50-49.sa-east-1.compute.internal/protokube.log

Error from server (BadRequest): error when creating "/tmp/channel468225765/manifest.yaml": DaemonSet in version "v1" cannot be handled as a DaemonSet: v1.DaemonSet.Spec: v1.DaemonSetSpec.Template: v1.PodTemplateSpec.Spec: v1.PodSpec.Containers: []v1.Container: v1.Container.Resources: v1.ResourceRequirements.Requests: Limits: unmarshalerDecoder: unable to parse quantity's suffix, error found in #10 byte of ...|y":"200mi"},"request|..., bigger context ...|rt":6784}},"resources":{"limits":{"memory":"200mi"},"requests":{"cpu":"50m","memory":"200mi"}},"secu|...
Error: error updating "networking.weave": error applying update from "s3://k8s-kops-prow/e2e-kops-aws-weave.test-cncf-aws.k8s.io/addons/networking.weave/k8s-1.12.yaml": error running kubectl

rifelpet
rifelpet reviewed Jan 9, 2020
View reviewed changes
upup/models/cloudup/resources/addons/networking.weave/k8s-1.12.yaml.template
cpu: 50m
memory: 200Mi
cpu: {{ or .Networking.Weave.CPURequest "50m" }}
memory: {{ or .Networking.Weave.MemoryRequest "200mi" }}
Copy link
Member

Choose a reason for hiding this comment

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

These memory units need to have a capital M don't they?

https://kubernetes.io/docs/tasks/configure-pod-container/assign-memory-resource/#memory-units

Copy link
Member

@hakman hakman Jan 9, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

That's what I thought also... PR to fix it?

@hakman hakman mentioned this pull request Jan 10, 2020
Merged
@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 #9057 from hakman/automated-cherry-pick-of-#8216-#…
8d3c46d 
…8303-upstream-release-1.17

Automated cherry pick of #8216 #8303: Adding ability to configure resources for weave
@daenney daenney mentioned this pull request Mar 3, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rifelpet rifelpet rifelpet left review comments

@hakman hakman hakman left review comments

@joshbranham joshbranham Awaiting requested review from joshbranham

@robinpercy robinpercy Awaiting requested review from robinpercy

Assignees

@mikesplain mikesplain

@gambol99 gambol99

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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.18
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@mmerrill3 @k8s-ci-robot @rifelpet @mikesplain @hakman @gambol99