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

[Windows] Set Node IP after kubeadm join complete #743

Merged
merged 1 commit into from
May 29, 2020
Merged

[Windows] Set Node IP after kubeadm join complete #743

merged 1 commit into from
May 29, 2020

Conversation

ruicao93
Copy link
Contributor

@ruicao93 ruicao93 commented May 27, 2020 •
edited
Loading

In the document we have a step to set the Node IP used by
kubelet by editing the kubeadm-flags.env file. However, the
file only exists after "kubeadm join" completes.

This patch moves the set Node IP step after "kubeadm join".
And adds a "restart-service kubelet" operation to make the configuration
change effective.

Signed-off-by: Rui Cao rcao@vmware.com

@antrea-bot
Copy link
Collaborator

Thanks for your PR.
Unit tests and code linters are run automatically every time the PR is updated.
E2e, conformance and network policy tests can only be triggered by a member of the vmware-tanzu organization. Regular contributors to the project should join the org.

The following commands are available:

  • /test-e2e: to trigger e2e tests.
  • /skip-e2e: to skip e2e tests.
  • /test-conformance: to trigger conformance tests.
  • /skip-conformance: to skip conformance tests.
  • /test-networkpolicy: to trigger networkpolicy tests.
  • /skip-networkpolicy: to skip networkpolicy tests.
  • /test-windows-conformance: to trigger windows conformance tests.
  • /skip-windows-conformance: to skip windows conformance tests.
  • /test-all: to trigger all tests.
  • /skip-all: to skip all tests.

These commands can only be run by members of the vmware-tanzu organization.

antoninbas
antoninbas reviewed May 27, 2020
View reviewed changes
Copy link
Contributor

@antoninbas antoninbas left a comment

Choose a reason for hiding this comment

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

Grammar is a bit off in commit message:

In the document we have a step to set the Node IP used by
kubelet by editing the kubeadm-flags.env file. However, the
file only exists after "kubeadm join" completes.

This patch moves the set Node IP step after "kubeadm join".
And adds a "restart-service kubelet" operation to make the configuration
change effective.

docs/windows.md Outdated
```
KUBELET_KUBEADM_ARGS="--cgroup-driver= --network-plugin=cni --pod-infra-container-image=k8s.gcr.io/pause:3.1"
```
Append "--node-ip=$NODE_IP" at the end of params. Replace `$NODE_IP` with
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe use backticks here for consistency: --node-ip=$NODE_IP

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

