Move kustomize back to v3

This commit is contained in:
Jeffrey Regan
2019-10-24 10:16:41 -07:00
parent ce7ebe3299
commit 02f9b98b5a
38 changed files with 61 additions and 58 deletions

View File

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

View File

@@ -202,7 +202,6 @@ k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
k8s.io/kube-openapi v0.0.0-20190918143330-0270cf2f1c1d h1:Xpe6sK+RY4ZgCTyZ3y273UmFmURhjtoJiwOMbQsXitY=
k8s.io/kube-openapi v0.0.0-20190918143330-0270cf2f1c1d/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0=
sigs.k8s.io/kustomize/api v0.1.1 h1:W2dWXex2MhF4/EZNokZllvet2RejCHqdAFklufN7VTg=
sigs.k8s.io/kustomize/api v0.1.1/go.mod h1:FyfJD1q1QMjC/TvK78b6cCtZB+mbpnGIo9YOvbucJes=
sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=

View File

@@ -16,11 +16,11 @@ import (
"sigs.k8s.io/kustomize/api/pgmconfig"
"sigs.k8s.io/kustomize/api/resmap"
"sigs.k8s.io/kustomize/api/resource"
"sigs.k8s.io/kustomize/kustomize/internal/commands/build"
"sigs.k8s.io/kustomize/kustomize/internal/commands/config"
"sigs.k8s.io/kustomize/kustomize/internal/commands/create"
"sigs.k8s.io/kustomize/kustomize/internal/commands/edit"
"sigs.k8s.io/kustomize/kustomize/internal/commands/version"
"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/build"
"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/config"
"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/create"
"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/edit"
"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/version"
)
// NewDefaultCommand returns the default (aka root) command for kustomize command.

View File

@@ -13,8 +13,8 @@ import (
"sigs.k8s.io/kustomize/api/filesys"
"sigs.k8s.io/kustomize/api/ifc"
"sigs.k8s.io/kustomize/api/pgmconfig"
"sigs.k8s.io/kustomize/kustomize/internal/commands/kustfile"
"sigs.k8s.io/kustomize/kustomize/internal/commands/util"
"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/util"
)
type createFlags struct {

View File

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

View File

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

View File

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

View File

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

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/internal/commands/kustfile"
testutils_test "sigs.k8s.io/kustomize/kustomize/internal/commands/testutils"
"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
testutils_test "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
)
func makeKustomization(t *testing.T) *types.Kustomization {

View File

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

View File

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

View File

@@ -9,8 +9,8 @@ import (
"github.com/spf13/cobra"
"sigs.k8s.io/kustomize/api/filesys"
"sigs.k8s.io/kustomize/kustomize/internal/commands/kustfile"
"sigs.k8s.io/kustomize/kustomize/internal/commands/util"
"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/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/internal/commands/testutils"
testutils_test "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/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/internal/commands/kustfile"
"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
)
// newCmdAddConfigMap returns a new command.

View File

@@ -8,7 +8,7 @@ import (
"strings"
"sigs.k8s.io/kustomize/api/filesys"
"sigs.k8s.io/kustomize/kustomize/internal/commands/util"
"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/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/internal/commands/kustfile"
"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
)
// newCmdAddSecret returns a new command.

View File

@@ -9,10 +9,10 @@ import (
"sigs.k8s.io/kustomize/api/ifc"
"sigs.k8s.io/kustomize/api/kv"
"sigs.k8s.io/kustomize/api/loader"
"sigs.k8s.io/kustomize/kustomize/internal/commands/edit/add"
"sigs.k8s.io/kustomize/kustomize/internal/commands/edit/fix"
"sigs.k8s.io/kustomize/kustomize/internal/commands/edit/remove"
"sigs.k8s.io/kustomize/kustomize/internal/commands/edit/set"
"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/edit/add"
"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/edit/fix"
"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/edit/remove"
"sigs.k8s.io/kustomize/kustomize/v3/internal/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/internal/commands/kustfile"
"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
)
// NewCmdFix returns an instance of 'fix' subcommand.

View File

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

View File

@@ -11,7 +11,7 @@ import (
"sigs.k8s.io/kustomize/api/filesys"
"sigs.k8s.io/kustomize/api/pgmconfig"
"sigs.k8s.io/kustomize/api/types"
"sigs.k8s.io/kustomize/kustomize/internal/commands/kustfile"
"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/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/internal/commands/kustfile"
testutils_test "sigs.k8s.io/kustomize/kustomize/internal/commands/testutils"
"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
testutils_test "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
)
func makeKustomizationFS() filesys.FileSystem {

View File

@@ -10,9 +10,9 @@ import (
"github.com/spf13/cobra"
"sigs.k8s.io/kustomize/api/filesys"
"sigs.k8s.io/kustomize/api/pgmconfig"
"sigs.k8s.io/kustomize/kustomize/internal/commands/edit/patch"
"sigs.k8s.io/kustomize/kustomize/internal/commands/kustfile"
"sigs.k8s.io/kustomize/kustomize/internal/commands/util"
"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/edit/patch"
"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/util"
)
type removePatchOptions struct {

View File

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

View File

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

View File

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

View File

@@ -8,7 +8,7 @@ import (
"github.com/spf13/cobra"
"sigs.k8s.io/kustomize/api/filesys"
"sigs.k8s.io/kustomize/kustomize/internal/commands/kustfile"
"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/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/internal/commands/testutils"
testutils_test "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
)
const (

View File

@@ -8,7 +8,7 @@ import (
"github.com/spf13/cobra"
"sigs.k8s.io/kustomize/api/filesys"
"sigs.k8s.io/kustomize/kustomize/internal/commands/kustfile"
"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/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/internal/commands/testutils"
testutils_test "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
)
const (

View File

@@ -13,7 +13,7 @@ import (
"github.com/spf13/cobra"
"sigs.k8s.io/kustomize/api/filesys"
"sigs.k8s.io/kustomize/kustomize/internal/commands/kustfile"
"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/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/internal/commands/testutils"
testutils_test "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
)
func TestSetImage(t *testing.T) {

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/internal/commands/kustfile"
"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/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/internal/commands/testutils"
testutils_test "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/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/internal/commands/kustfile"
"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/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/internal/commands/testutils"
testutils_test "sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
)
func TestSetReplicas(t *testing.T) {

View File

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

View File

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

View File

@@ -38,8 +38,8 @@ files.
#### Packages
There's only one package in this module. It's called `main`,
and it holds the _kustomize_ executable.
There's only one public package in this module.
It's called `main`, and it holds the _kustomize_ executable.
#### Release artifacts
@@ -113,6 +113,10 @@ The tag appears in the URL, e.g. [pluginator/v1.0.0].
## Release procedure
> TODO: script this, e.g. `go run ./releasing/release.go kustomize minor`
> would look at the tags, bump the minor version, and
> create the right branch, tag, etc. No more bash please.
At any given moment, the repository's master branch is
passing all its tests and contains code one could release.
@@ -151,7 +155,7 @@ Go's [semver]-compatible version tags take the form `v{major}.{minor}.{patch}`:
| major | minor | patch |
| :---: | :---: | :---: |
| API change | enhancements | bug fixes |
| manual update | OK to auto-update | OK to auto-update |
| manual update | maybe auto-update | auto-update encouraged |
- If there are only bug fixes or refactors, increment `patch` from whatever it is now.
- If there are new features, increment `minor`.