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

Basic windows agent that will join a cluster without CNI. #3411

Merged
merged 1 commit into from
Jun 23, 2021
Merged

Basic windows agent that will join a cluster without CNI. #3411

merged 1 commit into from
Jun 23, 2021

Conversation

phillipsj
Copy link
Contributor

@phillipsj phillipsj commented Jun 4, 2021 •
edited by brandond
Loading

Proposed Changes

This adds support for just a basic windows agent that can join a cluster.

Types of Changes

These are all new features to support windows.

Verification

A windows k3s agent can be started that joins an existing k3s cluster.

Linked Issues

This is in support of adding Windows support: #3419
Also: rancher/windows#52

@phillipsj phillipsj requested a review from a team as a code owner June 4, 2021 20:01
brandond
brandond requested changes Jun 4, 2021
View reviewed changes
pkg/agent/config/config.go Outdated Show resolved Hide resolved
pkg/agent/containerd/config_windows.go Show resolved Hide resolved
pkg/agent/containerd/config_windows.go Outdated Show resolved Hide resolved
pkg/agent/run_windows.go Outdated Show resolved Hide resolved
pkg/agent/templates/templates_windows.go Outdated Show resolved Hide resolved
pkg/daemons/agent/agent_linux.go Outdated Show resolved Hide resolved
pkg/daemons/agent/agent.go Outdated Show resolved Hide resolved
pkg/daemons/agent/agent_windows.go Outdated Show resolved Hide resolved
pkg/daemons/agent/agent_windows.go Outdated Show resolved Hide resolved
pkg/daemons/agent/agent_windows.go Outdated Show resolved Hide resolved
@phillipsj
Copy link
Contributor Author

@brandond I have implemented all of your suggestions. Please review when you get a chance.

@phillipsj
Copy link
Contributor Author

phillipsj commented Jun 7, 2021 •
edited
Loading

#3419

@brandond
Copy link
Member

brandond commented Jun 7, 2021 •
edited
Loading

Looking better; I left a couple new comments but you can resolve the old discussions. Build seems to want a go mod tidy.

I added the K3s issue to the "Linked Issues" section of the PR discussion up above.

@phillipsj phillipsj mentioned this pull request Jun 15, 2021
Closed
@brandond brandond merged commit 82394d7 into k3s-io:master Jun 23, 2021
@phillipsj phillipsj deleted the basic-windows-agent branch July 19, 2021 12:41
@brandond brandond mentioned this pull request Aug 26, 2021
Closed
@brandond brandond mentioned this pull request Jan 30, 2025
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nickgerace nickgerace nickgerace left review comments

@briandowns briandowns briandowns approved these changes

@dweomer dweomer dweomer 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.
5 participants
@phillipsj @brandond @dweomer @briandowns @nickgerace