Skip to content

Commit 5f42d01

Browse files
authored
Merge pull request kubernetes-sigs#966 from k8s-infra-cherrypick-robot/cherry-pick-954-to-release-0.5
[release-0.5] Fix loading resource checked status when created
2 parents 53f06c7 + 26d626f commit 5f42d01

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

pkg/kwokctl/snapshot/load.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -311,19 +311,19 @@ func (l *Loader) apply(ctx context.Context, obj *unstructured.Unstructured) *uns
311311
return nil
312312
}
313313
logger.Debug("Updated")
314-
} else {
315-
logger.Debug("Created")
316-
}
317314

318-
if newObj != nil {
319-
status, ok, _ := unstructured.NestedFieldNoCopy(obj.Object, "status")
320-
if ok && !reflect.DeepEqual(newObj.Object["status"], status) {
321-
newObj.Object["status"] = status
322-
newObj, err = ri.UpdateStatus(ctx, newObj, metav1.UpdateOptions{FieldValidation: "Ignore"})
323-
if err != nil {
324-
logger.Error("Failed to update status", err)
315+
if newObj != nil {
316+
status, ok, _ := unstructured.NestedFieldNoCopy(obj.Object, "status")
317+
if ok && !reflect.DeepEqual(newObj.Object["status"], status) {
318+
newObj.Object["status"] = status
319+
newObj, err = ri.UpdateStatus(ctx, newObj, metav1.UpdateOptions{FieldValidation: "Ignore"})
320+
if err != nil {
321+
logger.Error("Failed to update resource status", err)
322+
}
325323
}
326324
}
325+
} else {
326+
logger.Debug("Created")
327327
}
328328

329329
l.successCounter++

0 commit comments

Comments
 (0)