Merge pull request #1665 from monopole/introduceApiModule

Introduce API module.
kubernetes-sigs · Oct 21, 2019 · 644f2dd · 644f2dd
2 parents 4f014d0 + 46524d3
commit 644f2dd
Show file tree

Hide file tree

Showing 243 changed files with 1,332 additions and 1,243 deletions.
diff --git a/api/filesys/confirmeddir_test.go b/api/filesys/confirmeddir_test.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	. "sigs.k8s.io/kustomize/v3/api/filesys"
+	. "sigs.k8s.io/kustomize/api/filesys"
 )
 
 func TestJoin(t *testing.T) {

diff --git a/api/filesys/fsinmemory_test.go b/api/filesys/fsinmemory_test.go
@@ -8,7 +8,7 @@ import (
 	"reflect"
 	"testing"
 
-	. "sigs.k8s.io/kustomize/v3/api/filesys"
+	. "sigs.k8s.io/kustomize/api/filesys"
 )
 
 func TestExists(t *testing.T) {

diff --git a/api/filesys/fsondisk_test.go b/api/filesys/fsondisk_test.go
@@ -11,7 +11,7 @@ import (
 	"reflect"
 	"testing"
 
-	. "sigs.k8s.io/kustomize/v3/api/filesys"
+	. "sigs.k8s.io/kustomize/api/filesys"
 )
 
 func makeTestDir(t *testing.T) (FileSystem, string) {

diff --git a/api/git/cloner.go b/api/git/cloner.go
@@ -9,7 +9,7 @@ import (
 	"os/exec"
 
 	"github.com/pkg/errors"
-	"sigs.k8s.io/kustomize/v3/api/filesys"
+	"sigs.k8s.io/kustomize/api/filesys"
 )
 
 // Cloner is a function that can clone a git repo.

diff --git a/api/git/repospec.go b/api/git/repospec.go
@@ -9,7 +9,7 @@ import (
 	"regexp"
 	"strings"
 
-	"sigs.k8s.io/kustomize/v3/api/filesys"
+	"sigs.k8s.io/kustomize/api/filesys"
 )
 
 // Used as a temporary non-empty occupant of the cloneDir

diff --git a/api/go.mod b/api/go.mod
@@ -0,0 +1,21 @@
+module sigs.k8s.io/kustomize/api
+
+go 1.13
+
+require (
+	github.com/evanphx/json-patch v4.5.0+incompatible
+	github.com/go-openapi/spec v0.19.4
+	github.com/golang/protobuf v1.3.2 // indirect
+	github.com/pkg/errors v0.8.1
+	github.com/spf13/pflag v1.0.5
+	github.com/stretchr/testify v1.4.0 // indirect
+	golang.org/x/net v0.0.0-20190923162816-aa69164e4478 // indirect
+	golang.org/x/sys v0.0.0-20190922100055-0a153f010e69 // indirect
+	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
+	gopkg.in/yaml.v2 v2.2.4
+	k8s.io/api v0.0.0-20191016225839-816a9b7df678
+	k8s.io/apimachinery v0.0.0-20191020214737-6c8691705fc5
+	k8s.io/client-go v11.0.0+incompatible
+	k8s.io/kube-openapi v0.0.0-20190918143330-0270cf2f1c1d
+	sigs.k8s.io/yaml v1.1.0
+)
diff --git a/api/go.sum b/api/go.sum
diff --git a/api/hasher/hasher_test.go b/api/hasher/hasher_test.go
@@ -6,7 +6,7 @@ package hasher_test
 import (
 	"testing"
 
-	. "sigs.k8s.io/kustomize/v3/api/hasher"
+	. "sigs.k8s.io/kustomize/api/hasher"
 )
 
 func TestSortArrayAndComputeHash(t *testing.T) {

diff --git a/api/ifc/ifc.go b/api/ifc/ifc.go
@@ -5,8 +5,8 @@
 package ifc
 
 import (
-	"sigs.k8s.io/kustomize/v3/api/resid"
-	"sigs.k8s.io/kustomize/v3/api/types"
+	"sigs.k8s.io/kustomize/api/resid"
+	"sigs.k8s.io/kustomize/api/types"
 )
 
 // Validator provides functions to validate annotations and labels

diff --git a/api/internal/accumulator/expansion/expand_test.go b/api/internal/accumulator/expansion/expand_test.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"testing"
 
-	. "sigs.k8s.io/kustomize/v3/api/internal/accumulator/expansion"
+	. "sigs.k8s.io/kustomize/api/internal/accumulator/expansion"
 )
 
 type expected struct {

diff --git a/api/internal/accumulator/loadconfigfromcrds.go b/api/internal/accumulator/loadconfigfromcrds.go
@@ -10,10 +10,10 @@ import (
 	"github.com/go-openapi/spec"
 	"github.com/pkg/errors"
 	"k8s.io/kube-openapi/pkg/common"
-	"sigs.k8s.io/kustomize/v3/api/ifc"
-	"sigs.k8s.io/kustomize/v3/api/plugins/builtinconfig"
-	"sigs.k8s.io/kustomize/v3/api/resid"
-	"sigs.k8s.io/kustomize/v3/api/types"
+	"sigs.k8s.io/kustomize/api/ifc"
+	"sigs.k8s.io/kustomize/api/plugins/builtinconfig"
+	"sigs.k8s.io/kustomize/api/resid"
+	"sigs.k8s.io/kustomize/api/types"
 	"sigs.k8s.io/yaml"
 )
 

diff --git a/api/internal/accumulator/loadconfigfromcrds_test.go b/api/internal/accumulator/loadconfigfromcrds_test.go
@@ -7,12 +7,12 @@ import (
 	"reflect"
 	"testing"
 
-	"sigs.k8s.io/kustomize/v3/api/ifc"
-	. "sigs.k8s.io/kustomize/v3/api/internal/accumulator"
-	"sigs.k8s.io/kustomize/v3/api/internal/loadertest"
-	"sigs.k8s.io/kustomize/v3/api/plugins/builtinconfig"
-	"sigs.k8s.io/kustomize/v3/api/resid"
-	"sigs.k8s.io/kustomize/v3/api/types"
+	"sigs.k8s.io/kustomize/api/ifc"
+	. "sigs.k8s.io/kustomize/api/internal/accumulator"
+	"sigs.k8s.io/kustomize/api/internal/loadertest"
+	"sigs.k8s.io/kustomize/api/plugins/builtinconfig"
+	"sigs.k8s.io/kustomize/api/resid"
+	"sigs.k8s.io/kustomize/api/types"
 )
 
 // This defines two CRD's:  Bee and MyKind.

diff --git a/api/internal/accumulator/namereferencetransformer.go b/api/internal/accumulator/namereferencetransformer.go
@@ -7,11 +7,11 @@ import (
 	"fmt"
 	"log"
 
-	"sigs.k8s.io/kustomize/v3/api/plugins/builtinconfig"
-	"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/transform"
+	"sigs.k8s.io/kustomize/api/plugins/builtinconfig"
+	"sigs.k8s.io/kustomize/api/resid"
+	"sigs.k8s.io/kustomize/api/resmap"
+	"sigs.k8s.io/kustomize/api/resource"
+	"sigs.k8s.io/kustomize/api/transform"
 )
 
 type nameReferenceTransformer struct {

diff --git a/api/internal/accumulator/namereferencetransformer_test.go b/api/internal/accumulator/namereferencetransformer_test.go
@@ -7,12 +7,12 @@ import (
 	"strings"
 	"testing"
 
-	"sigs.k8s.io/kustomize/v3/api/k8sdeps/kunstruct"
-	"sigs.k8s.io/kustomize/v3/api/plugins/builtinconfig"
-	"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/api/k8sdeps/kunstruct"
+	"sigs.k8s.io/kustomize/api/plugins/builtinconfig"
+	"sigs.k8s.io/kustomize/api/resid"
+	"sigs.k8s.io/kustomize/api/resmap"
+	"sigs.k8s.io/kustomize/api/resource"
+	"sigs.k8s.io/kustomize/api/testutils/resmaptest"
 )
 
 func TestNameReferenceHappyRun(t *testing.T) {

diff --git a/api/internal/accumulator/refvartransformer.go b/api/internal/accumulator/refvartransformer.go
@@ -6,11 +6,11 @@ package accumulator
 import (
 	"fmt"
 
-	expansion2 "sigs.k8s.io/kustomize/v3/api/internal/accumulator/expansion"
+	expansion2 "sigs.k8s.io/kustomize/api/internal/accumulator/expansion"
 
-	"sigs.k8s.io/kustomize/v3/api/resmap"
-	"sigs.k8s.io/kustomize/v3/api/transform"
-	"sigs.k8s.io/kustomize/v3/api/types"
+	"sigs.k8s.io/kustomize/api/resmap"
+	"sigs.k8s.io/kustomize/api/transform"
+	"sigs.k8s.io/kustomize/api/types"
 )
 
 type refVarTransformer struct {

diff --git a/api/internal/accumulator/refvartransformer_test.go b/api/internal/accumulator/refvartransformer_test.go
@@ -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/api/k8sdeps/kunstruct"
+	"sigs.k8s.io/kustomize/api/resid"
+	"sigs.k8s.io/kustomize/api/resmap"
+	"sigs.k8s.io/kustomize/api/resource"
+	"sigs.k8s.io/kustomize/api/testutils/resmaptest"
+	"sigs.k8s.io/kustomize/api/types"
 )
 
 func TestRefVarTransformer(t *testing.T) {

diff --git a/api/internal/accumulator/resaccumulator.go b/api/internal/accumulator/resaccumulator.go
@@ -8,10 +8,10 @@ import (
 	"log"
 	"strings"
 
-	"sigs.k8s.io/kustomize/v3/api/plugins/builtinconfig"
-	"sigs.k8s.io/kustomize/v3/api/resid"
-	"sigs.k8s.io/kustomize/v3/api/resmap"
-	"sigs.k8s.io/kustomize/v3/api/types"
+	"sigs.k8s.io/kustomize/api/plugins/builtinconfig"
+	"sigs.k8s.io/kustomize/api/resid"
+	"sigs.k8s.io/kustomize/api/resmap"
+	"sigs.k8s.io/kustomize/api/types"
 )
 
 // ResAccumulator accumulates resources and the rules

diff --git a/api/internal/accumulator/resaccumulator_test.go b/api/internal/accumulator/resaccumulator_test.go
@@ -10,14 +10,14 @@ import (
 	"strings"
 	"testing"
 
-	. "sigs.k8s.io/kustomize/v3/api/internal/accumulator"
-	"sigs.k8s.io/kustomize/v3/api/k8sdeps/kunstruct"
-	"sigs.k8s.io/kustomize/v3/api/plugins/builtinconfig"
-	"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/api/internal/accumulator"
+	"sigs.k8s.io/kustomize/api/k8sdeps/kunstruct"
+	"sigs.k8s.io/kustomize/api/plugins/builtinconfig"
+	"sigs.k8s.io/kustomize/api/resid"
+	"sigs.k8s.io/kustomize/api/resmap"
+	"sigs.k8s.io/kustomize/api/resource"
+	"sigs.k8s.io/kustomize/api/testutils/resmaptest"
+	"sigs.k8s.io/kustomize/api/types"
 )
 
 func makeResAccumulator(t *testing.T) (*ResAccumulator, *resource.Factory) {

diff --git a/api/internal/loadertest/fakeloader.go b/api/internal/loadertest/fakeloader.go
@@ -7,9 +7,9 @@ package loadertest
 import (
 	"log"
 
-	"sigs.k8s.io/kustomize/v3/api/filesys"
-	"sigs.k8s.io/kustomize/v3/api/ifc"
-	"sigs.k8s.io/kustomize/v3/api/loader"
+	"sigs.k8s.io/kustomize/api/filesys"
+	"sigs.k8s.io/kustomize/api/ifc"
+	"sigs.k8s.io/kustomize/api/loader"
 )
 
 // FakeLoader encapsulates the delegate Loader and the fake file system.

diff --git a/api/internal/tools/tools.go b/api/internal/tools/tools.go
diff --git a/api/inventory/inventory.go b/api/inventory/inventory.go
@@ -6,7 +6,7 @@ package inventory
 import (
 	"encoding/json"
 
-	"sigs.k8s.io/kustomize/v3/api/resid"
+	"sigs.k8s.io/kustomize/api/resid"
 )
 
 //Refs is a reference map.  Each key is the id

diff --git a/api/inventory/inventory_test.go b/api/inventory/inventory_test.go
@@ -6,8 +6,8 @@ package inventory_test
 import (
 	"testing"
 
-	. "sigs.k8s.io/kustomize/v3/api/inventory"
-	"sigs.k8s.io/kustomize/v3/api/resid"
+	. "sigs.k8s.io/kustomize/api/inventory"
+	"sigs.k8s.io/kustomize/api/resid"
 )
 
 func makeRefs() (Refs, Refs) {

diff --git a/api/k8sdeps/configmapandsecret/configmapfactory.go b/api/k8sdeps/configmapandsecret/configmapfactory.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/pkg/errors"
 	"k8s.io/api/core/v1"
-	"sigs.k8s.io/kustomize/v3/api/types"
+	"sigs.k8s.io/kustomize/api/types"
 )
 
 func makeFreshConfigMap(

diff --git a/api/k8sdeps/configmapandsecret/configmapfactory_test.go b/api/k8sdeps/configmapandsecret/configmapfactory_test.go
@@ -10,11 +10,11 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"sigs.k8s.io/kustomize/v3/api/filesys"
-	"sigs.k8s.io/kustomize/v3/api/kv"
-	"sigs.k8s.io/kustomize/v3/api/loader"
-	"sigs.k8s.io/kustomize/v3/api/testutils/valtest"
-	"sigs.k8s.io/kustomize/v3/api/types"
+	"sigs.k8s.io/kustomize/api/filesys"
+	"sigs.k8s.io/kustomize/api/kv"
+	"sigs.k8s.io/kustomize/api/loader"
+	"sigs.k8s.io/kustomize/api/testutils/valtest"
+	"sigs.k8s.io/kustomize/api/types"
 )
 
 func makeEnvConfigMap(name string) *corev1.ConfigMap {

diff --git a/api/k8sdeps/configmapandsecret/factory.go b/api/k8sdeps/configmapandsecret/factory.go
@@ -4,8 +4,8 @@
 package configmapandsecret
 
 import (
-	"sigs.k8s.io/kustomize/v3/api/ifc"
-	"sigs.k8s.io/kustomize/v3/api/types"
+	"sigs.k8s.io/kustomize/api/ifc"
+	"sigs.k8s.io/kustomize/api/types"
 )
 
 // Factory makes ConfigMaps and Secrets.

diff --git a/api/k8sdeps/configmapandsecret/secretfactory.go b/api/k8sdeps/configmapandsecret/secretfactory.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 
 	corev1 "k8s.io/api/core/v1"
-	"sigs.k8s.io/kustomize/v3/api/types"
+	"sigs.k8s.io/kustomize/api/types"
 )
 
 func makeFreshSecret(

diff --git a/api/k8sdeps/configmapandsecret/secretfactory_test.go b/api/k8sdeps/configmapandsecret/secretfactory_test.go
@@ -9,11 +9,11 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"sigs.k8s.io/kustomize/v3/api/filesys"
-	"sigs.k8s.io/kustomize/v3/api/kv"
-	"sigs.k8s.io/kustomize/v3/api/loader"
-	"sigs.k8s.io/kustomize/v3/api/testutils/valtest"
-	"sigs.k8s.io/kustomize/v3/api/types"
+	"sigs.k8s.io/kustomize/api/filesys"
+	"sigs.k8s.io/kustomize/api/kv"
+	"sigs.k8s.io/kustomize/api/loader"
+	"sigs.k8s.io/kustomize/api/testutils/valtest"
+	"sigs.k8s.io/kustomize/api/types"
 )
 
 func makeEnvSecret(name string) *corev1.Secret {

diff --git a/api/k8sdeps/kunstruct/factory.go b/api/k8sdeps/kunstruct/factory.go
@@ -12,9 +12,9 @@ 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/api/ifc"
+	"sigs.k8s.io/kustomize/api/k8sdeps/configmapandsecret"
+	"sigs.k8s.io/kustomize/api/types"
 )
 
 // KunstructuredFactoryImpl hides construction using apimachinery types.

diff --git a/api/k8sdeps/kunstruct/factory_test.go b/api/k8sdeps/kunstruct/factory_test.go
@@ -20,7 +20,7 @@ import (
 	"reflect"
 	"testing"
 
-	"sigs.k8s.io/kustomize/v3/api/ifc"
+	"sigs.k8s.io/kustomize/api/ifc"
 )
 
 func TestSliceFromBytes(t *testing.T) {

diff --git a/api/k8sdeps/kunstruct/hasher.go b/api/k8sdeps/kunstruct/hasher.go
@@ -9,8 +9,8 @@ import (
 
 	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"sigs.k8s.io/kustomize/v3/api/hasher"
-	"sigs.k8s.io/kustomize/v3/api/ifc"
+	"sigs.k8s.io/kustomize/api/hasher"
+	"sigs.k8s.io/kustomize/api/ifc"
 )
 
 // kustHash computes a hash of an unstructured object.

diff --git a/api/k8sdeps/kunstruct/unstructadapter.go b/api/k8sdeps/kunstruct/unstructadapter.go
@@ -16,8 +16,8 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/strategicpatch"
 	"k8s.io/client-go/kubernetes/scheme"
-	"sigs.k8s.io/kustomize/v3/api/ifc"
-	"sigs.k8s.io/kustomize/v3/api/resid"
+	"sigs.k8s.io/kustomize/api/ifc"
+	"sigs.k8s.io/kustomize/api/resid"
 )
 
 var _ ifc.Kunstructured = &UnstructAdapter{}