Merge pull request #3598 from monopole/majorVersionChangeToV4

Increment major version from v3 to v4
This commit is contained in:
Natasha Sarkar
2021-02-12 14:40:50 -08:00
committed by GitHub
46 changed files with 65 additions and 65 deletions

View File

@@ -14,11 +14,11 @@ import (
"sigs.k8s.io/kustomize/api/provider"
"sigs.k8s.io/kustomize/cmd/config/completion"
"sigs.k8s.io/kustomize/cmd/config/configcobra"
"sigs.k8s.io/kustomize/kustomize/v3/commands/build"
"sigs.k8s.io/kustomize/kustomize/v3/commands/create"
"sigs.k8s.io/kustomize/kustomize/v3/commands/edit"
"sigs.k8s.io/kustomize/kustomize/v3/commands/openapi"
"sigs.k8s.io/kustomize/kustomize/v3/commands/version"
"sigs.k8s.io/kustomize/kustomize/v4/commands/build"
"sigs.k8s.io/kustomize/kustomize/v4/commands/create"
"sigs.k8s.io/kustomize/kustomize/v4/commands/edit"
"sigs.k8s.io/kustomize/kustomize/v4/commands/openapi"
"sigs.k8s.io/kustomize/kustomize/v4/commands/version"
)
// NewDefaultCommand returns the default (aka root) command for kustomize command.

View File