docs/windows.md Outdated
```
KUBELET_KUBEADM_ARGS="--cgroup-driver= --network-plugin=cni --pod-infra-container-image=k8s.gcr.io/pause:3.1 --node-ip=$NODE_IP"```
```
Restart kubelet service to take effect.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
Restart kubelet service to take effect.
Restart kubelet service for changes to take effect.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

ruicao93 added a commit to ruicao93/antrea that referenced this pull request May 28, 2020
@ruicao93
[Windows] Set Node IP after kubeadm join complete (antrea-io#743)
d12c29f 
In the document we have a step to set the Node IP used by
kubelet by editing the kubeadm-flags.env file. However, the
file only exists after "kubeadm join" completes.

This patch moves the set Node IP step after "kubeadm join".
And adds a "restart-service kubelet" operation to make the configuration
change effective.

Signed-off-by: Rui Cao <rcao@vmware.com>
ruicao93 added a commit to ruicao93/antrea that referenced this pull request May 28, 2020
@ruicao93
[Windows] Set Node IP after kubeadm join complete (antrea-io#743)
11beb34 
In the document we have a step to set the Node IP used by
kubelet by editing the kubeadm-flags.env file. However, the
file only exists after "kubeadm join" completes.

This patch moves the set Node IP step after "kubeadm join".
And adds a "restart-service kubelet" operation to make the configuration
change effective.

Signed-off-by: Rui Cao <rcao@vmware.com>
@ruicao93
Copy link
Contributor Author

Thanks @antoninbas ~. Fix the issues.

@ruicao93
Copy link
Contributor Author

/skip-all

antoninbas
antoninbas reviewed May 28, 2020
View reviewed changes
docs/windows.md Outdated
Append `--node-ip=$NODE_IP` at the end of params. Replace `$NODE_IP` with
the address for kubelet. It should look like:
```
KUBELET_KUBEADM_ARGS="--cgroup-driver= --network-plugin=cni --pod-infra-container-image=k8s.gcr.io/pause:3.1 --node-ip=$NODE_IP"```
Copy link
Contributor

Choose a reason for hiding this comment

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

you have an extra set of triple backticks at the end I think?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

@antoninbas antoninbas added this to the Antrea v0.7.0 release milestone May 28, 2020
ruicao93 added a commit to ruicao93/antrea that referenced this pull request May 29, 2020
@ruicao93
[Windows] Set Node IP after kubeadm join complete (antrea-io#743)
2b8934b 
In the document we have a step to set the Node IP used by
kubelet by editing the kubeadm-flags.env file. However, the
file only exists after "kubeadm join" completes.

This patch moves the set Node IP step after "kubeadm join".
And adds a "restart-service kubelet" operation to make the configuration
change effective.

Signed-off-by: Rui Cao <rcao@vmware.com>
@ruicao93
Copy link
Contributor Author

/skip-all

@ruicao93 ruicao93 requested a review from antoninbas May 29, 2020 00:12
antoninbas
antoninbas previously approved these changes May 29, 2020
View reviewed changes
Copy link
Contributor

@antoninbas antoninbas left a comment

Choose a reason for hiding this comment

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

LGTM

@ruicao93
Copy link
Contributor Author

/skip-all

@ruicao93
Copy link
Contributor Author

/skip-test-e2e

@ruicao93
Copy link
Contributor Author

/test-e2e

jianjuns
jianjuns reviewed May 29, 2020
View reviewed changes
Copy link
Contributor

@jianjuns jianjuns left a comment

Choose a reason for hiding this comment

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

The change in this PR looks good to me.
However, I found I added a few extra comments of your last PR #706 after it was merged. Could you check those comments as well?

@ruicao93
Copy link
Contributor Author

The change in this PR looks good to me.
However, I found I added a few extra comments of your last PR #706 after it was merged. Could you check those comments as well?
Sure, thanks @jianjuns. Fixes for the comments are contained in PR #751:
#751

jianjuns
jianjuns previously approved these changes May 29, 2020
View reviewed changes
Copy link
Contributor

@jianjuns jianjuns left a comment

Choose a reason for hiding this comment

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

Ok. The changes in #751 look good.

@ruicao93
[Windows] Set Node IP after kubeadm join complete (antrea-io#743)
227367d 
In the document we have a step to set the Node IP used by
kubelet by editing the kubeadm-flags.env file. However, the
file only exists after "kubeadm join" completes.

This patch moves the set Node IP step after "kubeadm join".
And adds a "restart-service kubelet" operation to make the configuration
change effective.

Signed-off-by: Rui Cao <rcao@vmware.com>
@ruicao93 ruicao93 dismissed stale reviews from jianjuns and antoninbas via 227367d May 29, 2020 05:42
@ruicao93
Copy link
Contributor Author

/test-all

1 similar comment
@ruicao93
Copy link
Contributor Author

/test-all

antoninbas
antoninbas approved these changes May 29, 2020
View reviewed changes
Copy link
Contributor

@antoninbas antoninbas left a comment

Choose a reason for hiding this comment

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

Re-approving

@ruicao93 ruicao93 merged commit f355b69 into antrea-io:master May 29, 2020
McCodeman pushed a commit to McCodeman/antrea that referenced this pull request Jun 2, 2020
@ruicao93 @McCodeman
[Windows] Set Node IP after kubeadm join complete (antrea-io#743)
2ae012a 
In the document we have a step to set the Node IP used by
kubelet by editing the kubeadm-flags.env file. However, the
file only exists after "kubeadm join" completes.

This patch moves the set Node IP step after "kubeadm join".
And adds a "restart-service kubelet" operation to make the configuration
change effective.

Signed-off-by: Rui Cao <rcao@vmware.com>
McCodeman pushed a commit that referenced this pull request Jun 2, 2020
@ruicao93 @McCodeman
[Windows] Set Node IP after kubeadm join complete (#743)
bd581b5 
In the document we have a step to set the Node IP used by
kubelet by editing the kubeadm-flags.env file. However, the
file only exists after "kubeadm join" completes.

This patch moves the set Node IP step after "kubeadm join".
And adds a "restart-service kubelet" operation to make the configuration
change effective.

Signed-off-by: Rui Cao <rcao@vmware.com>
@ruicao93 ruicao93 deleted the fix_doc branch July 8, 2020 03:53
GraysonWu pushed a commit to GraysonWu/antrea that referenced this pull request Sep 22, 2020
@ruicao93 @GraysonWu
[Windows] Set Node IP after kubeadm join complete (antrea-io#743)
1cb2cd9 
In the document we have a step to set the Node IP used by
kubelet by editing the kubeadm-flags.env file. However, the
file only exists after "kubeadm join" completes.

This patch moves the set Node IP step after "kubeadm join".
And adds a "restart-service kubelet" operation to make the configuration
change effective.

Signed-off-by: Rui Cao <rcao@vmware.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@antoninbas antoninbas antoninbas approved these changes

@jianjuns jianjuns jianjuns left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Antrea v0.7.0 release
Development

Successfully merging this pull request may close these issues.
5 participants
@ruicao93 @antrea-bot @antoninbas @jianjuns @vmwclabot