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

Bugfix: kubelet on edge node keeps restarting issue #370

Merged
merged 12 commits into from
Aug 12, 2021
Merged

Bugfix: kubelet on edge node keeps restarting issue #370

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ec98fef
Bugfix: kubelet on edge node keeps restarting after yurtctl convert e…
Windrow14 Jun 25, 2021
18d62d6
Merge 2021071401
Windrow14 Jul 14, 2021
34193c7
Merge branch 'openyurtio-master'
Windrow14 Jul 14, 2021
844fa92
Revert ec98fef66ae8e6d8a7e384ac07e00265a80c46b0
Windrow14 Jul 14, 2021
9e384b0
Remove yurt-hub config directory and certificates in it when revert e…
Windrow14 Jul 14, 2021
0049a95
Fix compilation issue.
Windrow14 Aug 11, 2021
07722b2
Merge branch 'openyurtio:master' into master
Windrow Aug 11, 2021
aa80adb
Fix compilation issue.
Windrow14 Aug 12, 2021
9264f76
Fix compilation issue.
Windrow14 Aug 12, 2021
a0b238d
Fix compilation issue.
Windrow14 Aug 12, 2021
1ea981e
Fix compilation issue.
Windrow14 Aug 12, 2021
54b5265
Fix gofmt warning.
Windrow14 Aug 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions pkg/yurtctl/util/edgenode/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,29 +60,34 @@ metadata:
namespace: kube-system
spec:
volumes:
- name: hub-dir
- name: pki
hostPath:
path: /var/lib/yurthub
type: DirectoryOrCreate
path: /etc/kubernetes/pki
type: Directory
Copy link
Member

Choose a reason for hiding this comment

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

/var/lib/yurthub should be kept for yurthub certificates storage. and /etc/kubernetes/pki is not need to added because /etc/kubernetes hostpath has already mounted.

- name: kubernetes
hostPath:
path: /etc/kubernetes
type: Directory
- name: pem-dir
hostPath:
path: /var/lib/kubelet/pki
type: Directory
containers:
- name: yurt-hub
image: __yurthub_image__
imagePullPolicy: IfNotPresent
volumeMounts:
- name: hub-dir
mountPath: /var/lib/yurthub
- name: kubernetes
mountPath: /etc/kubernetes
- name: pki
mountPath: /etc/kubernetes/pki
- name: pem-dir
mountPath: /var/lib/kubelet/pki
command:
- yurthub
- --v=2
- --server-addr=__kubernetes_service_addr__
- --node-name=$(NODE_NAME)
- --join-token=__join_token__
Copy link
Member

Choose a reason for hiding this comment

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

Why delete parameter --join-token which generated when converted by yurtctl.

Copy link
Contributor Author

@Windrow Windrow Jun 28, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

join-token is not specified in openyurt/config/yaml-templateyurthub.yaml, as well. I think it is not a must if we do not use hubself mode.

Precisely to say, this is the trick to make yurthub not use hubself mode but kubelet mode.

I0628 15:53:18.792549       1 cert_mgr.go:372] no join token, so use kubelet config to bootstrap hub

I have to admit, it's a workaround for the issue I encountered, but not a proper cure to the root cause.

Copy link
Member

Choose a reason for hiding this comment

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

@Windrow join-token can be generated by yurtctl, and we suggest that use hubself mode with join-token to generate yurthub client certificate that used to connect kube-apiserver. so we need to keep --join-token parameter for yurthub.

livenessProbe:
httpGet:
host: 127.0.0.1
Expand Down