@@ -14,8 +14,8 @@ import (
"sigs.k8s.io/kustomize/api/ifc"
"sigs.k8s.io/kustomize/api/konfig"
"sigs.k8s.io/kustomize/api/loader"
"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/util"
"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/util"
)
type createFlags struct {

View File

@@ -10,7 +10,7 @@ import (
"sigs.k8s.io/kustomize/api/filesys"
"sigs.k8s.io/kustomize/api/provider"
"sigs.k8s.io/kustomize/api/types"
"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
)
var factory = provider.NewDefaultDepProvider().GetKunstructuredFactory()

View File

@@ -10,7 +10,7 @@ import (
"github.com/spf13/cobra"
"sigs.k8s.io/kustomize/api/filesys"
"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
)
type addBaseOptions struct {

View File

@@ -8,8 +8,8 @@ import (
"testing"
"sigs.k8s.io/kustomize/api/filesys"
"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils"
"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils"
)
const (

View File

@@ -10,8 +10,8 @@ import (
"github.com/spf13/cobra"
"sigs.k8s.io/kustomize/api/filesys"
"sigs.k8s.io/kustomize/api/loader"
"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/util"
"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/util"
)
type addComponentOptions struct {

View File

@@ -8,7 +8,7 @@ import (
"testing"
"sigs.k8s.io/kustomize/api/filesys"
testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils"
testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils"
)
const (

View File

@@ -10,8 +10,8 @@ import (
"sigs.k8s.io/kustomize/api/filesys"
"sigs.k8s.io/kustomize/api/konfig"
"sigs.k8s.io/kustomize/api/types"
"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/util"
"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/util"
)
// kindOfAdd is the kind of metadata being added: label or annotation

View File

@@ -10,8 +10,8 @@ import (
"sigs.k8s.io/kustomize/api/filesys"
valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest"
"sigs.k8s.io/kustomize/api/types"
"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils"
"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils"
)
func makeKustomization(t *testing.T) *types.Kustomization {

View File

@@ -10,7 +10,7 @@ import (
"github.com/spf13/cobra"
"sigs.k8s.io/kustomize/api/filesys"
"sigs.k8s.io/kustomize/api/types"
"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
)
type addPatchOptions struct {

View File

@@ -8,7 +8,7 @@ import (
"testing"
"sigs.k8s.io/kustomize/api/filesys"
testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils"
testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils"
)
const (

View File

@@ -10,8 +10,8 @@ import (
"github.com/spf13/cobra"
"sigs.k8s.io/kustomize/api/filesys"
"sigs.k8s.io/kustomize/api/loader"
"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/util"
"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/util"
)
type addResourceOptions struct {

View File

@@ -8,7 +8,7 @@ import (
"testing"
"sigs.k8s.io/kustomize/api/filesys"
testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils"
testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils"
)
const (

View File

@@ -9,8 +9,8 @@ import (
"github.com/spf13/cobra"
"sigs.k8s.io/kustomize/api/filesys"
"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/util"
"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/util"
)
type addTransformerOptions struct {

View File

@@ -9,8 +9,8 @@ import (
"testing"
"sigs.k8s.io/kustomize/api/filesys"
"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils"
"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils"
)
const (

View File

@@ -8,7 +8,7 @@ import (
"sigs.k8s.io/kustomize/api/filesys"
"sigs.k8s.io/kustomize/api/ifc"
"sigs.k8s.io/kustomize/api/types"
"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
)
// newCmdAddConfigMap returns a new command.

View File

@@ -10,7 +10,7 @@ import (
"sigs.k8s.io/kustomize/api/types"
"sigs.k8s.io/kustomize/api/filesys"
"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/util"
"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/util"
)
// flagsAndArgs encapsulates the options for add secret/configmap commands.

View File

@@ -8,7 +8,7 @@ import (
"sigs.k8s.io/kustomize/api/filesys"
"sigs.k8s.io/kustomize/api/ifc"
"sigs.k8s.io/kustomize/api/types"
"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
)
// newCmdAddSecret returns a new command.

View File

@@ -9,11 +9,11 @@ import (
"sigs.k8s.io/kustomize/api/ifc"
"sigs.k8s.io/kustomize/api/kv"
"sigs.k8s.io/kustomize/api/loader"
"sigs.k8s.io/kustomize/kustomize/v3/commands/edit/add"
"sigs.k8s.io/kustomize/kustomize/v3/commands/edit/fix"
"sigs.k8s.io/kustomize/kustomize/v3/commands/edit/listbuiltin"
"sigs.k8s.io/kustomize/kustomize/v3/commands/edit/remove"
"sigs.k8s.io/kustomize/kustomize/v3/commands/edit/set"
"sigs.k8s.io/kustomize/kustomize/v4/commands/edit/add"
"sigs.k8s.io/kustomize/kustomize/v4/commands/edit/fix"
"sigs.k8s.io/kustomize/kustomize/v4/commands/edit/listbuiltin"
"sigs.k8s.io/kustomize/kustomize/v4/commands/edit/remove"
"sigs.k8s.io/kustomize/kustomize/v4/commands/edit/set"
)
// NewCmdEdit returns an instance of 'edit' subcommand.

View File

@@ -6,7 +6,7 @@ package fix
import (
"github.com/spf13/cobra"
"sigs.k8s.io/kustomize/api/filesys"
"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
)
// NewCmdFix returns an instance of 'fix' subcommand.

View File

@@ -9,7 +9,7 @@ import (
"github.com/google/go-cmp/cmp"
"sigs.k8s.io/kustomize/api/filesys"
testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils"
testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils"
)
func TestFix(t *testing.T) {

View File

@@ -11,7 +11,7 @@ import (
"sigs.k8s.io/kustomize/api/filesys"
"sigs.k8s.io/kustomize/api/konfig"
"sigs.k8s.io/kustomize/api/types"
"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
)
// kindOfAdd is the kind of metadata being added: label or annotation

View File

@@ -11,8 +11,8 @@ import (
"sigs.k8s.io/kustomize/api/filesys"
valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest"
"sigs.k8s.io/kustomize/api/types"
"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils"
"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils"
)
func makeKustomizationFS() filesys.FileSystem {

View File

@@ -11,7 +11,7 @@ import (
"sigs.k8s.io/kustomize/api/filesys"
"sigs.k8s.io/kustomize/api/konfig"
"sigs.k8s.io/kustomize/api/types"
"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
)
type removePatchOptions struct {

View File

@@ -7,7 +7,7 @@ import (
"testing"
"sigs.k8s.io/kustomize/api/filesys"
testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils"
testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils"
)
const (

View File

@@ -10,7 +10,7 @@ import (
"github.com/spf13/cobra"
"sigs.k8s.io/kustomize/api/filesys"
"sigs.k8s.io/kustomize/api/konfig"
"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
)
type removeResourceOptions struct {

View File

@@ -7,7 +7,7 @@ import (
"errors"
"testing"
"sigs.k8s.io/kustomize/kustomize/v3/commands/edit/remove_test"
"sigs.k8s.io/kustomize/kustomize/v4/commands/edit/remove_test"
)
func TestRemoveResources(t *testing.T) {

View File

@@ -9,7 +9,7 @@ import (
"github.com/spf13/cobra"
"sigs.k8s.io/kustomize/api/filesys"
"sigs.k8s.io/kustomize/api/konfig"
"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
)
type removeTransformerOptions struct {

View File

@@ -4,7 +4,7 @@ import (
"testing"
"github.com/pkg/errors"
"sigs.k8s.io/kustomize/kustomize/v3/commands/edit/remove_test"
"sigs.k8s.io/kustomize/kustomize/v4/commands/edit/remove_test"
)
func TestRemoveTransformer(t *testing.T) {

View File

@@ -7,7 +7,7 @@ import (
"github.com/spf13/cobra"
"sigs.k8s.io/kustomize/api/filesys"
testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils"
testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils"
)
// Given represents the provided inputs for the test case.

View File

@@ -8,7 +8,7 @@ import (
"github.com/spf13/cobra"
"sigs.k8s.io/kustomize/api/filesys"
"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
)
type setNamePrefixOptions struct {

View File

@@ -8,7 +8,7 @@ import (
"testing"
"sigs.k8s.io/kustomize/api/filesys"
testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils"
testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils"
)
const (

View File

@@ -8,7 +8,7 @@ import (
"github.com/spf13/cobra"
"sigs.k8s.io/kustomize/api/filesys"
"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
)
type setNameSuffixOptions struct {

View File

@@ -8,7 +8,7 @@ import (
"testing"
"sigs.k8s.io/kustomize/api/filesys"
testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils"
testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils"
)
const (

View File

@@ -13,7 +13,7 @@ import (
"github.com/spf13/cobra"
"sigs.k8s.io/kustomize/api/filesys"
"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
)
type setImageOptions struct {

View File

@@ -9,7 +9,7 @@ import (
"testing"
"sigs.k8s.io/kustomize/api/filesys"
testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils"
testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils"
)
func TestSetImage(t *testing.T) {

View File

@@ -10,8 +10,8 @@ import (
"sigs.k8s.io/kustomize/api/filesys"
"sigs.k8s.io/kustomize/api/konfig"
"sigs.k8s.io/kustomize/api/types"
"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/util"
"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/util"
)
type setLabelOptions struct {

View File

@@ -9,8 +9,8 @@ import (
"sigs.k8s.io/kustomize/api/filesys"
valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest"
"sigs.k8s.io/kustomize/api/types"
"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils"
"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils"
)
func makeKustomization(t *testing.T) *types.Kustomization {

View File

@@ -11,7 +11,7 @@ import (
"github.com/spf13/cobra"
"sigs.k8s.io/kustomize/api/filesys"
"sigs.k8s.io/kustomize/api/ifc"
"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
)
type setNamespaceOptions struct {

View File

@@ -10,7 +10,7 @@ import (
"sigs.k8s.io/kustomize/api/filesys"
valtest_test "sigs.k8s.io/kustomize/api/testutils/valtest"
testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils"
testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils"
)
const (

View File

@@ -12,7 +12,7 @@ import (
"github.com/spf13/cobra"
"sigs.k8s.io/kustomize/api/filesys"
"sigs.k8s.io/kustomize/api/types"
"sigs.k8s.io/kustomize/kustomize/v3/commands/internal/kustfile"
"sigs.k8s.io/kustomize/kustomize/v4/commands/internal/kustfile"
)
type setReplicasOptions struct {

View File

@@ -9,7 +9,7 @@ import (
"testing"
"sigs.k8s.io/kustomize/api/filesys"
testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils"
testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils"
)
func TestSetReplicas(t *testing.T) {

View File

@@ -13,7 +13,7 @@ import (
"sigs.k8s.io/kustomize/api/filesys"
"sigs.k8s.io/kustomize/api/konfig"
"sigs.k8s.io/kustomize/api/types"
testutils_test "sigs.k8s.io/kustomize/kustomize/v3/commands/internal/testutils"
testutils_test "sigs.k8s.io/kustomize/kustomize/v4/commands/internal/testutils"
)
func TestFieldOrder(t *testing.T) {

View File

@@ -8,7 +8,7 @@ import (
"github.com/spf13/cobra"
"sigs.k8s.io/kustomize/cmd/config/configcobra"
"sigs.k8s.io/kustomize/kustomize/v3/commands/openapi/info"
"sigs.k8s.io/kustomize/kustomize/v4/commands/openapi/info"
)
// NewCmdOpenAPI makes a new openapi command.

View File

@@ -1,4 +1,4 @@
module sigs.k8s.io/kustomize/kustomize/v3
module sigs.k8s.io/kustomize/kustomize/v4
go 1.15

View File

@@ -7,7 +7,7 @@ package main
import (
"os"
"sigs.k8s.io/kustomize/kustomize/v3/commands"
"sigs.k8s.io/kustomize/kustomize/v4/commands"
)
func main() {