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

[weave] Add support for default version override #10273

Merged
merged 2 commits into from
Nov 22, 2020
Merged

[weave] Add support for default version override #10273

merged 2 commits into from
Nov 22, 2020

Conversation

dntosas
Copy link
Contributor

@dntosas dntosas commented Nov 19, 2020

In this PR, we enable users to override the default version of networking/Weave specs.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 19, 2020
@k8s-ci-robot
Copy link
Contributor

Hi @dntosas. 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 the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Nov 19, 2020
@dntosas dntosas force-pushed the weave-add-ability-to-specify-image branch from 6e556f2 to b7f7385 Compare November 19, 2020 18:17
hakman
hakman reviewed Nov 19, 2020
View reviewed changes
pkg/apis/kops/networking.go Outdated
Comment on lines 89 to 91

// Version overrides the default tag of Weave container image.
Version string `json:"version,omitempty"`
Copy link
Member

Choose a reason for hiding this comment

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

@rifelpet any thoughts if to use Version or ImageName, seems very inconsistent?

Suggested change
// Version overrides the default tag of Weave container image.
Version string `json:"version,omitempty"`
// Version overrides the default tag of Weave container image.
Version string `json:"version,omitempty"`

Copy link
Contributor Author

Choose a reason for hiding this comment

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

just for reference, i followed this logic -->

kops/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12.yaml.template

Line 446 in 27f9114

image: "docker.io/cilium/cilium:{{ .Version }}"

Copy link
Member

Choose a reason for hiding this comment

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

No worries, just asking @rifelpet if there's a preferred way to do this.

@dntosas dntosas force-pushed the weave-add-ability-to-specify-image branch from b7f7385 to e9a172e Compare November 19, 2020 18:56
@hakman
Copy link
Member

hakman commented Nov 19, 2020

I think you are missing a generated file. Can you check if you missed anything from make apimachinery ?

johngmyers
johngmyers reviewed Nov 19, 2020
View reviewed changes
pkg/apis/kops/networking.go Outdated
@@ -86,6 +86,9 @@ type WeaveNetworkingSpec struct {
NPCCPULimit *resource.Quantity `json:"npcCPULimit,omitempty"`
// NPCExtraArgs are extra arguments that are passed to weave-npc.
NPCExtraArgs string `json:"npcExtraArgs,omitempty"`

// Version overrides the default tag of Weave container image.
Copy link
Member

Choose a reason for hiding this comment

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

I would suggest de-emphasizing the default. Something like "Version specifies the Weave container image tag. The default depends on the kOps version."

Copy link
Contributor Author

Choose a reason for hiding this comment

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

thanks for your suggestion @johngmyers , pushed changes accordingly ^^

@dntosas dntosas force-pushed the weave-add-ability-to-specify-image branch from e9a172e to a3b759a Compare November 19, 2020 19:15
@dntosas
Copy link
Contributor Author

dntosas commented Nov 19, 2020 •
edited
Loading

I think you are missing a generated file. Can you check if you missed anything from make apimachinery ?

i have the same problem again, running make apimachinery does not generate files. will try to fix my env

@dntosas dntosas force-pushed the weave-add-ability-to-specify-image branch 4 times, most recently from 7d579c1 to a6bc403 Compare November 20, 2020 08:24
@hakman
Copy link
Member

hakman commented Nov 20, 2020

Looks pretty much ok now.

@dntosas dntosas force-pushed the weave-add-ability-to-specify-image branch from a6bc403 to 64e246f Compare November 20, 2020 08:26
@hakman
Copy link
Member

hakman commented Nov 20, 2020

Sorry, was ok before with the extra line. Didn't see that all groups are separated in that struct.

@dntosas
Copy link
Contributor Author

dntosas commented Nov 20, 2020

Looks pretty much ok now.

yes 😃 ^^

Remember i had the same problem last time and we did the same conversation again, pointing me to put git repo into GOPATH/k8s.io.

Sorry, was ok before with the extra line. Didn't see that all groups are separated in that struct.

Should i add extra line or not?

@hakman
Copy link
Member

hakman commented Nov 20, 2020

Please add it back.

@dntosas dntosas force-pushed the weave-add-ability-to-specify-image branch 2 times, most recently from 4256d74 to 9e4832e Compare November 20, 2020 08:46
@hakman
Copy link
Member

hakman commented Nov 20, 2020

/ok-to-test
/lgtm

@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 Nov 20, 2020
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 20, 2020
@dntosas
[weave] Add support for default version override
b7a2d0a 
In this commit, we enable users to override default version
of networking/Weave specs.

Signed-off-by: dntosas <ntosas@gmail.com>
@dntosas dntosas force-pushed the weave-add-ability-to-specify-image branch from 9e4832e to b7a2d0a Compare November 20, 2020 12:27
@k8s-ci-robot k8s-ci-robot added area/documentation size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Nov 20, 2020
@dntosas
Copy link
Contributor Author

dntosas commented Nov 20, 2020

added some docs as reference ^^

@hakman
Copy link
Member

hakman commented Nov 22, 2020

/lgtm
/approve

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

[APPROVALNOTIFIER] This PR is APPROVED

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

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 Nov 22, 2020
@k8s-ci-robot k8s-ci-robot merged commit 085b575 into kubernetes:master Nov 22, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.20 milestone Nov 22, 2020
@dntosas dntosas deleted the weave-add-ability-to-specify-image branch November 22, 2020 08:37
This was referenced Nov 23, 2020
Merged
Merged
k8s-ci-robot added a commit that referenced this pull request Nov 23, 2020
@k8s-ci-robot
Merge pull request #10301 from hakman/automated-cherry-pick-of-#10273…
e1ddc75 
…-upstream-release-1.19

Automated cherry pick of #10273: Add support for default version override
k8s-ci-robot added a commit that referenced this pull request Nov 23, 2020
@k8s-ci-robot
Merge pull request #10302 from hakman/automated-cherry-pick-of-#10273…
3937c06 
…-upstream-release-1.18

Automated cherry pick of #10273: Add support for default version override
@dntosas dntosas mentioned this pull request Oct 7, 2022
Closed
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@johngmyers johngmyers johngmyers left review comments

@hakman hakman hakman left review comments

@joshbranham joshbranham Awaiting requested review from joshbranham

Assignees

@hakman hakman

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/addons area/api area/documentation 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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.20
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@dntosas @k8s-ci-robot @hakman @johngmyers