Skip to content

e2e: use PATCH instead of UPDATE for node labeling #3020

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

Closed
tariq1890 wants to merge 1 commit into from
Closed

e2e: use PATCH instead of UPDATE for node labeling #3020

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 16 additions & 25 deletions tests/e2e/helpers/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,13 @@ package helpers

import (
"context"
"encoding/json"
"fmt"

corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/kubernetes"
)

Expand All @@ -37,38 +39,27 @@ func NewNodeClient(client kubernetes.Interface) *NodeClient {
}

func (h *NodeClient) LabelNode(ctx context.Context, nodeName, key, value string) error {
node, err := h.client.CoreV1().Nodes().Get(ctx, nodeName, metav1.GetOptions{})
if err != nil {
return fmt.Errorf("failed to get node: %w", err)
}

if node.Labels == nil {
node.Labels = make(map[string]string)
}

node.Labels[key] = value

_, err = h.client.CoreV1().Nodes().Update(ctx, node, metav1.UpdateOptions{})
if err != nil {
return fmt.Errorf("failed to update node: %w", err)
}

return nil
return h.patchNodeLabels(ctx, nodeName, map[string]any{key: value})
}

func (h *NodeClient) UnlabelNode(ctx context.Context, nodeName, key string) error {
node, err := h.client.CoreV1().Nodes().Get(ctx, nodeName, metav1.GetOptions{})
if err != nil {
return fmt.Errorf("failed to get node: %w", err)
}
// A null value in a JSON merge patch deletes the key.
return h.patchNodeLabels(ctx, nodeName, map[string]any{key: nil})
}

if node.Labels != nil {
delete(node.Labels, key)
func (h *NodeClient) patchNodeLabels(ctx context.Context, nodeName string, nodeLabels map[string]any) error {
patch, err := json.Marshal(map[string]any{
"metadata": map[string]any{
"labels": nodeLabels,
},
})
if err != nil {
return fmt.Errorf("failed to build label patch: %w", err)
}

_, err = h.client.CoreV1().Nodes().Update(ctx, node, metav1.UpdateOptions{})
_, err = h.client.CoreV1().Nodes().Patch(ctx, nodeName, types.MergePatchType, patch, metav1.PatchOptions{})
Comment on lines +50 to +60

@devin-ai-integration devin-ai-integration Bot Oct 6, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

🔍 Node label patches lack regression coverage

The new patch behavior has no test for adding or removing one label without changing others. AGENTS.md requires coverage for new behavior; add a focused helper test.

Devin Review

Was this helpful? React with 👍 or 👎 to provide feedback.

if err != nil {
return fmt.Errorf("failed to update node: %w", err)
return fmt.Errorf("failed to patch node: %w", err)
}

return nil
Expand Down
Loading