Merge branch 'master' into substitutions

cmd/config/ext/ext.go

@@ -0,0 +1,12 @@
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package ext
+
+import "path/filepath"
+
+// GetOpenAPIFile returns the path to the file containing supplementary OpenAPI definitions.
+// Maybe be overridden to configure which file to read OpenAPI definitions from.
+var GetOpenAPIFile = func(args []string) (string, error) {
+	return filepath.Join(args[0], "kustomization"), nil
+}

cmd/config/internal/commands/cmdcreatesetter.go

@@ -5,6 +5,7 @@ package commands
 
 import (
 	"github.com/spf13/cobra"
+	"sigs.k8s.io/kustomize/cmd/config/ext"
 	"sigs.k8s.io/kustomize/cmd/config/internal/generateddocs/commands"
 	"sigs.k8s.io/kustomize/kyaml/kio"
 	"sigs.k8s.io/kustomize/kyaml/setters"
@@ -85,7 +86,7 @@ func (r *CreateSetterRunner) preRunE(c *cobra.Command, args []string) error {
 	}
 	if setterVersion == "v2" {
 		var err error
-		r.OpenAPIFile, err = GetOpenAPIFile(args)
+		r.OpenAPIFile, err = ext.GetOpenAPIFile(args)
 		r.CreateSetter.Description = r.Set.SetPartialField.Description
 		r.CreateSetter.SetBy = r.Set.SetPartialField.SetBy
 		if err != nil {

cmd/config/internal/commands/cmdcreatesetter_test.go

@@ -11,6 +11,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"sigs.k8s.io/kustomize/cmd/config/ext"
 	"sigs.k8s.io/kustomize/cmd/config/internal/commands"
 	"sigs.k8s.io/kustomize/kyaml/openapi"
 )
@@ -77,7 +78,9 @@ kind: Example
 			if !assert.NoError(t, err) {
 				t.FailNow()
 			}
-			commands.GetOpenAPIFile = func(args []string) (s string, err error) {
+			old := ext.GetOpenAPIFile
+			defer func() { ext.GetOpenAPIFile = old }()
+			ext.GetOpenAPIFile = func(args []string) (s string, err error) {
 				return f.Name(), nil
 			}
 

cmd/config/internal/commands/cmdcreatesubstitution.go

@@ -7,6 +7,7 @@ import (
 	"strings"
 
 	"github.com/spf13/cobra"
+	"sigs.k8s.io/kustomize/cmd/config/ext"
 	"sigs.k8s.io/kustomize/kyaml/errors"
 	"sigs.k8s.io/kustomize/kyaml/setters2"
 	"sigs.k8s.io/kustomize/kyaml/setters2/settersutil"
@@ -58,7 +59,7 @@ func (r *CreateSubstitutionRunner) preRunE(c *cobra.Command, args []string) erro
 		return err
 	}
 
-	r.OpenAPIFile, err = GetOpenAPIFile(args)
+	r.OpenAPIFile, err = ext.GetOpenAPIFile(args)
 	if err != nil {
 		return err
 	}

cmd/config/internal/commands/cmdcreatesubstitution_test.go

@@ -11,6 +11,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"sigs.k8s.io/kustomize/cmd/config/ext"
 	"sigs.k8s.io/kustomize/cmd/config/internal/commands"
 	"sigs.k8s.io/kustomize/kyaml/openapi"
 )
@@ -106,7 +107,7 @@ spec:
 		{
 			name: "substitution and create setters 1",
 			args: []string{
-				"image", "something/nginx:1.7.9", "--pattern", "something/IMAGE:TAG",
+				"image", "something/nginx::1.7.9/nginxotherthing", "--pattern", "something/IMAGE::TAG/nginxotherthing",
 				"--value", "IMAGE=image", "--value", "TAG=tag"},
 			input: `
 apiVersion: apps/v1
@@ -119,7 +120,7 @@ spec:
     spec:
       containers:
       - name: nginx
-        image: something/nginx:1.7.9
+        image: something/nginx::1.7.9/nginxotherthing
       - name: sidecar
         image: sidecar:1.7.9
  `,
@@ -146,7 +147,7 @@ openAPI:
       x-k8s-cli:
         substitution:
           name: image
-          pattern: something/IMAGE:TAG
+          pattern: something/IMAGE::TAG/nginxotherthing
           values:
           - marker: IMAGE
             ref: '#/definitions/io.k8s.cli.setters.image'
@@ -164,7 +165,7 @@ spec:
     spec:
       containers:
       - name: nginx
-        image: something/nginx:1.7.9 # {"$ref":"#/definitions/io.k8s.cli.substitutions.image"}
+        image: something/nginx::1.7.9/nginxotherthing # {"$ref":"#/definitions/io.k8s.cli.substitutions.image"}
       - name: sidecar
         image: sidecar:1.7.9
  `,
@@ -186,7 +187,9 @@ spec:
 			if !assert.NoError(t, err) {
 				t.FailNow()
 			}
-			commands.GetOpenAPIFile = func(args []string) (s string, err error) {
+			old := ext.GetOpenAPIFile
+			defer func() { ext.GetOpenAPIFile = old }()
+			ext.GetOpenAPIFile = func(args []string) (s string, err error) {
 				return f.Name(), nil
 			}
 

cmd/config/internal/commands/cmdlistsetters.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/olekukonko/tablewriter"
 	"github.com/spf13/cobra"
+	"sigs.k8s.io/kustomize/cmd/config/ext"
 	"sigs.k8s.io/kustomize/cmd/config/internal/generateddocs/commands"
 	"sigs.k8s.io/kustomize/kyaml/setters"
 	"sigs.k8s.io/kustomize/kyaml/setters2"
@@ -55,7 +56,7 @@ func (r *ListSettersRunner) preRunE(c *cobra.Command, args []string) error {
 func (r *ListSettersRunner) runE(c *cobra.Command, args []string) error {
 	if setterVersion == "v2" {
 		// use setters v2
-		path, err := GetOpenAPIFile(args)
+		path, err := ext.GetOpenAPIFile(args)
 		if err != nil {
 			return err
 		}

cmd/config/internal/commands/cmdlistsetters_test.go

@@ -10,6 +10,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"sigs.k8s.io/kustomize/cmd/config/ext"
 	"sigs.k8s.io/kustomize/cmd/config/internal/commands"
 	"sigs.k8s.io/kustomize/kyaml/openapi"
 )
@@ -261,7 +262,9 @@ spec:
 				t.FailNow()
 			}
 			defer os.Remove(f.Name())
-			commands.GetOpenAPIFile = func(args []string) (s string, err error) {
+			old := ext.GetOpenAPIFile
+			defer func() { ext.GetOpenAPIFile = old }()
+			ext.GetOpenAPIFile = func(args []string) (s string, err error) {
 				err = ioutil.WriteFile(f.Name(), []byte(test.openapi), 0600)
 				if !assert.NoError(t, err) {
 					t.FailNow()

cmd/config/internal/commands/cmdset.go

@@ -6,10 +6,10 @@ package commands
 import (
 	"fmt"
 	"os"
-	"path/filepath"
 
 	"github.com/olekukonko/tablewriter"
 	"github.com/spf13/cobra"
+	"sigs.k8s.io/kustomize/cmd/config/ext"
 	"sigs.k8s.io/kustomize/cmd/config/internal/generateddocs/commands"
 	"sigs.k8s.io/kustomize/kyaml/kio"
 	"sigs.k8s.io/kustomize/kyaml/setters"
@@ -43,10 +43,6 @@ func NewSetRunner(parent string) *SetRunner {
 
 var setterVersion string
 
-var GetOpenAPIFile = func(args []string) (string, error) {
-	return filepath.Join(args[0], "kustomization"), nil
-}
-
 func SetCommand(parent string) *cobra.Command {
 	return NewSetRunner(parent).Command
 }
@@ -100,7 +96,7 @@ func (r *SetRunner) preRunE(c *cobra.Command, args []string) error {
 		r.Set.Value = args[2]
 		r.Set.Description = r.Perform.Description
 		r.Set.SetBy = r.Perform.SetBy
-		r.OpenAPIFile, err = GetOpenAPIFile(args)
+		r.OpenAPIFile, err = ext.GetOpenAPIFile(args)
 		if err != nil {
 			return err
 		}

cmd/config/internal/commands/cmdset_test.go

@@ -11,6 +11,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"sigs.k8s.io/kustomize/cmd/config/ext"
 	"sigs.k8s.io/kustomize/cmd/config/internal/commands"
 	"sigs.k8s.io/kustomize/kyaml/openapi"
 )
@@ -224,7 +225,9 @@ spec:
 			if !assert.NoError(t, err) {
 				t.FailNow()
 			}
-			commands.GetOpenAPIFile = func(args []string) (s string, err error) {
+			old := ext.GetOpenAPIFile
+			defer func() { ext.GetOpenAPIFile = old }()
+			ext.GetOpenAPIFile = func(args []string) (s string, err error) {
 				return f.Name(), nil
 			}
 

releasing/VERSIONS

@@ -6,7 +6,7 @@
 # kyaml version
 export kyaml_major=0
 export kyaml_minor=0
-export kyaml_patch=11
+export kyaml_patch=13
 
 # kstatus version
 export kstatus_major=0
@@ -21,7 +21,7 @@ export api_patch=2
 # cmd/config version
 export cmd_config_major=0
 export cmd_config_minor=0
-export cmd_config_patch=11
+export cmd_config_patch=13
 
 # cmd/kubectl version
 export cmd_kubectl_major=0