mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-09-20 09:33:52 +00:00
move pkg/util/node to component-helpers/node/util (#105347)
Signed-off-by: Neha Lohia <nehapithadiya444@gmail.com>
This commit is contained in:
Neha Lohia
GitHub
@@ -18,7 +18,6 @@ package node
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"net"
|
||||
"os"
|
||||
@@ -28,13 +27,9 @@ import (
|
||||
"k8s.io/klog/v2"
|
||||
|
||||
v1 "k8s.io/api/core/v1"
|
||||
"k8s.io/apimachinery/pkg/api/equality"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/types"
|
||||
"k8s.io/apimachinery/pkg/util/strategicpatch"
|
||||
"k8s.io/apimachinery/pkg/util/wait"
|
||||
clientset "k8s.io/client-go/kubernetes"
|
||||
v1core "k8s.io/client-go/kubernetes/typed/core/v1"
|
||||
netutils "k8s.io/utils/net"
|
||||
)
|
||||
|
||||
@@ -169,189 +164,3 @@ func GetNodeIP(client clientset.Interface, name string) net.IP {
|
||||
}
|
||||
return nodeIP
|
||||
}
|
||||
|
||||
type nodeForConditionPatch struct {
|
||||
Status nodeStatusForPatch `json:"status"`
|
||||
}
|
||||
|
||||
type nodeStatusForPatch struct {
|
||||
Conditions []v1.NodeCondition `json:"conditions"`
|
||||
}
|
||||
|
||||
// SetNodeCondition updates specific node condition with patch operation.
|
||||
func SetNodeCondition(c clientset.Interface, node types.NodeName, condition v1.NodeCondition) error {
|
||||
generatePatch := func(condition v1.NodeCondition) ([]byte, error) {
|
||||
patch := nodeForConditionPatch{
|
||||
Status: nodeStatusForPatch{
|
||||
Conditions: []v1.NodeCondition{
|
||||
condition,
|
||||
},
|
||||
},
|
||||
}
|
||||
patchBytes, err := json.Marshal(&patch)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return patchBytes, nil
|
||||
}
|
||||
condition.LastHeartbeatTime = metav1.NewTime(time.Now())
|
||||
patch, err := generatePatch(condition)
|
||||
if err != nil {
|
||||
return nil
|
||||
}
|
||||
_, err = c.CoreV1().Nodes().PatchStatus(context.TODO(), string(node), patch)
|
||||
return err
|
||||
}
|
||||
|
||||
type nodeForCIDRMergePatch struct {
|
||||
Spec nodeSpecForMergePatch `json:"spec"`
|
||||
}
|
||||
|
||||
type nodeSpecForMergePatch struct {
|
||||
PodCIDR string `json:"podCIDR"`
|
||||
PodCIDRs []string `json:"podCIDRs,omitempty"`
|
||||
}
|
||||
|
||||
// PatchNodeCIDR patches the specified node's CIDR to the given value.
|
||||
func PatchNodeCIDR(c clientset.Interface, node types.NodeName, cidr string) error {
|
||||
patch := nodeForCIDRMergePatch{
|
||||
Spec: nodeSpecForMergePatch{
|
||||
PodCIDR: cidr,
|
||||
},
|
||||
}
|
||||
patchBytes, err := json.Marshal(&patch)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to json.Marshal CIDR: %v", err)
|
||||
}
|
||||
|
||||
if _, err := c.CoreV1().Nodes().Patch(context.TODO(), string(node), types.StrategicMergePatchType, patchBytes, metav1.PatchOptions{}); err != nil {
|
||||
return fmt.Errorf("failed to patch node CIDR: %v", err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// PatchNodeCIDRs patches the specified node.CIDR=cidrs[0] and node.CIDRs to the given value.
|
||||
func PatchNodeCIDRs(c clientset.Interface, node types.NodeName, cidrs []string) error {
|
||||
// set the pod cidrs list and set the old pod cidr field
|
||||
patch := nodeForCIDRMergePatch{
|
||||
Spec: nodeSpecForMergePatch{
|
||||
PodCIDR: cidrs[0],
|
||||
PodCIDRs: cidrs,
|
||||
},
|
||||
}
|
||||
|
||||
patchBytes, err := json.Marshal(&patch)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to json.Marshal CIDR: %v", err)
|
||||
}
|
||||
klog.V(4).Infof("cidrs patch bytes are:%s", string(patchBytes))
|
||||
if _, err := c.CoreV1().Nodes().Patch(context.TODO(), string(node), types.StrategicMergePatchType, patchBytes, metav1.PatchOptions{}); err != nil {
|
||||
return fmt.Errorf("failed to patch node CIDR: %v", err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// PatchNodeStatus patches node status along with objectmetadata
|
||||
func PatchNodeStatus(c v1core.CoreV1Interface, nodeName types.NodeName, oldNode *v1.Node, newNode *v1.Node) (*v1.Node, []byte, error) {
|
||||
patchBytes, err := preparePatchBytesforNodeStatus(nodeName, oldNode, newNode)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
|
||||
updatedNode, err := c.Nodes().Patch(context.TODO(), string(nodeName), types.StrategicMergePatchType, patchBytes, metav1.PatchOptions{}, "status")
|
||||
if err != nil {
|
||||
return nil, nil, fmt.Errorf("failed to patch status %q for node %q: %v", patchBytes, nodeName, err)
|
||||
}
|
||||
return updatedNode, patchBytes, nil
|
||||
}
|
||||
|
||||
// preparePatchBytesforNodeStatus updates the node objectmetadata and status
|
||||
func preparePatchBytesforNodeStatus(nodeName types.NodeName, oldNode *v1.Node, newNode *v1.Node) ([]byte, error) {
|
||||
oldData, err := json.Marshal(oldNode)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to Marshal oldData for node %q: %v", nodeName, err)
|
||||
}
|
||||
|
||||
// NodeStatus.Addresses is incorrectly annotated as patchStrategy=merge, which
|
||||
// will cause strategicpatch.CreateTwoWayMergePatch to create an incorrect patch
|
||||
// if it changed.
|
||||
manuallyPatchAddresses := (len(oldNode.Status.Addresses) > 0) && !equality.Semantic.DeepEqual(oldNode.Status.Addresses, newNode.Status.Addresses)
|
||||
|
||||
// Reset spec to make sure only patch for Status or ObjectMeta is generated.
|
||||
// Note that we don't reset ObjectMeta here, because:
|
||||
// 1. This aligns with Nodes().UpdateStatus().
|
||||
// 2. Some component does use this to update node annotations.
|
||||
diffNode := newNode.DeepCopy()
|
||||
diffNode.Spec = oldNode.Spec
|
||||
if manuallyPatchAddresses {
|
||||
diffNode.Status.Addresses = oldNode.Status.Addresses
|
||||
}
|
||||
newData, err := json.Marshal(diffNode)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to Marshal newData for node %q: %v", nodeName, err)
|
||||
}
|
||||
|
||||
patchBytes, err := strategicpatch.CreateTwoWayMergePatch(oldData, newData, v1.Node{})
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to CreateTwoWayMergePatch for node %q: %v", nodeName, err)
|
||||
}
|
||||
if manuallyPatchAddresses {
|
||||
patchBytes, err = fixupPatchForNodeStatusAddresses(patchBytes, newNode.Status.Addresses)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to fix up NodeAddresses in patch for node %q: %v", nodeName, err)
|
||||
}
|
||||
}
|
||||
|
||||
return patchBytes, nil
|
||||
}
|
||||
|
||||
// fixupPatchForNodeStatusAddresses adds a replace-strategy patch for Status.Addresses to
|
||||
// the existing patch
|
||||
func fixupPatchForNodeStatusAddresses(patchBytes []byte, addresses []v1.NodeAddress) ([]byte, error) {
|
||||
// Given patchBytes='{"status": {"conditions": [ ... ], "phase": ...}}' and
|
||||
// addresses=[{"type": "InternalIP", "address": "10.0.0.1"}], we need to generate:
|
||||
//
|
||||
// {
|
||||
// "status": {
|
||||
// "conditions": [ ... ],
|
||||
// "phase": ...,
|
||||
// "addresses": [
|
||||
// {
|
||||
// "type": "InternalIP",
|
||||
// "address": "10.0.0.1"
|
||||
// },
|
||||
// {
|
||||
// "$patch": "replace"
|
||||
// }
|
||||
// ]
|
||||
// }
|
||||
// }
|
||||
|
||||
var patchMap map[string]interface{}
|
||||
if err := json.Unmarshal(patchBytes, &patchMap); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
addrBytes, err := json.Marshal(addresses)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
var addrArray []interface{}
|
||||
if err := json.Unmarshal(addrBytes, &addrArray); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
addrArray = append(addrArray, map[string]interface{}{"$patch": "replace"})
|
||||
|
||||
status := patchMap["status"]
|
||||
if status == nil {
|
||||
status = map[string]interface{}{}
|
||||
patchMap["status"] = status
|
||||
}
|
||||
statusMap, ok := status.(map[string]interface{})
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("unexpected data in patch")
|
||||
}
|
||||
statusMap["addresses"] = addrArray
|
||||
|
||||
return json.Marshal(patchMap)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user