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

feat: Add nodes back to the host cluster without kubeadm #645

Merged
merged 1 commit into from
Jul 12, 2024

Conversation

qiuwei68
Copy link
Contributor

@qiuwei68 qiuwei68 commented Jul 5, 2024

What type of PR is this?

/kind feature

What does this PR do?

Add nodes back to the host cluster without kubeadm

Which issue(s) does this PR fix?

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?


hack/k8s-in-k8s/kubelet_node_helper.sh Outdated Show resolved Hide resolved
kind: Config
clusters:
- cluster:
certificate-authority: /apps/conf/kubernetes/pki/ca.crt
Copy link
Contributor

Choose a reason for hiding this comment

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

use env PATH_KUBERNETES_PKI


# copy the file to the /etc/kubernetes directory
cp bootstrap-kubelet.conf /etc/kubernetes/

Copy link
Contributor

Choose a reason for hiding this comment

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

PATH_KUBERNETES

echo "NONONO use kubeadm to join node to host"
get_ca_certificate $JOIN_HOST
create_kubelet_bootstrap_config $JOIN_HOST $JOIN_TOKEN
cp $PATH_FILE_TMP/kubeadm-flags.env /var/lib/kubelet/
fi
Copy link
Contributor

Choose a reason for hiding this comment

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

  1. use env PATH_KUBELET_LIB
  2. This file kubeadm-flags.env has been modified.

@@ -128,6 +195,7 @@ function revert() {
exit 1
fi

systemctl start kubelet
afterRevert
Copy link
Contributor

Choose a reason for hiding this comment

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

add if [ "$USE_KUBEADM" = "true" ]; then

@qiuwei68 qiuwei68 force-pushed the feature_hostports branch 2 times, most recently from afebfcf to dfe4175 Compare July 8, 2024 10:48
feat: Add nodes back to the host cluster without kubeadm

Signed-off-by: qiuwei <[email protected]>

feat: port_check.sh support ipv6

Signed-off-by: qiuwei <[email protected]>
@qiuwei68 qiuwei68 force-pushed the feature_hostports branch from 87eddd8 to 81bc794 Compare July 9, 2024 01:23
@OrangeBao
Copy link
Contributor

/lgtm
/approve

@duanmengkk duanmengkk merged commit da196b2 into kosmos-io:main Jul 12, 2024
5 of 9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants