diff --git a/build/vendor_kustomize.sh b/build/vendor_kustomize.sh index d28099a23..2b484bea0 100755 --- a/build/vendor_kustomize.sh +++ b/build/vendor_kustomize.sh @@ -72,14 +72,14 @@ function getKustomizeDeps { function updateK8s { # Copy k8sdeps from Kustomize to kubectl mkdir -p $GOPATH/src/k8s.io/kubernetes/pkg/kubectl/kustomize - cp -r $GOPATH/src/sigs.k8s.io/kustomize/internal/k8sdeps \ + cp -r $GOPATH/src/sigs.k8s.io/kustomize/k8sdeps \ $GOPATH/src/k8s.io/kubernetes/pkg/kubectl/kustomize/k8sdeps # Change import path of k8sdeps find $GOPATH/src/k8s.io/kubernetes/pkg/kubectl/kustomize/k8sdeps \ -type f -name "*.go" | \ xargs sed -i \ - 's!sigs.k8s.io/kustomize/internal/k8sdeps!k8s.io/kubernetes/pkg/kubectl/kustomize/k8sdeps!' + 's!sigs.k8s.io/kustomize/k8sdeps!k8s.io/kubernetes/pkg/kubectl/kustomize/k8sdeps!' # Add kustomize command to kubectl diff --git a/internal/k8sdeps/configmapandsecret/configmapfactory.go b/k8sdeps/configmapandsecret/configmapfactory.go similarity index 100% rename from internal/k8sdeps/configmapandsecret/configmapfactory.go rename to k8sdeps/configmapandsecret/configmapfactory.go diff --git a/internal/k8sdeps/configmapandsecret/configmapfactory_test.go b/k8sdeps/configmapandsecret/configmapfactory_test.go similarity index 100% rename from internal/k8sdeps/configmapandsecret/configmapfactory_test.go rename to k8sdeps/configmapandsecret/configmapfactory_test.go diff --git a/internal/k8sdeps/configmapandsecret/kv.go b/k8sdeps/configmapandsecret/kv.go similarity index 100% rename from internal/k8sdeps/configmapandsecret/kv.go rename to k8sdeps/configmapandsecret/kv.go diff --git a/internal/k8sdeps/configmapandsecret/kv_test.go b/k8sdeps/configmapandsecret/kv_test.go similarity index 100% rename from internal/k8sdeps/configmapandsecret/kv_test.go rename to k8sdeps/configmapandsecret/kv_test.go diff --git a/internal/k8sdeps/configmapandsecret/secretfactory.go b/k8sdeps/configmapandsecret/secretfactory.go similarity index 100% rename from internal/k8sdeps/configmapandsecret/secretfactory.go rename to k8sdeps/configmapandsecret/secretfactory.go diff --git a/internal/k8sdeps/doc.go b/k8sdeps/doc.go similarity index 100% rename from internal/k8sdeps/doc.go rename to k8sdeps/doc.go diff --git a/internal/k8sdeps/factory.go b/k8sdeps/factory.go similarity index 85% rename from internal/k8sdeps/factory.go rename to k8sdeps/factory.go index 42edd935e..a422b25a4 100644 --- a/internal/k8sdeps/factory.go +++ b/k8sdeps/factory.go @@ -18,9 +18,9 @@ limitations under the License. package k8sdeps import ( - "sigs.k8s.io/kustomize/internal/k8sdeps/kunstruct" - "sigs.k8s.io/kustomize/internal/k8sdeps/transformer" - "sigs.k8s.io/kustomize/internal/k8sdeps/validator" + "sigs.k8s.io/kustomize/k8sdeps/kunstruct" + "sigs.k8s.io/kustomize/k8sdeps/transformer" + "sigs.k8s.io/kustomize/k8sdeps/validator" "sigs.k8s.io/kustomize/pkg/factory" ) diff --git a/internal/k8sdeps/kunstruct/factory.go b/k8sdeps/kunstruct/factory.go similarity index 98% rename from internal/k8sdeps/kunstruct/factory.go rename to k8sdeps/kunstruct/factory.go index b5c7103da..60bbc979a 100644 --- a/internal/k8sdeps/kunstruct/factory.go +++ b/k8sdeps/kunstruct/factory.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/util/yaml" - "sigs.k8s.io/kustomize/internal/k8sdeps/configmapandsecret" + "sigs.k8s.io/kustomize/k8sdeps/configmapandsecret" "sigs.k8s.io/kustomize/pkg/fs" "sigs.k8s.io/kustomize/pkg/ifc" "sigs.k8s.io/kustomize/pkg/types" diff --git a/internal/k8sdeps/kunstruct/factory_test.go b/k8sdeps/kunstruct/factory_test.go similarity index 100% rename from internal/k8sdeps/kunstruct/factory_test.go rename to k8sdeps/kunstruct/factory_test.go diff --git a/internal/k8sdeps/kunstruct/kunstruct.go b/k8sdeps/kunstruct/kunstruct.go similarity index 100% rename from internal/k8sdeps/kunstruct/kunstruct.go rename to k8sdeps/kunstruct/kunstruct.go diff --git a/internal/k8sdeps/kunstruct/kunstruct_test.go b/k8sdeps/kunstruct/kunstruct_test.go similarity index 100% rename from internal/k8sdeps/kunstruct/kunstruct_test.go rename to k8sdeps/kunstruct/kunstruct_test.go diff --git a/internal/k8sdeps/transformer/factory.go b/k8sdeps/transformer/factory.go similarity index 91% rename from internal/k8sdeps/transformer/factory.go rename to k8sdeps/transformer/factory.go index 6863e439a..7388b634d 100644 --- a/internal/k8sdeps/transformer/factory.go +++ b/k8sdeps/transformer/factory.go @@ -18,8 +18,8 @@ limitations under the License. package transformer import ( - "sigs.k8s.io/kustomize/internal/k8sdeps/transformer/hash" - "sigs.k8s.io/kustomize/internal/k8sdeps/transformer/patch" + "sigs.k8s.io/kustomize/k8sdeps/transformer/hash" + "sigs.k8s.io/kustomize/k8sdeps/transformer/patch" "sigs.k8s.io/kustomize/pkg/resource" "sigs.k8s.io/kustomize/pkg/transformers" ) diff --git a/internal/k8sdeps/transformer/hash/hash.go b/k8sdeps/transformer/hash/hash.go similarity index 100% rename from internal/k8sdeps/transformer/hash/hash.go rename to k8sdeps/transformer/hash/hash.go diff --git a/internal/k8sdeps/transformer/hash/hash_test.go b/k8sdeps/transformer/hash/hash_test.go similarity index 100% rename from internal/k8sdeps/transformer/hash/hash_test.go rename to k8sdeps/transformer/hash/hash_test.go diff --git a/internal/k8sdeps/transformer/hash/namehash.go b/k8sdeps/transformer/hash/namehash.go similarity index 100% rename from internal/k8sdeps/transformer/hash/namehash.go rename to k8sdeps/transformer/hash/namehash.go diff --git a/internal/k8sdeps/transformer/hash/namehash_test.go b/k8sdeps/transformer/hash/namehash_test.go similarity index 98% rename from internal/k8sdeps/transformer/hash/namehash_test.go rename to k8sdeps/transformer/hash/namehash_test.go index 57a709a75..f476c14d8 100644 --- a/internal/k8sdeps/transformer/hash/namehash_test.go +++ b/k8sdeps/transformer/hash/namehash_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - "sigs.k8s.io/kustomize/internal/k8sdeps/kunstruct" + "sigs.k8s.io/kustomize/k8sdeps/kunstruct" "sigs.k8s.io/kustomize/pkg/ifc" "sigs.k8s.io/kustomize/pkg/resid" "sigs.k8s.io/kustomize/pkg/resmap" diff --git a/internal/k8sdeps/transformer/patch/patch.go b/k8sdeps/transformer/patch/patch.go similarity index 100% rename from internal/k8sdeps/transformer/patch/patch.go rename to k8sdeps/transformer/patch/patch.go diff --git a/internal/k8sdeps/transformer/patch/patch_test.go b/k8sdeps/transformer/patch/patch_test.go similarity index 99% rename from internal/k8sdeps/transformer/patch/patch_test.go rename to k8sdeps/transformer/patch/patch_test.go index 1b4df2583..d6955a6ee 100644 --- a/internal/k8sdeps/transformer/patch/patch_test.go +++ b/k8sdeps/transformer/patch/patch_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/internal/k8sdeps/kunstruct" + "sigs.k8s.io/kustomize/k8sdeps/kunstruct" "sigs.k8s.io/kustomize/pkg/gvk" "sigs.k8s.io/kustomize/pkg/resid" "sigs.k8s.io/kustomize/pkg/resmap" diff --git a/internal/k8sdeps/transformer/patch/patchconflictdetector.go b/k8sdeps/transformer/patch/patchconflictdetector.go similarity index 100% rename from internal/k8sdeps/transformer/patch/patchconflictdetector.go rename to k8sdeps/transformer/patch/patchconflictdetector.go diff --git a/internal/k8sdeps/validator/validators.go b/k8sdeps/validator/validators.go similarity index 100% rename from internal/k8sdeps/validator/validators.go rename to k8sdeps/validator/validators.go diff --git a/kustomize.go b/kustomize.go index b3cb289ae..03dd4c478 100644 --- a/kustomize.go +++ b/kustomize.go @@ -20,7 +20,7 @@ import ( "os" "github.com/golang/glog" - "sigs.k8s.io/kustomize/internal/k8sdeps" + "sigs.k8s.io/kustomize/k8sdeps" "sigs.k8s.io/kustomize/pkg/commands" ) diff --git a/pkg/commands/build/build_test.go b/pkg/commands/build/build_test.go index dbc024481..ed42777b7 100644 --- a/pkg/commands/build/build_test.go +++ b/pkg/commands/build/build_test.go @@ -26,7 +26,7 @@ import ( "testing" "github.com/ghodss/yaml" - "sigs.k8s.io/kustomize/internal/k8sdeps" + "sigs.k8s.io/kustomize/k8sdeps" "sigs.k8s.io/kustomize/pkg/commands/kustfile" "sigs.k8s.io/kustomize/pkg/constants" "sigs.k8s.io/kustomize/pkg/fs" diff --git a/pkg/patch/transformer/factory_test.go b/pkg/patch/transformer/factory_test.go index 856ac9f35..d33ab014e 100644 --- a/pkg/patch/transformer/factory_test.go +++ b/pkg/patch/transformer/factory_test.go @@ -22,7 +22,7 @@ import ( "testing" "gopkg.in/yaml.v2" - "sigs.k8s.io/kustomize/internal/k8sdeps/kunstruct" + "sigs.k8s.io/kustomize/k8sdeps/kunstruct" "sigs.k8s.io/kustomize/pkg/gvk" "sigs.k8s.io/kustomize/pkg/internal/loadertest" "sigs.k8s.io/kustomize/pkg/patch" diff --git a/pkg/patch/transformer/patchjson6902json_test.go b/pkg/patch/transformer/patchjson6902json_test.go index 3b23d804d..033ac1603 100644 --- a/pkg/patch/transformer/patchjson6902json_test.go +++ b/pkg/patch/transformer/patchjson6902json_test.go @@ -21,7 +21,7 @@ import ( "testing" "github.com/evanphx/json-patch" - "sigs.k8s.io/kustomize/internal/k8sdeps/kunstruct" + "sigs.k8s.io/kustomize/k8sdeps/kunstruct" "sigs.k8s.io/kustomize/pkg/gvk" "sigs.k8s.io/kustomize/pkg/resid" "sigs.k8s.io/kustomize/pkg/resmap" diff --git a/pkg/resmap/resmap_test.go b/pkg/resmap/resmap_test.go index a4bbbe377..bf6b25902 100644 --- a/pkg/resmap/resmap_test.go +++ b/pkg/resmap/resmap_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - "sigs.k8s.io/kustomize/internal/k8sdeps/kunstruct" + "sigs.k8s.io/kustomize/k8sdeps/kunstruct" "sigs.k8s.io/kustomize/pkg/gvk" "sigs.k8s.io/kustomize/pkg/ifc" "sigs.k8s.io/kustomize/pkg/resid" diff --git a/pkg/resource/resource_test.go b/pkg/resource/resource_test.go index bb4697d92..c7580868c 100644 --- a/pkg/resource/resource_test.go +++ b/pkg/resource/resource_test.go @@ -19,7 +19,7 @@ package resource import ( "testing" - "sigs.k8s.io/kustomize/internal/k8sdeps/kunstruct" + "sigs.k8s.io/kustomize/k8sdeps/kunstruct" "sigs.k8s.io/kustomize/pkg/gvk" "sigs.k8s.io/kustomize/pkg/resid" ) diff --git a/pkg/target/kusttarget_test.go b/pkg/target/kusttarget_test.go index f33842735..5cc432374 100644 --- a/pkg/target/kusttarget_test.go +++ b/pkg/target/kusttarget_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "sigs.k8s.io/kustomize/internal/k8sdeps/kunstruct" - "sigs.k8s.io/kustomize/internal/k8sdeps/transformer" + "sigs.k8s.io/kustomize/k8sdeps/kunstruct" + "sigs.k8s.io/kustomize/k8sdeps/transformer" "sigs.k8s.io/kustomize/pkg/constants" "sigs.k8s.io/kustomize/pkg/fs" "sigs.k8s.io/kustomize/pkg/gvk" diff --git a/pkg/transformers/imagetag_test.go b/pkg/transformers/imagetag_test.go index 0449c1a97..179dab248 100644 --- a/pkg/transformers/imagetag_test.go +++ b/pkg/transformers/imagetag_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - "sigs.k8s.io/kustomize/internal/k8sdeps/kunstruct" + "sigs.k8s.io/kustomize/k8sdeps/kunstruct" "sigs.k8s.io/kustomize/pkg/gvk" "sigs.k8s.io/kustomize/pkg/resid" "sigs.k8s.io/kustomize/pkg/resmap" diff --git a/pkg/transformers/labelsandannotations_test.go b/pkg/transformers/labelsandannotations_test.go index 48cf2a90a..979e25280 100644 --- a/pkg/transformers/labelsandannotations_test.go +++ b/pkg/transformers/labelsandannotations_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - "sigs.k8s.io/kustomize/internal/k8sdeps/kunstruct" + "sigs.k8s.io/kustomize/k8sdeps/kunstruct" "sigs.k8s.io/kustomize/pkg/gvk" "sigs.k8s.io/kustomize/pkg/resid" "sigs.k8s.io/kustomize/pkg/resmap" diff --git a/pkg/transformers/namereference_test.go b/pkg/transformers/namereference_test.go index 3a03c46bf..a98c8cf97 100644 --- a/pkg/transformers/namereference_test.go +++ b/pkg/transformers/namereference_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - "sigs.k8s.io/kustomize/internal/k8sdeps/kunstruct" + "sigs.k8s.io/kustomize/k8sdeps/kunstruct" "sigs.k8s.io/kustomize/pkg/resid" "sigs.k8s.io/kustomize/pkg/resmap" "sigs.k8s.io/kustomize/pkg/resource" diff --git a/pkg/transformers/namespace_test.go b/pkg/transformers/namespace_test.go index 6f73cdae5..cdfd701c3 100644 --- a/pkg/transformers/namespace_test.go +++ b/pkg/transformers/namespace_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - "sigs.k8s.io/kustomize/internal/k8sdeps/kunstruct" + "sigs.k8s.io/kustomize/k8sdeps/kunstruct" "sigs.k8s.io/kustomize/pkg/resid" "sigs.k8s.io/kustomize/pkg/resmap" "sigs.k8s.io/kustomize/pkg/resource" diff --git a/pkg/transformers/prefixname_test.go b/pkg/transformers/prefixname_test.go index c15a638f4..8a3acec52 100644 --- a/pkg/transformers/prefixname_test.go +++ b/pkg/transformers/prefixname_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - "sigs.k8s.io/kustomize/internal/k8sdeps/kunstruct" + "sigs.k8s.io/kustomize/k8sdeps/kunstruct" "sigs.k8s.io/kustomize/pkg/resid" "sigs.k8s.io/kustomize/pkg/resmap" "sigs.k8s.io/kustomize/pkg/resource"