Make types package public.

This commit is contained in:
jregan
2019-10-16 16:36:06 -07:00
parent de6eb14867
commit 07d2500ee3
92 changed files with 87 additions and 126 deletions

View File

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

View File

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

View File

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

View File

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

View File

@@ -9,8 +9,8 @@ import (
"sigs.k8s.io/kustomize/v3/filesys"
"sigs.k8s.io/kustomize/v3/kv"
"sigs.k8s.io/kustomize/v3/pkg/loader"
"sigs.k8s.io/kustomize/v3/pkg/types"
"sigs.k8s.io/kustomize/v3/pkg/validators"
"sigs.k8s.io/kustomize/v3/types"
)
func TestNewAddConfigMapIsNotNil(t *testing.T) {

View File

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

View File

@@ -10,8 +10,8 @@ import (
"sigs.k8s.io/kustomize/v3/filesys"
"sigs.k8s.io/kustomize/v3/pkg/loader"
"sigs.k8s.io/kustomize/v3/pkg/types"
"sigs.k8s.io/kustomize/v3/pkg/validators"
"sigs.k8s.io/kustomize/v3/types"
)
func TestNewCmdAddSecretIsNotNil(t *testing.T) {

View File

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

View File

@@ -11,8 +11,8 @@ import (
"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/testutils"
"sigs.k8s.io/kustomize/v3/filesys"
"sigs.k8s.io/kustomize/v3/pkg/types"
"sigs.k8s.io/kustomize/v3/pkg/validators"
"sigs.k8s.io/kustomize/v3/types"
)
func makeKustomizationFS() filesys.FileSystem {

View File

@@ -6,17 +6,17 @@ package set
import (
"errors"
"regexp"
"sigs.k8s.io/kustomize/v3/types"
"sort"
"strings"
"github.com/spf13/cobra"
"sigs.k8s.io/kustomize/kustomize/v3/internal/commands/kustfile"
"sigs.k8s.io/kustomize/v3/filesys"
"sigs.k8s.io/kustomize/v3/pkg/image"
)
type setImageOptions struct {
imageMap map[string]image.Image
imageMap map[string]types.Image
}
var pattern = regexp.MustCompile("^(.*):([a-zA-Z0-9._-]*)$")
@@ -96,7 +96,7 @@ func (o *setImageOptions) Validate(args []string) error {
return errImageNoArgs
}
o.imageMap = make(map[string]image.Image)
o.imageMap = make(map[string]types.Image)
for _, arg := range args {
@@ -129,7 +129,7 @@ func (o *setImageOptions) RunSetImage(fSys filesys.FileSystem) error {
o.imageMap[im.Name] = im
}
var images []image.Image
var images []types.Image
for _, v := range o.imageMap {
images = append(images, v)
}
@@ -142,13 +142,13 @@ func (o *setImageOptions) RunSetImage(fSys filesys.FileSystem) error {
return mf.Write(m)
}
func parse(arg string) (image.Image, error) {
func parse(arg string) (types.Image, error) {
// matches if there is an image name to overwrite
// <image>=<new-image><:|@><new-tag>
if s := strings.Split(arg, separator); len(s) == 2 {
p, err := parseOverwrite(s[1], true)
return image.Image{
return types.Image{
Name: s[0],
NewName: p.name,
NewTag: p.tag,
@@ -159,7 +159,7 @@ func parse(arg string) (image.Image, error) {
// matches only for <tag|digest> overwrites
// <image><:|@><new-tag>
p, err := parseOverwrite(arg, false)
return image.Image{
return types.Image{
Name: p.name,
NewTag: p.tag,
Digest: p.digest,

View File

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

View File

@@ -15,7 +15,7 @@ import (
"sigs.k8s.io/kustomize/v3/filesys"
"sigs.k8s.io/kustomize/v3/pkg/pgmconfig"
"sigs.k8s.io/kustomize/v3/pkg/types"
"sigs.k8s.io/kustomize/v3/types"
"sigs.k8s.io/yaml"
)

View File

@@ -12,7 +12,7 @@ import (
"sigs.k8s.io/kustomize/v3/filesys"
"sigs.k8s.io/kustomize/v3/pkg/pgmconfig"
"sigs.k8s.io/kustomize/v3/pkg/types"
"sigs.k8s.io/kustomize/v3/types"
)
func TestFieldOrder(t *testing.T) {