upstream/k3s
1
0
Fork 0
mirror of https://github.com/k3s-io/k3s.git synced 2026-02-03 20:39:49 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix etcd member promotion

Browse source 
The `continue` was incorrectly changed to `return` when converting the
loop to an inline function in 4974fc7c24

Also addresses unnecessary creation of a new kubernetes client every
time the promotion check runs.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
This commit is contained in:
Brad Davidson 2025-09-17 20:53:20 +00:00 committed by Brad Davidson
parent 626178624f
commit bfdcc7bcc8
2 changed files with 51 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
pkg/etcd/etcd.go
View file

@ -57,12 +57,8 @@ import (
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/types"
utilnet "k8s.io/apimachinery/pkg/util/net"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/kubernetes"
nodeHelper "k8s.io/component-helpers/node/util"
nodeUtil "k8s.io/kubernetes/pkg/controller/util/node"
)
const (
@ -1247,12 +1243,6 @@ func (e *ETCD) manageLearners(ctx context.Context) {
return
}
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)
return
}
nodes, err := e.getETCDNodes()
if err != nil {
logrus.Warnf("Failed to list nodes with etcd role: %v", err)
@ -1286,7 +1276,7 @@ func (e *ETCD) manageLearners(ctx context.Context) {
}
}
if node == nil {
return
continue
}
// verify if the member is healthy and set the status
@ -1295,14 +1285,14 @@ func (e *ETCD) manageLearners(ctx context.Context) {
status = StatusUnhealthy
}
if err := e.setEtcdStatusCondition(node, client, member.Name, status, message); err != nil {
if err := e.setEtcdStatusCondition(node, member.Name, status, message); err != nil {
logrus.Errorf("Unable to set etcd status condition %s: %v", member.Name, err)
}
}
for nodeName, node := range nodesMap {
if !nodeIsMember[nodeName] {
if err := e.setEtcdStatusCondition(node, client, nodeName, StatusUnjoined, ""); err != nil {
if err := e.setEtcdStatusCondition(node, nodeName, StatusUnjoined, ""); err != nil {
logrus.Errorf("Unable to set etcd status condition for a node that is not a cluster member %s: %v", nodeName, err)
}
}
@ -1386,7 +1376,7 @@ func (e *ETCD) getETCDStatus(ctx context.Context, url string) (*clientv3.StatusR
return resp, nil
}
func (e *ETCD) setEtcdStatusCondition(node *v1.Node, client kubernetes.Interface, memberName string, memberStatus MemberStatus, message string) error {
func (e *ETCD) setEtcdStatusCondition(node *v1.Node, memberName string, memberStatus MemberStatus, message string) error {
var newCondition v1.NodeCondition
switch memberStatus {
case StatusLearner:
@ -1426,7 +1416,7 @@ func (e *ETCD) setEtcdStatusCondition(node *v1.Node, client kubernetes.Interface
newCondition.Message = message
}
if find, condition := nodeUtil.GetNodeCondition(&node.Status, etcdStatusType); find >= 0 {
if find, condition := util.GetNodeCondition(&node.Status, etcdStatusType); find >= 0 {
// if the condition is not changing, we only want to update the last heartbeat time
if condition.Status == newCondition.Status && condition.Reason == newCondition.Reason && condition.Message == newCondition.Message {
@ -1438,21 +1428,18 @@ func (e *ETCD) setEtcdStatusCondition(node *v1.Node, client kubernetes.Interface
return nil
}
condition.LastHeartbeatTime = metav1.Now()
return nodeHelper.SetNodeCondition(client, types.NodeName(node.Name), *condition)
return util.SetNodeCondition(e.config.Runtime.Core, node.Name, *condition)
}
logrus.Debugf("Node %s is changing etcd status condition", memberName)
condition = &newCondition
condition.LastHeartbeatTime = metav1.Now()
condition.LastTransitionTime = metav1.Now()
return nodeHelper.SetNodeCondition(client, types.NodeName(node.Name), *condition)
return util.SetNodeCondition(e.config.Runtime.Core, node.Name, *condition)
}
logrus.Infof("Adding node %s etcd status condition", memberName)
newCondition.LastHeartbeatTime = metav1.Now()
newCondition.LastTransitionTime = metav1.Now()
return nodeHelper.SetNodeCondition(client, types.NodeName(node.Name), newCondition)
return util.SetNodeCondition(e.config.Runtime.Core, node.Name, newCondition)
}
// getLearnerProgress returns the stored learnerProgress struct as retrieved from etcd

43
pkg/util/condition.go Normal file
View file

@ -0,0 +1,43 @@
package util
import (
"encoding/json"
"time"
"github.com/k3s-io/k3s/pkg/daemons/config"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
)
// GetNodeCondition extracts the provided condition from the given status and returns that.
// Returns nil and -1 if the condition is not present, and the index of the located condition.
func GetNodeCondition(status *corev1.NodeStatus, conditionType corev1.NodeConditionType) (int, *corev1.NodeCondition) {
if status == nil {
return -1, nil
}
for i := range status.Conditions {
if status.Conditions[i].Type == conditionType {
return i, &status.Conditions[i]
}
}
return -1, nil
}
// SetNodeCondition updates specific node condition with patch operation.
func SetNodeCondition(core config.CoreFactory, nodeName string, condition corev1.NodeCondition) error {
if core == nil {
return ErrCoreNotReady
}
condition.LastHeartbeatTime = metav1.NewTime(time.Now())
patch, err := json.Marshal(map[string]interface{}{
"status": map[string]interface{}{
"conditions": []corev1.NodeCondition{condition},
},
})
if err != nil {
return err
}
_, err = core.Core().V1().Node().Patch(nodeName, types.StrategicMergePatchType, patch, "status")
return err
}