diff --git a/cmd/kyaml/.golangci.yml b/cmd/config/.golangci.yml similarity index 100% rename from cmd/kyaml/.golangci.yml rename to cmd/config/.golangci.yml diff --git a/cmd/kyaml/LICENSE_TEMPLATE b/cmd/config/LICENSE_TEMPLATE similarity index 100% rename from cmd/kyaml/LICENSE_TEMPLATE rename to cmd/config/LICENSE_TEMPLATE diff --git a/cmd/kyaml/Makefile b/cmd/config/Makefile similarity index 100% rename from cmd/kyaml/Makefile rename to cmd/config/Makefile diff --git a/cmd/kyaml/README.md b/cmd/config/README.md similarity index 93% rename from cmd/kyaml/README.md rename to cmd/config/README.md index f81711fe0..b5984c93b 100644 --- a/cmd/kyaml/README.md +++ b/cmd/config/README.md @@ -1,4 +1,4 @@ -# cmd/kyaml +# cmd/config This package exists to expose kyaml filters directly as cli commands for the purposes of development of the kyaml package and as a reference implementation for using the libraries. diff --git a/cmd/kyaml/cmd/cat.go b/cmd/config/cmd/cat.go similarity index 100% rename from cmd/kyaml/cmd/cat.go rename to cmd/config/cmd/cat.go diff --git a/cmd/kyaml/cmd/cat_test.go b/cmd/config/cmd/cat_test.go similarity index 99% rename from cmd/kyaml/cmd/cat_test.go rename to cmd/config/cmd/cat_test.go index 36a9133f6..4fad23229 100644 --- a/cmd/kyaml/cmd/cat_test.go +++ b/cmd/config/cmd/cat_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "sigs.k8s.io/kustomize/cmd/kyaml/cmd" + "sigs.k8s.io/kustomize/cmd/config/cmd" ) // TODO(pwittrock): write tests for reading / writing ResourceLists diff --git a/cmd/kyaml/cmd/cmdwrap.go b/cmd/config/cmd/cmdwrap.go similarity index 100% rename from cmd/kyaml/cmd/cmdwrap.go rename to cmd/config/cmd/cmdwrap.go diff --git a/cmd/kyaml/cmd/cmdwrap_test.go b/cmd/config/cmd/cmdwrap_test.go similarity index 100% rename from cmd/kyaml/cmd/cmdwrap_test.go rename to cmd/config/cmd/cmdwrap_test.go diff --git a/cmd/kyaml/cmd/cmdxargs.go b/cmd/config/cmd/cmdxargs.go similarity index 100% rename from cmd/kyaml/cmd/cmdxargs.go rename to cmd/config/cmd/cmdxargs.go diff --git a/cmd/kyaml/cmd/cmdxargs_test.go b/cmd/config/cmd/cmdxargs_test.go similarity index 98% rename from cmd/kyaml/cmd/cmdxargs_test.go rename to cmd/config/cmd/cmdxargs_test.go index f20265d3a..08cd9e7cd 100644 --- a/cmd/kyaml/cmd/cmdxargs_test.go +++ b/cmd/config/cmd/cmdxargs_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "sigs.k8s.io/kustomize/cmd/kyaml/cmd" + "sigs.k8s.io/kustomize/cmd/config/cmd" ) const ( diff --git a/cmd/kyaml/cmd/count.go b/cmd/config/cmd/count.go similarity index 100% rename from cmd/kyaml/cmd/count.go rename to cmd/config/cmd/count.go diff --git a/cmd/kyaml/cmd/count_test.go b/cmd/config/cmd/count_test.go similarity index 96% rename from cmd/kyaml/cmd/count_test.go rename to cmd/config/cmd/count_test.go index ad0e7cc3f..9ee08448e 100644 --- a/cmd/kyaml/cmd/count_test.go +++ b/cmd/config/cmd/count_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "sigs.k8s.io/kustomize/cmd/kyaml/cmd" + "sigs.k8s.io/kustomize/cmd/config/cmd" ) func TestCountCommand_files(t *testing.T) { diff --git a/cmd/kyaml/cmd/fmt.go b/cmd/config/cmd/fmt.go similarity index 100% rename from cmd/kyaml/cmd/fmt.go rename to cmd/config/cmd/fmt.go diff --git a/cmd/kyaml/cmd/fmt_test.go b/cmd/config/cmd/fmt_test.go similarity index 98% rename from cmd/kyaml/cmd/fmt_test.go rename to cmd/config/cmd/fmt_test.go index 4be7327a7..5ad7f82d4 100644 --- a/cmd/kyaml/cmd/fmt_test.go +++ b/cmd/config/cmd/fmt_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "sigs.k8s.io/kustomize/cmd/kyaml/cmd" + "sigs.k8s.io/kustomize/cmd/config/cmd" "sigs.k8s.io/kustomize/kyaml/kio/filters/testyaml" ) diff --git a/cmd/kyaml/cmd/grep.go b/cmd/config/cmd/grep.go similarity index 100% rename from cmd/kyaml/cmd/grep.go rename to cmd/config/cmd/grep.go diff --git a/cmd/kyaml/cmd/grep_test.go b/cmd/config/cmd/grep_test.go similarity index 99% rename from cmd/kyaml/cmd/grep_test.go rename to cmd/config/cmd/grep_test.go index eb59f94ee..78a6cce5c 100644 --- a/cmd/kyaml/cmd/grep_test.go +++ b/cmd/config/cmd/grep_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "sigs.k8s.io/kustomize/cmd/kyaml/cmd" + "sigs.k8s.io/kustomize/cmd/config/cmd" ) // TestGrepCommand_files verifies grep reads the files and filters them diff --git a/cmd/kyaml/cmd/merge.go b/cmd/config/cmd/merge.go similarity index 100% rename from cmd/kyaml/cmd/merge.go rename to cmd/config/cmd/merge.go diff --git a/cmd/kyaml/cmd/run-fns.go b/cmd/config/cmd/run-fns.go similarity index 100% rename from cmd/kyaml/cmd/run-fns.go rename to cmd/config/cmd/run-fns.go diff --git a/cmd/kyaml/cmd/test/override.yaml b/cmd/config/cmd/test/override.yaml similarity index 100% rename from cmd/kyaml/cmd/test/override.yaml rename to cmd/config/cmd/test/override.yaml diff --git a/cmd/kyaml/cmd/test/test.sh b/cmd/config/cmd/test/test.sh similarity index 100% rename from cmd/kyaml/cmd/test/test.sh rename to cmd/config/cmd/test/test.sh diff --git a/cmd/kyaml/cmd/tree.go b/cmd/config/cmd/tree.go similarity index 100% rename from cmd/kyaml/cmd/tree.go rename to cmd/config/cmd/tree.go diff --git a/cmd/kyaml/cmd/tree_test.go b/cmd/config/cmd/tree_test.go similarity index 99% rename from cmd/kyaml/cmd/tree_test.go rename to cmd/config/cmd/tree_test.go index db2d29e76..3ea10c792 100644 --- a/cmd/kyaml/cmd/tree_test.go +++ b/cmd/config/cmd/tree_test.go @@ -12,7 +12,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "sigs.k8s.io/kustomize/cmd/kyaml/cmd" + "sigs.k8s.io/kustomize/cmd/config/cmd" ) // TestCmd_files verifies fmt reads the files and filters them diff --git a/cmd/kyaml/cmd/util.go b/cmd/config/cmd/util.go similarity index 100% rename from cmd/kyaml/cmd/util.go rename to cmd/config/cmd/util.go diff --git a/cmd/kyaml/go.mod b/cmd/config/go.mod similarity index 90% rename from cmd/kyaml/go.mod rename to cmd/config/go.mod index a49569630..eb91ebd38 100644 --- a/cmd/kyaml/go.mod +++ b/cmd/config/go.mod @@ -1,4 +1,4 @@ -module sigs.k8s.io/kustomize/cmd/kyaml +module sigs.k8s.io/kustomize/cmd/config go 1.13 diff --git a/cmd/kyaml/go.sum b/cmd/config/go.sum similarity index 99% rename from cmd/kyaml/go.sum rename to cmd/config/go.sum index 7e015cc54..b75c99ecd 100644 --- a/cmd/kyaml/go.sum +++ b/cmd/config/go.sum @@ -142,5 +142,6 @@ k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= k8s.io/utils v0.0.0-20191030222137-2b95a09bc58d/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= +sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0= sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= diff --git a/cmd/kyaml/inpututil/inpututil.go b/cmd/config/inpututil/inpututil.go similarity index 100% rename from cmd/kyaml/inpututil/inpututil.go rename to cmd/config/inpututil/inpututil.go diff --git a/cmd/kyaml/main.go b/cmd/config/main.go similarity index 96% rename from cmd/kyaml/main.go rename to cmd/config/main.go index cbd599613..b805f99de 100644 --- a/cmd/kyaml/main.go +++ b/cmd/config/main.go @@ -7,7 +7,7 @@ import ( "os" "github.com/spf13/cobra" - "sigs.k8s.io/kustomize/cmd/kyaml/cmd" + "sigs.k8s.io/kustomize/cmd/config/cmd" "sigs.k8s.io/kustomize/kyaml/yaml/merge2" "sigs.k8s.io/kustomize/kyaml/yaml/merge3" ) diff --git a/travis/kyaml-pre-commit.sh b/travis/kyaml-pre-commit.sh index e76566f86..8c6462833 100755 --- a/travis/kyaml-pre-commit.sh +++ b/travis/kyaml-pre-commit.sh @@ -4,5 +4,5 @@ set -e cd kyaml make all -cd ../cmd/kyaml +cd ../cmd/config make all \ No newline at end of file diff --git a/travis/verify-deps.sh b/travis/verify-deps.sh index f62b6357d..702815cab 100755 --- a/travis/verify-deps.sh +++ b/travis/verify-deps.sh @@ -2,7 +2,7 @@ set -o xtrace -for dir in api kustomize pseudo kyaml plugin cmd/kyaml +for dir in api kustomize pseudo kyaml plugin cmd/config do for item in api apimachinery client-go do