Bulk move from k8s.io/kubectl

This commit is contained in:
Jeffrey Regan
2018-05-11 14:07:15 -07:00
parent c2048aae17
commit 83b3eb9d54
4223 changed files with 1815034 additions and 110 deletions

View File

@@ -22,12 +22,12 @@ import (
"github.com/ghodss/yaml"
"k8s.io/kubectl/pkg/kustomize/constants"
interror "k8s.io/kubectl/pkg/kustomize/internal/error"
"k8s.io/kubectl/pkg/kustomize/resource"
"k8s.io/kubectl/pkg/kustomize/transformers"
"k8s.io/kubectl/pkg/kustomize/types"
"k8s.io/kubectl/pkg/loader"
"github.com/kubernetes-sigs/kustomize/pkg/constants"
interror "github.com/kubernetes-sigs/kustomize/pkg/internal/error"
"github.com/kubernetes-sigs/kustomize/pkg/loader"
"github.com/kubernetes-sigs/kustomize/pkg/resource"
"github.com/kubernetes-sigs/kustomize/pkg/transformers"
"github.com/kubernetes-sigs/kustomize/pkg/types"
)
type Application interface {

View File

@@ -22,14 +22,14 @@ import (
"reflect"
"testing"
"github.com/kubernetes-sigs/kustomize/pkg/constants"
"github.com/kubernetes-sigs/kustomize/pkg/loader"
"github.com/kubernetes-sigs/kustomize/pkg/loader/loadertest"
"github.com/kubernetes-sigs/kustomize/pkg/resource"
"github.com/kubernetes-sigs/kustomize/pkg/types"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/kubectl/pkg/kustomize/constants"
"k8s.io/kubectl/pkg/kustomize/resource"
"k8s.io/kubectl/pkg/kustomize/types"
"k8s.io/kubectl/pkg/loader"
"k8s.io/kubectl/pkg/loader/loadertest"
)
func setupTest(t *testing.T) loader.Loader {

View File

@@ -23,8 +23,8 @@ import (
"github.com/spf13/cobra"
"k8s.io/kubectl/pkg/kustomize/constants"
"k8s.io/kubectl/pkg/kustomize/util/fs"
"github.com/kubernetes-sigs/kustomize/pkg/constants"
"github.com/kubernetes-sigs/kustomize/pkg/util/fs"
)
type addPatchOptions struct {

View File

@@ -23,8 +23,8 @@ import (
"strings"
"k8s.io/kubectl/pkg/kustomize/constants"
"k8s.io/kubectl/pkg/kustomize/util/fs"
"github.com/kubernetes-sigs/kustomize/pkg/constants"
"github.com/kubernetes-sigs/kustomize/pkg/util/fs"
)
const (

View File

@@ -23,8 +23,8 @@ import (
"github.com/spf13/cobra"
"k8s.io/kubectl/pkg/kustomize/constants"
"k8s.io/kubectl/pkg/kustomize/util/fs"
"github.com/kubernetes-sigs/kustomize/pkg/constants"
"github.com/kubernetes-sigs/kustomize/pkg/util/fs"
)
type addResourceOptions struct {

View File

@@ -23,8 +23,8 @@ import (
"strings"
"k8s.io/kubectl/pkg/kustomize/constants"
"k8s.io/kubectl/pkg/kustomize/util/fs"
"github.com/kubernetes-sigs/kustomize/pkg/constants"
"github.com/kubernetes-sigs/kustomize/pkg/util/fs"
)
const (

View File

@@ -26,11 +26,11 @@ import (
"errors"
"k8s.io/kubectl/pkg/kustomize/app"
"k8s.io/kubectl/pkg/kustomize/constants"
kutil "k8s.io/kubectl/pkg/kustomize/util"
"k8s.io/kubectl/pkg/kustomize/util/fs"
"k8s.io/kubectl/pkg/loader"
"github.com/kubernetes-sigs/kustomize/pkg/app"
"github.com/kubernetes-sigs/kustomize/pkg/constants"
"github.com/kubernetes-sigs/kustomize/pkg/loader"
kutil "github.com/kubernetes-sigs/kustomize/pkg/util"
"github.com/kubernetes-sigs/kustomize/pkg/util/fs"
)
type buildOptions struct {

View File

@@ -27,9 +27,9 @@ import (
"github.com/ghodss/yaml"
"github.com/kubernetes-sigs/kustomize/pkg/constants"
"github.com/kubernetes-sigs/kustomize/pkg/util/fs"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/kubectl/pkg/kustomize/constants"
"k8s.io/kubectl/pkg/kustomize/util/fs"
)
type buildTestCase struct {

View File

@@ -21,9 +21,9 @@ import (
"io"
"os"
"github.com/kubernetes-sigs/kustomize/pkg/util/fs"
"github.com/kubernetes-sigs/kustomize/version"
"github.com/spf13/cobra"
"k8s.io/kubectl/cmd/kustomize/version"
"k8s.io/kubectl/pkg/kustomize/util/fs"
)
// NewDefaultCommand returns the default (aka root) command for kustomize command.

View File

@@ -22,10 +22,10 @@ import (
"github.com/spf13/cobra"
"k8s.io/kubectl/pkg/kustomize/configmapandsecret"
"k8s.io/kubectl/pkg/kustomize/constants"
"k8s.io/kubectl/pkg/kustomize/types"
"k8s.io/kubectl/pkg/kustomize/util/fs"
"github.com/kubernetes-sigs/kustomize/pkg/configmapandsecret"
"github.com/kubernetes-sigs/kustomize/pkg/constants"
"github.com/kubernetes-sigs/kustomize/pkg/types"
"github.com/kubernetes-sigs/kustomize/pkg/util/fs"
)
func newCmdAddConfigMap(errOut io.Writer, fsys fs.FileSystem) *cobra.Command {

View File

@@ -19,8 +19,8 @@ package commands
import (
"testing"
"k8s.io/kubectl/pkg/kustomize/types"
"k8s.io/kubectl/pkg/kustomize/util/fs"
"github.com/kubernetes-sigs/kustomize/pkg/types"
"github.com/kubernetes-sigs/kustomize/pkg/util/fs"
)
func TestNewAddConfigMapIsNotNil(t *testing.T) {

View File

@@ -23,11 +23,11 @@ import (
"github.com/spf13/cobra"
"k8s.io/kubectl/pkg/kustomize/app"
"k8s.io/kubectl/pkg/kustomize/constants"
"k8s.io/kubectl/pkg/kustomize/util"
"k8s.io/kubectl/pkg/kustomize/util/fs"
"k8s.io/kubectl/pkg/loader"
"github.com/kubernetes-sigs/kustomize/pkg/app"
"github.com/kubernetes-sigs/kustomize/pkg/constants"
"github.com/kubernetes-sigs/kustomize/pkg/loader"
"github.com/kubernetes-sigs/kustomize/pkg/util"
"github.com/kubernetes-sigs/kustomize/pkg/util/fs"
"k8s.io/utils/exec"
)

View File

@@ -27,8 +27,8 @@ import (
"github.com/ghodss/yaml"
"github.com/kubernetes-sigs/kustomize/pkg/util/fs"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/kubectl/pkg/kustomize/util/fs"
)
type DiffTestCase struct {

View File

@@ -22,9 +22,9 @@ import (
"errors"
"github.com/kubernetes-sigs/kustomize/pkg/constants"
"github.com/kubernetes-sigs/kustomize/pkg/util/fs"
"github.com/spf13/cobra"
"k8s.io/kubectl/pkg/kustomize/constants"
"k8s.io/kubectl/pkg/kustomize/util/fs"
)
const kustomizationTemplate = `

View File

@@ -22,8 +22,8 @@ import (
"github.com/spf13/cobra"
"k8s.io/kubectl/pkg/kustomize/constants"
"k8s.io/kubectl/pkg/kustomize/util/fs"
"github.com/kubernetes-sigs/kustomize/pkg/constants"
"github.com/kubernetes-sigs/kustomize/pkg/util/fs"
)
type setNamePrefixOptions struct {

View File

@@ -23,8 +23,8 @@ import (
"strings"
"k8s.io/kubectl/pkg/kustomize/constants"
"k8s.io/kubectl/pkg/kustomize/util/fs"
"github.com/kubernetes-sigs/kustomize/pkg/constants"
"github.com/kubernetes-sigs/kustomize/pkg/util/fs"
)
const (

View File

@@ -24,10 +24,10 @@ import (
"github.com/ghodss/yaml"
"k8s.io/kubectl/pkg/kustomize/constants"
interror "k8s.io/kubectl/pkg/kustomize/internal/error"
"k8s.io/kubectl/pkg/kustomize/types"
"k8s.io/kubectl/pkg/kustomize/util/fs"
"github.com/kubernetes-sigs/kustomize/pkg/constants"
interror "github.com/kubernetes-sigs/kustomize/pkg/internal/error"
"github.com/kubernetes-sigs/kustomize/pkg/types"
"github.com/kubernetes-sigs/kustomize/pkg/util/fs"
)
type kustomizationFile struct {

View File

@@ -21,9 +21,9 @@ import (
"strings"
"testing"
"k8s.io/kubectl/pkg/kustomize/constants"
"k8s.io/kubectl/pkg/kustomize/types"
"k8s.io/kubectl/pkg/kustomize/util/fs"
"github.com/kubernetes-sigs/kustomize/pkg/constants"
"github.com/kubernetes-sigs/kustomize/pkg/types"
"github.com/kubernetes-sigs/kustomize/pkg/util/fs"
)
func TestWriteAndRead(t *testing.T) {

View File

@@ -25,13 +25,13 @@ import (
"path/filepath"
"time"
cutil "github.com/kubernetes-sigs/kustomize/pkg/configmapandsecret/util"
"github.com/kubernetes-sigs/kustomize/pkg/hash"
"github.com/kubernetes-sigs/kustomize/pkg/resource"
"github.com/kubernetes-sigs/kustomize/pkg/types"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime"
cutil "k8s.io/kubectl/pkg/kustomize/configmapandsecret/util"
"k8s.io/kubectl/pkg/kustomize/hash"
"k8s.io/kubectl/pkg/kustomize/resource"
"k8s.io/kubectl/pkg/kustomize/types"
)
// MakeConfigmapAndGenerateName makes a configmap and returns the configmap and the name appended with a hash.

View File

@@ -21,10 +21,10 @@ import (
"reflect"
"testing"
"github.com/kubernetes-sigs/kustomize/pkg/types"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/kubectl/pkg/kustomize/types"
)
func makeEnvConfigMap(name string) *corev1.ConfigMap {

View File

@@ -20,7 +20,7 @@ import (
"strings"
"testing"
"k8s.io/kubectl/pkg/kustomize/constants"
"github.com/kubernetes-sigs/kustomize/pkg/constants"
)
func TestConfigmapError_Error(t *testing.T) {

View File

@@ -21,7 +21,7 @@ import (
"strings"
"testing"
"k8s.io/kubectl/pkg/kustomize/constants"
"github.com/kubernetes-sigs/kustomize/pkg/constants"
)
func TestKustomizationError_Error(t *testing.T) {

View File

@@ -20,7 +20,7 @@ import (
"strings"
"testing"
"k8s.io/kubectl/pkg/kustomize/constants"
"github.com/kubernetes-sigs/kustomize/pkg/constants"
)
func TestPatchError_Error(t *testing.T) {

View File

@@ -20,7 +20,7 @@ import (
"strings"
"testing"
"k8s.io/kubectl/pkg/kustomize/constants"
"github.com/kubernetes-sigs/kustomize/pkg/constants"
)
func TestResourceError_Error(t *testing.T) {

View File

@@ -21,7 +21,7 @@ import (
"os"
"path/filepath"
"k8s.io/kubectl/pkg/kustomize/util/fs"
"github.com/kubernetes-sigs/kustomize/pkg/util/fs"
)
const currentDir = "."

View File

@@ -21,7 +21,7 @@ import (
"reflect"
"testing"
"k8s.io/kubectl/pkg/kustomize/util/fs"
"github.com/kubernetes-sigs/kustomize/pkg/util/fs"
)
func initializeRootLoader(fakefs fs.FileSystem) Loader {

View File

@@ -19,8 +19,8 @@ package loadertest
import (
"os"
"k8s.io/kubectl/pkg/kustomize/util/fs"
"k8s.io/kubectl/pkg/loader"
"github.com/kubernetes-sigs/kustomize/pkg/loader"
"github.com/kubernetes-sigs/kustomize/pkg/util/fs"
)
// FakeLoader encapsulates the delegate Loader and the fake file system.

View File

@@ -17,7 +17,7 @@ limitations under the License.
package resource
import (
"k8s.io/kubectl/pkg/loader"
"github.com/kubernetes-sigs/kustomize/pkg/loader"
)
// NewFromResources returns a ResourceCollection given a resource path slice from kustomization file.

View File

@@ -21,10 +21,10 @@ import (
"reflect"
"testing"
"github.com/kubernetes-sigs/kustomize/pkg/loader/loadertest"
"github.com/kubernetes-sigs/kustomize/pkg/types"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/kubectl/pkg/kustomize/types"
"k8s.io/kubectl/pkg/loader/loadertest"
)
func TestNewFromPaths(t *testing.T) {

View File

@@ -20,11 +20,11 @@ import (
"fmt"
"strings"
cutil "github.com/kubernetes-sigs/kustomize/pkg/configmapandsecret/util"
"github.com/kubernetes-sigs/kustomize/pkg/loader"
"github.com/kubernetes-sigs/kustomize/pkg/types"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/util/validation"
cutil "k8s.io/kubectl/pkg/kustomize/configmapandsecret/util"
"k8s.io/kubectl/pkg/kustomize/types"
"k8s.io/kubectl/pkg/loader"
)
func newFromConfigMap(l loader.Loader, cm types.ConfigMapArgs) (*Resource, error) {

View File

@@ -20,11 +20,11 @@ import (
"reflect"
"testing"
"github.com/kubernetes-sigs/kustomize/pkg/loader/loadertest"
"github.com/kubernetes-sigs/kustomize/pkg/resource"
"github.com/kubernetes-sigs/kustomize/pkg/types"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/kubectl/pkg/kustomize/resource"
"k8s.io/kubectl/pkg/kustomize/types"
"k8s.io/kubectl/pkg/loader/loadertest"
)
func TestNewFromConfigMaps(t *testing.T) {

View File

@@ -19,9 +19,9 @@ package resource
import (
"encoding/json"
"github.com/kubernetes-sigs/kustomize/pkg/types"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/kubectl/pkg/kustomize/types"
)
// Resource represents a Kubernetes Resource Object for ex. Deployment, Server

View File

@@ -23,8 +23,8 @@ import (
"path/filepath"
"time"
"github.com/kubernetes-sigs/kustomize/pkg/types"
corev1 "k8s.io/api/core/v1"
"k8s.io/kubectl/pkg/kustomize/types"
)
func newFromSecretGenerator(p string, s types.SecretArgs) (*Resource, error) {

View File

@@ -21,10 +21,10 @@ import (
"reflect"
"testing"
"github.com/kubernetes-sigs/kustomize/pkg/types"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/kubectl/pkg/kustomize/types"
)
func TestNewFromSecretGenerators(t *testing.T) {

View File

@@ -23,9 +23,9 @@ import (
"github.com/golang/glog"
"github.com/kubernetes-sigs/kustomize/pkg/constants"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
k8syaml "k8s.io/apimachinery/pkg/util/yaml"
"k8s.io/kubectl/pkg/kustomize/constants"
)
// decode decodes a list of objects in byte array format

View File

@@ -21,9 +21,9 @@ import (
"reflect"
"testing"
"github.com/kubernetes-sigs/kustomize/pkg/types"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/kubectl/pkg/kustomize/types"
)
func TestDecodeToResourceCollection(t *testing.T) {

View File

@@ -20,8 +20,8 @@ import (
"errors"
"fmt"
"k8s.io/kubectl/pkg/kustomize/resource"
"k8s.io/kubectl/pkg/kustomize/types"
"github.com/kubernetes-sigs/kustomize/pkg/resource"
"github.com/kubernetes-sigs/kustomize/pkg/types"
)
// mapTransformer contains a map string->string and path configs

View File

@@ -20,9 +20,9 @@ import (
"reflect"
"testing"
"github.com/kubernetes-sigs/kustomize/pkg/resource"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/kubectl/pkg/kustomize/resource"
)
func TestLabelsRun(t *testing.T) {

View File

@@ -16,7 +16,7 @@ limitations under the License.
package transformers
import "k8s.io/kubectl/pkg/kustomize/resource"
import "github.com/kubernetes-sigs/kustomize/pkg/resource"
// multiTransformer contains a list of transformers.
type multiTransformer struct {

View File

@@ -20,12 +20,12 @@ import (
"encoding/json"
"fmt"
"github.com/kubernetes-sigs/kustomize/pkg/hash"
"github.com/kubernetes-sigs/kustomize/pkg/resource"
"github.com/kubernetes-sigs/kustomize/pkg/types"
"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/kubectl/pkg/kustomize/hash"
"k8s.io/kubectl/pkg/kustomize/resource"
"k8s.io/kubectl/pkg/kustomize/types"
)
// nameHashTransformer contains the prefix and the path config for each field that

View File

@@ -20,9 +20,9 @@ import (
"reflect"
"testing"
"github.com/kubernetes-sigs/kustomize/pkg/resource"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/kubectl/pkg/kustomize/resource"
)
func TestNameHashTransformer(t *testing.T) {

View File

@@ -20,9 +20,9 @@ import (
"errors"
"fmt"
"github.com/kubernetes-sigs/kustomize/pkg/resource"
"github.com/kubernetes-sigs/kustomize/pkg/types"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/kubectl/pkg/kustomize/resource"
"k8s.io/kubectl/pkg/kustomize/types"
)
// nameReferenceTransformer contains the referencing info between 2 GroupVersionKinds

View File

@@ -20,9 +20,9 @@ import (
"reflect"
"testing"
"github.com/kubernetes-sigs/kustomize/pkg/resource"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/kubectl/pkg/kustomize/resource"
)
func TestNameReferenceRun(t *testing.T) {

View File

@@ -16,7 +16,7 @@ limitations under the License.
package transformers
import "k8s.io/kubectl/pkg/kustomize/resource"
import "github.com/kubernetes-sigs/kustomize/pkg/resource"
// noOpTransformer contains a no-op transformer.
type noOpTransformer struct{}

View File

@@ -22,11 +22,11 @@ import (
jsonpatch "github.com/evanphx/json-patch"
"github.com/kubernetes-sigs/kustomize/pkg/resource"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/strategicpatch"
"k8s.io/client-go/kubernetes/scheme"
"k8s.io/kubectl/pkg/kustomize/resource"
)
// overlayTransformer contains a map of overlay objects

View File

@@ -21,9 +21,9 @@ import (
"strings"
"testing"
"github.com/kubernetes-sigs/kustomize/pkg/resource"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/kubectl/pkg/kustomize/resource"
)
func TestOverlayRun(t *testing.T) {

View File

@@ -20,8 +20,8 @@ import (
"errors"
"fmt"
"k8s.io/kubectl/pkg/kustomize/resource"
"k8s.io/kubectl/pkg/kustomize/types"
"github.com/kubernetes-sigs/kustomize/pkg/resource"
"github.com/kubernetes-sigs/kustomize/pkg/types"
)
// namePrefixTransformer contains the prefix and the path config for each field that

View File

@@ -20,9 +20,9 @@ import (
"reflect"
"testing"
"github.com/kubernetes-sigs/kustomize/pkg/resource"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/kubectl/pkg/kustomize/resource"
)
func TestPrefixNameRun(t *testing.T) {

View File

@@ -16,7 +16,7 @@ limitations under the License.
package transformers
import "k8s.io/kubectl/pkg/kustomize/resource"
import "github.com/kubernetes-sigs/kustomize/pkg/resource"
// Transformer can transform objects.
type Transformer interface {

View File

@@ -20,8 +20,8 @@ import (
"fmt"
"reflect"
"k8s.io/kubectl/pkg/kustomize/resource"
"k8s.io/kubectl/pkg/kustomize/types"
"github.com/kubernetes-sigs/kustomize/pkg/resource"
"github.com/kubernetes-sigs/kustomize/pkg/types"
)
func compareMap(m1, m2 resource.ResourceCollection) error {

View File

@@ -22,8 +22,8 @@ import (
"github.com/ghodss/yaml"
"k8s.io/kubectl/pkg/kustomize/resource"
"k8s.io/kubectl/pkg/kustomize/types"
"github.com/kubernetes-sigs/kustomize/pkg/resource"
"github.com/kubernetes-sigs/kustomize/pkg/types"
)
// Encode encodes the map `in` and output the encoded objects separated by `---`.

View File

@@ -21,10 +21,10 @@ import (
"reflect"
"testing"
"github.com/kubernetes-sigs/kustomize/pkg/resource"
"github.com/kubernetes-sigs/kustomize/pkg/types"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/kubectl/pkg/kustomize/resource"
"k8s.io/kubectl/pkg/kustomize/types"
)
func TestEncode(t *testing.T) {