Skip to content

Commit

Permalink
chore: remove duplicate scheme import (#580)
Browse files Browse the repository at this point in the history
Signed-off-by: Paul Gier <paul.gier@datastax.com>
  • Loading branch information
pgier authored Jun 25, 2024
1 parent 0be58f2 commit 4386ff4
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions pkg/diff/diff.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import (
"github.com/argoproj/gitops-engine/pkg/sync/resource"
jsonutil "github.com/argoproj/gitops-engine/pkg/utils/json"
gescheme "github.com/argoproj/gitops-engine/pkg/utils/kube/scheme"
kubescheme "github.com/argoproj/gitops-engine/pkg/utils/kube/scheme"
)

const (
Expand Down Expand Up @@ -487,7 +486,7 @@ func generateSchemeDefaultPatch(kubeObj runtime.Object) ([]byte, error) {

// 1) Call scheme defaulter functions on a clone of our k8s resource object
patched := kubeObj.DeepCopyObject()
kubescheme.Scheme.Default(patched)
gescheme.Scheme.Default(patched)

// 2) Compare the original object (pre-defaulter funcs) with patched object (post-default funcs),
// and generate a patch that can be applied against the original
Expand Down

0 comments on commit 4386ff4

Please sign in to comment.