kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-13 01:50:55 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #1661 from monopole/moveK8sdeps

Browse Source 
Move ks8deps to api for now.
This commit is contained in:
Jeff Regan
2019-10-20 16:51:47 -07:00
committed by GitHub
parent 22d07ed37d fddde81f9c
commit 327a3f5300
32 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/internal/accumulator/namereferencetransformer_test.go
View File

@@ -8,11 +8,11 @@ import (
"testing"
"sigs.k8s.io/kustomize/v3/api/builtinconfig"
"sigs.k8s.io/kustomize/v3/api/k8sdeps/kunstruct"
"sigs.k8s.io/kustomize/v3/api/resid"
"sigs.k8s.io/kustomize/v3/api/resmap"
"sigs.k8s.io/kustomize/v3/api/resource"
"sigs.k8s.io/kustomize/v3/api/testutils/resmaptest"
"sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct"
)
func TestNameReferenceHappyRun(t *testing.T) {

2
api/internal/accumulator/refvartransformer_test.go
View File

@@ -7,12 +7,12 @@ import (
"reflect"
"testing"
"sigs.k8s.io/kustomize/v3/api/k8sdeps/kunstruct"
"sigs.k8s.io/kustomize/v3/api/resid"
"sigs.k8s.io/kustomize/v3/api/resmap"
"sigs.k8s.io/kustomize/v3/api/resource"
"sigs.k8s.io/kustomize/v3/api/testutils/resmaptest"
"sigs.k8s.io/kustomize/v3/api/types"
"sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct"
)
func TestRefVarTransformer(t *testing.T) {

2
api/internal/accumulator/resaccumulator_test.go
View File

@@ -12,12 +12,12 @@ import (
"sigs.k8s.io/kustomize/v3/api/builtinconfig"
. "sigs.k8s.io/kustomize/v3/api/internal/accumulator"
"sigs.k8s.io/kustomize/v3/api/k8sdeps/kunstruct"
"sigs.k8s.io/kustomize/v3/api/resid"
"sigs.k8s.io/kustomize/v3/api/resmap"
"sigs.k8s.io/kustomize/v3/api/resource"
"sigs.k8s.io/kustomize/v3/api/testutils/resmaptest"
"sigs.k8s.io/kustomize/v3/api/types"
"sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct"
)
func makeResAccumulator(t *testing.T) (*ResAccumulator, *resource.Factory) {

0
k8sdeps/configmapandsecret/configmapfactory.go → api/k8sdeps/configmapandsecret/configmapfactory.go
View File

0
k8sdeps/configmapandsecret/configmapfactory_test.go → api/k8sdeps/configmapandsecret/configmapfactory_test.go
View File

0
k8sdeps/configmapandsecret/factory.go → api/k8sdeps/configmapandsecret/factory.go
View File

0
k8sdeps/configmapandsecret/secretfactory.go → api/k8sdeps/configmapandsecret/secretfactory.go
View File

0
k8sdeps/configmapandsecret/secretfactory_test.go → api/k8sdeps/configmapandsecret/secretfactory_test.go
View File

0
k8sdeps/doc.go → api/k8sdeps/doc.go
View File

2
k8sdeps/kunstruct/factory.go → api/k8sdeps/kunstruct/factory.go
View File

@@ -13,8 +13,8 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/util/yaml"
"sigs.k8s.io/kustomize/v3/api/ifc"
"sigs.k8s.io/kustomize/v3/api/k8sdeps/configmapandsecret"
"sigs.k8s.io/kustomize/v3/api/types"
"sigs.k8s.io/kustomize/v3/k8sdeps/configmapandsecret"
)
// KunstructuredFactoryImpl hides construction using apimachinery types.

0
k8sdeps/kunstruct/factory_test.go → api/k8sdeps/kunstruct/factory_test.go
View File

0
k8sdeps/kunstruct/hasher.go → api/k8sdeps/kunstruct/hasher.go
View File

0
k8sdeps/kunstruct/hasher_test.go → api/k8sdeps/kunstruct/hasher_test.go
View File

0
k8sdeps/kunstruct/helper.go → api/k8sdeps/kunstruct/helper.go
View File

0
k8sdeps/kunstruct/helper_test.go → api/k8sdeps/kunstruct/helper_test.go
View File

0
k8sdeps/kunstruct/unstructadapter.go → api/k8sdeps/kunstruct/unstructadapter.go
View File

0
k8sdeps/kunstruct/unstructadapter_test.go → api/k8sdeps/kunstruct/unstructadapter_test.go
View File

2
k8sdeps/transformer/factory.go → api/k8sdeps/transformer/factory.go
View File

@@ -5,9 +5,9 @@
package transformer
import (
"sigs.k8s.io/kustomize/v3/api/k8sdeps/transformer/patch"
"sigs.k8s.io/kustomize/v3/api/resmap"
"sigs.k8s.io/kustomize/v3/api/resource"
"sigs.k8s.io/kustomize/v3/k8sdeps/transformer/patch"
)
// FactoryImpl makes patch transformer and name hash transformer

0
k8sdeps/transformer/patch/conflictdetector.go → api/k8sdeps/transformer/patch/conflictdetector.go
View File

0
k8sdeps/validator/validators.go → api/k8sdeps/validator/validators.go
View File

2
api/plugins/execplugin/execplugin_test.go
View File

@@ -9,6 +9,7 @@ import (
"testing"
"sigs.k8s.io/kustomize/v3/api/internal/loadertest"
"sigs.k8s.io/kustomize/v3/api/k8sdeps/kunstruct"
"sigs.k8s.io/kustomize/v3/api/plugins/config"
. "sigs.k8s.io/kustomize/v3/api/plugins/execplugin"
"sigs.k8s.io/kustomize/v3/api/plugins/loader"
@@ -16,7 +17,6 @@ import (
"sigs.k8s.io/kustomize/v3/api/resource"
"sigs.k8s.io/kustomize/v3/api/testutils/valtest"
"sigs.k8s.io/kustomize/v3/api/types"
"sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct"
)
func TestExecPluginConfig(t *testing.T) {

8
api/plugins/loader/loader.go
View File

@@ -10,17 +10,15 @@ import (
"reflect"
"strings"
"sigs.k8s.io/kustomize/v3/api/plugins/builtins"
"github.com/pkg/errors"
"sigs.k8s.io/kustomize/v3/api/ifc"
"sigs.k8s.io/kustomize/v3/api/plugins/builtins"
"sigs.k8s.io/kustomize/v3/api/plugins/config"
"sigs.k8s.io/kustomize/v3/api/plugins/execplugin"
"sigs.k8s.io/kustomize/v3/api/resid"
"sigs.k8s.io/kustomize/v3/api/resmap"
"sigs.k8s.io/kustomize/v3/api/resource"
"sigs.k8s.io/kustomize/v3/api/types"
"sigs.k8s.io/kustomize/v3/pkg/plugins"
)
type Loader struct {
@@ -176,11 +174,11 @@ func (l *Loader) loadGoPlugin(id resid.ResId) (resmap.Configurable, error) {
if err != nil {
return nil, errors.Wrapf(err, "plugin %s fails to load", absPath)
}
symbol, err := p.Lookup(plugins.PluginSymbol)
symbol, err := p.Lookup(config.PluginSymbol)
if err != nil {
return nil, errors.Wrapf(
err, "plugin %s doesn't have symbol %s",
regId, plugins.PluginSymbol)
regId, config.PluginSymbol)
}
c, ok := symbol.(resmap.Configurable)
if !ok {

2
api/plugins/loader/loader_test.go
View File

@@ -7,13 +7,13 @@ import (
"testing"
"sigs.k8s.io/kustomize/v3/api/internal/loadertest"
"sigs.k8s.io/kustomize/v3/api/k8sdeps/kunstruct"
"sigs.k8s.io/kustomize/v3/api/plugins/config"
. "sigs.k8s.io/kustomize/v3/api/plugins/loader"
"sigs.k8s.io/kustomize/v3/api/resmap"
"sigs.k8s.io/kustomize/v3/api/resource"
"sigs.k8s.io/kustomize/v3/api/testutils/kusttest"
"sigs.k8s.io/kustomize/v3/api/testutils/valtest"
"sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct"
)
const (

2
api/resmap/resmap_test.go
View File

@@ -9,12 +9,12 @@ import (
"strings"
"testing"
"sigs.k8s.io/kustomize/v3/api/k8sdeps/kunstruct"
"sigs.k8s.io/kustomize/v3/api/resid"
. "sigs.k8s.io/kustomize/v3/api/resmap"
"sigs.k8s.io/kustomize/v3/api/resource"
"sigs.k8s.io/kustomize/v3/api/testutils/resmaptest"
"sigs.k8s.io/kustomize/v3/api/types"
"sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct"
)
var rf = resource.NewFactory(

2
api/resource/resource_test.go
View File

@@ -20,10 +20,10 @@ import (
"reflect"
"testing"
"sigs.k8s.io/kustomize/v3/api/k8sdeps/kunstruct"
"sigs.k8s.io/kustomize/v3/api/resid"
. "sigs.k8s.io/kustomize/v3/api/resource"
"sigs.k8s.io/kustomize/v3/api/types"
"sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct"
)
var factory = NewFactory(

4
api/target/plugindir_test.go
View File

@@ -10,6 +10,8 @@ import (
"testing"
"sigs.k8s.io/kustomize/v3/api/filesys"
"sigs.k8s.io/kustomize/v3/api/k8sdeps/kunstruct"
"sigs.k8s.io/kustomize/v3/api/k8sdeps/transformer"
fLdr "sigs.k8s.io/kustomize/v3/api/loader"
"sigs.k8s.io/kustomize/v3/api/plugins/config"
pLdr "sigs.k8s.io/kustomize/v3/api/plugins/loader"
@@ -18,8 +20,6 @@ import (
"sigs.k8s.io/kustomize/v3/api/target"
"sigs.k8s.io/kustomize/v3/api/testutils/kusttest"
"sigs.k8s.io/kustomize/v3/api/testutils/valtest"
"sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct"
"sigs.k8s.io/kustomize/v3/k8sdeps/transformer"
)
func TestPluginDir(t *testing.T) {

4
api/testutils/kusttest/kusttestharness.go
View File

@@ -11,6 +11,8 @@ import (
"sigs.k8s.io/kustomize/v3/api/builtinconfig/consts"
"sigs.k8s.io/kustomize/v3/api/internal/loadertest"
"sigs.k8s.io/kustomize/v3/api/k8sdeps/kunstruct"
"sigs.k8s.io/kustomize/v3/api/k8sdeps/transformer"
fLdr "sigs.k8s.io/kustomize/v3/api/loader"
"sigs.k8s.io/kustomize/v3/api/pgmconfig"
"sigs.k8s.io/kustomize/v3/api/plugins/config"
@@ -20,8 +22,6 @@ import (
"sigs.k8s.io/kustomize/v3/api/target"
"sigs.k8s.io/kustomize/v3/api/testutils/valtest"
"sigs.k8s.io/kustomize/v3/api/types"
"sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct"
"sigs.k8s.io/kustomize/v3/k8sdeps/transformer"
)
// KustTestHarness is an environment for running a kustomize build,

2
api/transform/maptransformer_test.go
View File

@@ -7,10 +7,10 @@ import (
"testing"
"sigs.k8s.io/kustomize/v3/api/builtinconfig"
"sigs.k8s.io/kustomize/v3/api/k8sdeps/kunstruct"
"sigs.k8s.io/kustomize/v3/api/resource"
"sigs.k8s.io/kustomize/v3/api/testutils/resmaptest"
. "sigs.k8s.io/kustomize/v3/api/transform"
"sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct"
)
var resourceFactory = resource.NewFactory(kunstruct.NewKunstructuredFactoryImpl())

2
api/transform/mutatefield_test.go
View File

@@ -8,8 +8,8 @@ import (
"testing"
"sigs.k8s.io/kustomize/v3/api/ifc"
"sigs.k8s.io/kustomize/v3/api/k8sdeps/kunstruct"
. "sigs.k8s.io/kustomize/v3/api/transform"
"sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct"
)
type noopMutator struct {

2
hacks/crawl/doc/doc.go
View File

@@ -5,9 +5,9 @@ import (
"strings"
"sigs.k8s.io/kustomize/v3/api/ifc"
"sigs.k8s.io/kustomize/v3/api/k8sdeps/kunstruct"
"sigs.k8s.io/kustomize/v3/api/pgmconfig"
"sigs.k8s.io/kustomize/v3/api/types"
"sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct"
"sigs.k8s.io/yaml"
)

6
kustomize/internal/commands/commands.go
View File

@@ -15,12 +15,12 @@ import (
"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/edit"
"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/version"
"sigs.k8s.io/kustomize/v3/api/filesys"
"sigs.k8s.io/kustomize/v3/api/k8sdeps/kunstruct"
"sigs.k8s.io/kustomize/v3/api/k8sdeps/transformer"
"sigs.k8s.io/kustomize/v3/api/k8sdeps/validator"
"sigs.k8s.io/kustomize/v3/api/pgmconfig"
"sigs.k8s.io/kustomize/v3/api/resmap"
"sigs.k8s.io/kustomize/v3/api/resource"
"sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct"
"sigs.k8s.io/kustomize/v3/k8sdeps/transformer"
"sigs.k8s.io/kustomize/v3/k8sdeps/validator"
)
// NewDefaultCommand returns the default (aka root) command for kustomize command.

2
kustomize/internal/commands/create/create_test.go
View File

@@ -9,8 +9,8 @@ import (
"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
"sigs.k8s.io/kustomize/v3/api/filesys"
"sigs.k8s.io/kustomize/v3/api/k8sdeps/kunstruct"
"sigs.k8s.io/kustomize/v3/api/types"
"sigs.k8s.io/kustomize/v3/k8sdeps/kunstruct"
)
var factory = kunstruct.NewKunstructuredFactoryImpl()