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.

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

Expose --agent-arg like --server-arg #96

Merged
merged 2 commits into from
Aug 6, 2019

Conversation

misakwa
Copy link
Contributor

@misakwa misakwa commented Jul 31, 2019

Expose --agent-arg flag and forward those to k3s like we do for --server-arg.

There is an agent arg in the cluster spec, but it is not forwarded to the container config when starting the container. This change exposes the agent arg so that options passed to kubernetes components in the master container can also be passed to workers.

Fixes #86

Copy link
Member

@iwilltry42 iwilltry42 left a comment

Choose a reason for hiding this comment

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

LGTM! Thank you for your contribution :)
Maybe @andyz-dev could have a look as well and then merge it, if everything's fine 👍

@iwilltry42 iwilltry42 requested a review from andyz-dev July 31, 2019 15:16
@iwilltry42 iwilltry42 added the enhancement New feature or request label Jul 31, 2019
@misakwa
Copy link
Contributor Author

misakwa commented Jul 31, 2019

Absolutely! Thanks for working on this tool. Its been very useful to me.

@andyz-dev
Copy link
Contributor

In cli/command.go line 108, would you please consider the following alternative?

k3AgentArgs := []string{''}
It should be the same logic as your patch, but may be a bit easier to understand.

Besides the small nit. The PR looks clean and neat. Thanks for the contribution!

@misakwa
Copy link
Contributor Author

misakwa commented Aug 6, 2019

@andyz-dev it should be fixed now.

Copy link
Contributor

@andyz-dev andyz-dev left a comment

Choose a reason for hiding this comment

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

LGTM, Thanks!

@andyz-dev andyz-dev merged commit 460ff82 into k3d-io:master Aug 6, 2019
@misakwa misakwa deleted the misakwa/agent-args branch August 6, 2019 12:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Feature] allow passing agent args (how to configure custom service/pod CIDR)
3 participants