Skip to content

fix(gitops-engine): fix nil pointer dereference error in removeWebookMutation() #27749

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

Open
peikk0 wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −4
Open

fix(gitops-engine): fix nil pointer dereference error in removeWebookMutation() #27749

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
8 changes: 4 additions & 4 deletions gitops-engine/pkg/diff/diff.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,14 +288,14 @@ func removeWebhookMutation(predictedLive, live *unstructured.Unstructured, gvkPa
// Apply the predicted live state to the live state to get a diff without mutation webhook fields
typedPredictedLive, err = typedLive.Merge(typedPredictedLive)

// After applying the predicted live to live state, this would cause any removed fields to be restored.
// We need to re-remove these from predicted live.
typedPredictedLive = typedPredictedLive.RemoveItems(comparison.Removed)

if err != nil {
return nil, fmt.Errorf("error applying predicted live to live state: %w", err)
}

// After applying the predicted live to live state, this would cause any removed fields to be restored.
// We need to re-remove these from predicted live.
typedPredictedLive = typedPredictedLive.RemoveItems(comparison.Removed)

plu := typedPredictedLive.AsValue().Unstructured()
pl, ok := plu.(map[string]any)
if !ok {
Expand Down
Loading