diff --git a/kustomize/internal/commands/edit/add/addpatch.go b/kustomize/internal/commands/edit/add/addpatch.go index a6952484c..adaf8901f 100644 --- a/kustomize/internal/commands/edit/add/addpatch.go +++ b/kustomize/internal/commands/edit/add/addpatch.go @@ -8,10 +8,10 @@ import ( "log" "github.com/spf13/cobra" + "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/edit/patch" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/util" "sigs.k8s.io/kustomize/v3/api/filesys" - "sigs.k8s.io/kustomize/v3/pkg/patch" ) type addPatchOptions struct { diff --git a/pkg/patch/strategicmerge.go b/kustomize/internal/commands/edit/patch/strategicmerge.go similarity index 100% rename from pkg/patch/strategicmerge.go rename to kustomize/internal/commands/edit/patch/strategicmerge.go diff --git a/pkg/patch/strategicmerge_test.go b/kustomize/internal/commands/edit/patch/strategicmerge_test.go similarity index 100% rename from pkg/patch/strategicmerge_test.go rename to kustomize/internal/commands/edit/patch/strategicmerge_test.go diff --git a/kustomize/internal/commands/edit/remove/removepatch.go b/kustomize/internal/commands/edit/remove/removepatch.go index 9a561f3a8..a260c6164 100644 --- a/kustomize/internal/commands/edit/remove/removepatch.go +++ b/kustomize/internal/commands/edit/remove/removepatch.go @@ -8,10 +8,10 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" + "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/edit/patch" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/util" "sigs.k8s.io/kustomize/v3/api/filesys" - "sigs.k8s.io/kustomize/v3/pkg/patch" "sigs.k8s.io/kustomize/v3/pkg/pgmconfig" ) diff --git a/kustomize/internal/commands/edit/remove/removepatch_test.go b/kustomize/internal/commands/edit/remove/removepatch_test.go index 2a48702f0..61e0a0a9e 100644 --- a/kustomize/internal/commands/edit/remove/removepatch_test.go +++ b/kustomize/internal/commands/edit/remove/removepatch_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" + "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/edit/patch" "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils" "sigs.k8s.io/kustomize/v3/api/filesys" - "sigs.k8s.io/kustomize/v3/pkg/patch" ) const (