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

Jump to bottom

fix: node condition will be overridden #555

Merged
merged 1 commit into from
Jan 22, 2024
Merged

fix: node condition will be overridden #555

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
2 changes: 1 addition & 1 deletion pkg/k8s/k8s.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@
}

patch := []byte(fmt.Sprintf(`{"status":{"conditions":%s}}`, raw))
return k.client.Status().Patch(context.Background(), node, client.RawPatch(k8stypes.MergePatchType, patch))
return k.client.Status().Patch(context.Background(), node, client.RawPatch(k8stypes.StrategicMergePatchType, patch))

Check warning on line 246 in pkg/k8s/k8s.go

View check run for this annotation

Codecov / codecov/patch

pkg/k8s/k8s.go#L246 

Added line #L246 was not covered by tests
}

func (k *k8s) PatchNodeAnnotations(anno map[string]string) error {
Expand Down
Loading