diff --git a/pkg/kubectl/cmd/apply/apply.go b/pkg/kubectl/cmd/apply/apply.go index 4f1e3d6d040..08919f23b2b 100644 --- a/pkg/kubectl/cmd/apply/apply.go +++ b/pkg/kubectl/cmd/apply/apply.go @@ -389,13 +389,14 @@ func (o *ApplyOptions) Run() error { return cmdutil.AddSourceToErr("creating", info.Source, err) } info.Refresh(obj, true) - metadata, err := meta.Accessor(info.Object) - if err != nil { - return err - } - visitedUids.Insert(string(metadata.GetUID())) } + metadata, err := meta.Accessor(info.Object) + if err != nil { + return err + } + visitedUids.Insert(string(metadata.GetUID())) + count++ if printObject { @@ -410,12 +411,13 @@ func (o *ApplyOptions) Run() error { return printer.PrintObj(info.Object, o.Out) } - if !o.DryRun { - metadata, err := meta.Accessor(info.Object) - if err != nil { - return err - } + metadata, err := meta.Accessor(info.Object) + if err != nil { + return err + } + visitedUids.Insert(string(metadata.GetUID())) + if !o.DryRun { annotationMap := metadata.GetAnnotations() if _, ok := annotationMap[corev1.LastAppliedConfigAnnotation]; !ok { fmt.Fprintf(o.ErrOut, warningNoLastAppliedConfigAnnotation, o.cmdBaseName) @@ -443,8 +445,6 @@ func (o *ApplyOptions) Run() error { info.Refresh(patchedObject, true) - visitedUids.Insert(string(metadata.GetUID())) - if string(patchBytes) == "{}" && !printObject { count++