diff --git a/api/k8sdeps/transformer/factory.go b/api/internal/k8sdeps/transformer/factory.go similarity index 90% rename from api/k8sdeps/transformer/factory.go rename to api/internal/k8sdeps/transformer/factory.go index 2d5ad22bb..622c4a6cf 100644 --- a/api/k8sdeps/transformer/factory.go +++ b/api/internal/k8sdeps/transformer/factory.go @@ -5,7 +5,7 @@ package transformer import ( - "sigs.k8s.io/kustomize/api/k8sdeps/transformer/patch" + "sigs.k8s.io/kustomize/api/internal/k8sdeps/transformer/patch" "sigs.k8s.io/kustomize/api/resmap" "sigs.k8s.io/kustomize/api/resource" ) diff --git a/api/k8sdeps/transformer/patch/conflictdetector.go b/api/internal/k8sdeps/transformer/patch/conflictdetector.go similarity index 100% rename from api/k8sdeps/transformer/patch/conflictdetector.go rename to api/internal/k8sdeps/transformer/patch/conflictdetector.go diff --git a/api/internal/target/plugindir_test.go b/api/internal/target/plugindir_test.go index 2f7bff1eb..16f500f51 100644 --- a/api/internal/target/plugindir_test.go +++ b/api/internal/target/plugindir_test.go @@ -10,10 +10,10 @@ import ( "testing" "sigs.k8s.io/kustomize/api/filesys" + "sigs.k8s.io/kustomize/api/internal/k8sdeps/transformer" pLdr "sigs.k8s.io/kustomize/api/internal/plugins/loader" . "sigs.k8s.io/kustomize/api/internal/target" "sigs.k8s.io/kustomize/api/k8sdeps/kunstruct" - "sigs.k8s.io/kustomize/api/k8sdeps/transformer" "sigs.k8s.io/kustomize/api/konfig" fLdr "sigs.k8s.io/kustomize/api/loader" "sigs.k8s.io/kustomize/api/resmap" diff --git a/api/k8sdeps/doc.go b/api/k8sdeps/doc.go index c98cb8d68..f2f85f0bb 100644 --- a/api/k8sdeps/doc.go +++ b/api/k8sdeps/doc.go @@ -1,19 +1,13 @@ -/* -Copyright 2018 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ +// Copyright 2019 The Kubernetes Authors. +// SPDX-License-Identifier: Apache-2.0 +// 2019 Nov 06 These notes are somewhat out of date, but left +// for historical purposes need to be updated (or simply removed +// with all the code). The kubectl integration plan described +// below is no longer the plan of record. +// +// -------- +// // It's possible that kustomize's features will be vendored into // the kubernetes/kubernetes repo and made available to kubectl // commands, while at the same time the kustomize program will diff --git a/api/krusty/kustomizer.go b/api/krusty/kustomizer.go index ec14a041f..61a43f9d5 100644 --- a/api/krusty/kustomizer.go +++ b/api/krusty/kustomizer.go @@ -6,10 +6,10 @@ package krusty import ( "sigs.k8s.io/kustomize/api/builtins" "sigs.k8s.io/kustomize/api/filesys" + "sigs.k8s.io/kustomize/api/internal/k8sdeps/transformer" pLdr "sigs.k8s.io/kustomize/api/internal/plugins/loader" "sigs.k8s.io/kustomize/api/internal/target" "sigs.k8s.io/kustomize/api/k8sdeps/kunstruct" - "sigs.k8s.io/kustomize/api/k8sdeps/transformer" "sigs.k8s.io/kustomize/api/k8sdeps/validator" fLdr "sigs.k8s.io/kustomize/api/loader" "sigs.k8s.io/kustomize/api/resmap" diff --git a/api/testutils/kusttest/kusttestharness.go b/api/testutils/kusttest/kusttestharness.go index ddfc0d24b..7311784d4 100644 --- a/api/testutils/kusttest/kusttestharness.go +++ b/api/testutils/kusttest/kusttestharness.go @@ -9,11 +9,11 @@ import ( "strings" "testing" + "sigs.k8s.io/kustomize/api/internal/k8sdeps/transformer" "sigs.k8s.io/kustomize/api/internal/loadertest" pLdr "sigs.k8s.io/kustomize/api/internal/plugins/loader" "sigs.k8s.io/kustomize/api/internal/target" "sigs.k8s.io/kustomize/api/k8sdeps/kunstruct" - "sigs.k8s.io/kustomize/api/k8sdeps/transformer" "sigs.k8s.io/kustomize/api/konfig" "sigs.k8s.io/kustomize/api/konfig/builtinpluginconsts" fLdr "sigs.k8s.io/kustomize/api/loader"