github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Handle nil pointer when runtime core is not ready in etcd 

Signed-off-by: Vitor <vitor.savian@suse.com>
pull/8894/head
Vitor Savian 2023-11-16 20:58:42 -03:00 committed by GitHub
parent 6c544a4679
commit e53c189587
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkg/etcd/etcd.go
View File

@ -1056,39 +1056,36 @@ func (e *ETCD) manageLearners(ctx context.Context) {
continue
}
nodes, err := e.getETCDNodes()
if err != nil {
logrus.Errorf("Error while listing nodes with etcd status: %v", err)
continue
}
client, err := util.GetClientSet(e.config.Runtime.KubeConfigSupervisor)
if err != nil {
logrus.Errorf("Failed to get k8s client for patch node status condition: %v", err)
continue
}
nodes, err := e.getETCDNodes()
if err != nil {
logrus.Warnf("Failed to list nodes with etcd role: %v", err)
}
for _, member := range members.Members {
if member.IsLearner {
if err := e.trackLearnerProgress(ctx, progress, member); err != nil {
logrus.Errorf("Failed to track learner progress towards promotion: %v", err)
}
for _, node := range nodes.Items {
for _, node := range nodes {
if strings.HasPrefix(member.Name, node.Name+"-") {
_, _, err := e.setEtcdStatusCondition(&node, client.CoreV1(), member.Name, false)
_, _, err := e.setEtcdStatusCondition(node, client.CoreV1(), member.Name, false)
if err != nil {
logrus.Errorf("Unable to set etcd status condition %s: %v", member.Name, err)
}
}
}
break
}
for _, node := range nodes.Items {
for _, node := range nodes {
if strings.HasPrefix(member.Name, node.Name+"-") {
_, _, err := e.setEtcdStatusCondition(&node, client.CoreV1(), member.Name, true)
_, _, err := e.setEtcdStatusCondition(node, client.CoreV1(), member.Name, true)
if err != nil {
logrus.Errorf("Unable to set etcd status condition %s: %v", member.Name, err)
}
@ -1098,11 +1095,15 @@ func (e *ETCD) manageLearners(ctx context.Context) {
}
}
func (e *ETCD) getETCDNodes() (*v1.NodeList, error) {
func (e *ETCD) getETCDNodes() ([]*v1.Node, error) {
if e.config.Runtime.Core == nil {
return nil, errors.New("runtime core not ready")
}
nodes := e.config.Runtime.Core.Core().V1().Node()
etcdSelector := labels.Set{util.ETCDRoleLabelKey: "true"}
return nodes.List(metav1.ListOptions{LabelSelector: etcdSelector.String()})
return nodes.Cache().List(etcdSelector.AsSelector())
}
// trackLearnerProcess attempts to promote a learner. If it cannot be promoted, progress through the raft index is tracked.