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

Add prefer-bundled-bin as an agent flag #6545

Merged
merged 3 commits into from
Nov 22, 2022
Merged

Add prefer-bundled-bin as an agent flag #6545

merged 3 commits into from
Nov 22, 2022

Conversation

dereknola
Copy link
Member

@dereknola dereknola commented Nov 22, 2022 •
edited by brandond
Loading

Signed-off-by: Derek Nola [email protected]

Proposed Changes

Types of Changes

Verification

Deploy a server and agent on nodes with prefer-bundled-bin flag for both.

Testing

Linked Issues

#3117

User-Facing Change

NONE

Further Comments

@dereknola dereknola requested a review from a team as a code owner November 22, 2022 18:04
brandond
brandond requested changes Nov 22, 2022
View reviewed changes
Copy link
Member

@brandond brandond left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Nit: rather than copy-pasting the flag definition between both files, add it as a var like the DebugFlag in root.go and just reference that var in the list:

k3s/pkg/cli/cmds/root.go

Lines 14 to 18 in 1beecb2

DebugFlag = cli.BoolFlag{
Name: "debug",
Usage: "(logging) Turn on debug logs",
Destination: &Debug,
EnvVar: version.ProgramUpper + "_DEBUG",

k3s/pkg/cli/cmds/agent.go

Line 226 in 1beecb2

DebugFlag,

k3s/pkg/cli/cmds/server.go

Line 172 in 1beecb2

DebugFlag,

@dereknola
DRY
3b0de11 
Signed-off-by: Derek Nola <[email protected]>
cwayne18
cwayne18 approved these changes Nov 22, 2022
View reviewed changes
Copy link
Member

@cwayne18 cwayne18 left a comment

Choose a reason for hiding this comment

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

Thank you very much for adding the test, LGTM

@dereknola dereknola merged commit 614da78 into k3s-io:master Nov 22, 2022
brandond pushed a commit to brandond/k3s that referenced this pull request Dec 1, 2022
@dereknola @brandond
Add prefer-bundled-bin as an agent flag (k3s-io#6545)
d8514fa 
* Add prefer-bundled-bin as an agent flag
* Add E2E test for prefer-bundled-bin

Signed-off-by: Derek Nola <[email protected]>
(cherry picked from commit 614da78)
Signed-off-by: Brad Davidson <[email protected]>
brandond pushed a commit to brandond/k3s that referenced this pull request Dec 1, 2022
@dereknola @brandond
Add prefer-bundled-bin as an agent flag (k3s-io#6545)
5b63592 
* Add prefer-bundled-bin as an agent flag
* Add E2E test for prefer-bundled-bin

Signed-off-by: Derek Nola <[email protected]>
(cherry picked from commit 614da78)
Signed-off-by: Brad Davidson <[email protected]>
@brandond brandond mentioned this pull request Dec 1, 2022
Merged
brandond pushed a commit to brandond/k3s that referenced this pull request Dec 1, 2022
@dereknola @brandond
Add prefer-bundled-bin as an agent flag (k3s-io#6545)
34ab9a8 
* Add prefer-bundled-bin as an agent flag
* Add E2E test for prefer-bundled-bin

Signed-off-by: Derek Nola <[email protected]>
(cherry picked from commit 614da78)
Signed-off-by: Brad Davidson <[email protected]>
@brandond brandond mentioned this pull request Dec 1, 2022
Merged
brandond pushed a commit to brandond/k3s that referenced this pull request Dec 1, 2022
@dereknola @brandond
Add prefer-bundled-bin as an agent flag (k3s-io#6545)
f8cb71b 
* Add prefer-bundled-bin as an agent flag
* Add E2E test for prefer-bundled-bin

Signed-off-by: Derek Nola <[email protected]>
(cherry picked from commit 614da78)
Signed-off-by: Brad Davidson <[email protected]>
brandond pushed a commit to brandond/k3s that referenced this pull request Dec 1, 2022
@dereknola @brandond
Add prefer-bundled-bin as an agent flag (k3s-io#6545)
49ac507 
* Add prefer-bundled-bin as an agent flag
* Add E2E test for prefer-bundled-bin

Signed-off-by: Derek Nola <[email protected]>
(cherry picked from commit 614da78)
Signed-off-by: Brad Davidson <[email protected]>
brandond pushed a commit to brandond/k3s that referenced this pull request Dec 1, 2022
@dereknola @brandond
Add prefer-bundled-bin as an agent flag (k3s-io#6545)
3fad18d 
* Add prefer-bundled-bin as an agent flag
* Add E2E test for prefer-bundled-bin

Signed-off-by: Derek Nola <[email protected]>
(cherry picked from commit 614da78)
Signed-off-by: Brad Davidson <[email protected]>
brandond pushed a commit to brandond/k3s that referenced this pull request Dec 2, 2022
@dereknola @brandond
Add prefer-bundled-bin as an agent flag (k3s-io#6545)
c242e06 
* Add prefer-bundled-bin as an agent flag
* Add E2E test for prefer-bundled-bin

Signed-off-by: Derek Nola <[email protected]>
(cherry picked from commit 614da78)
Signed-off-by: Brad Davidson <[email protected]>
brandond pushed a commit that referenced this pull request Dec 2, 2022
@dereknola @brandond
Add prefer-bundled-bin as an agent flag (#6545)
bec4ff1 
* Add prefer-bundled-bin as an agent flag
* Add E2E test for prefer-bundled-bin

Signed-off-by: Derek Nola <[email protected]>
(cherry picked from commit 614da78)
Signed-off-by: Brad Davidson <[email protected]>
brandond pushed a commit that referenced this pull request Dec 2, 2022
@dereknola @brandond
Add prefer-bundled-bin as an agent flag (#6545)
9112059 
* Add prefer-bundled-bin as an agent flag
* Add E2E test for prefer-bundled-bin

Signed-off-by: Derek Nola <[email protected]>
(cherry picked from commit 614da78)
Signed-off-by: Brad Davidson <[email protected]>
@dereknola dereknola deleted the prefer_agent branch December 7, 2022 19:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cwayne18 cwayne18 cwayne18 approved these changes

@brandond brandond brandond approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@dereknola @brandond @cwayne18