From 9567d7ef169aac216a2f359db6f760922ec4060a Mon Sep 17 00:00:00 2001 From: Phani Teja Marupaka Date: Tue, 30 Jun 2020 17:00:53 -0700 Subject: [PATCH] Remove count field, convert error to warning --- .../internal/commands/cmdcreatesetter_test.go | 43 ++++++++++++++++--- .../commands/e2e/create_setter_test.go | 1 - kyaml/setters2/settersutil/settercreator.go | 6 +-- 3 files changed, 41 insertions(+), 9 deletions(-) diff --git a/cmd/config/internal/commands/cmdcreatesetter_test.go b/cmd/config/internal/commands/cmdcreatesetter_test.go index 7f3c58930..4669daa15 100644 --- a/cmd/config/internal/commands/cmdcreatesetter_test.go +++ b/cmd/config/internal/commands/cmdcreatesetter_test.go @@ -55,7 +55,6 @@ openAPI: name: replicas value: "3" setBy: me - count: 1 `, expectedResources: ` apiVersion: apps/v1 @@ -66,6 +65,44 @@ spec: replicas: 3 # {"$openapi":"replicas"} `, }, + + { + name: "add replicas no match", + args: []string{"replicas", "3", "--description", "hello world", "--set-by", "me"}, + input: ` +apiVersion: apps/v1 +kind: Deployment +metadata: + name: nginx-deployment +spec: + foo: 2 + `, + inputOpenAPI: ` +apiVersion: v1alpha1 +kind: Example +`, + expectedOpenAPI: ` +apiVersion: v1alpha1 +kind: Example +openAPI: + definitions: + io.k8s.cli.setters.replicas: + description: hello world + x-k8s-cli: + setter: + name: replicas + value: "3" + setBy: me + `, + expectedResources: ` +apiVersion: apps/v1 +kind: Deployment +metadata: + name: nginx-deployment +spec: + foo: 2 + `, + }, { name: "error if substitution with same name exists", args: []string{"my-image", "3", "--description", "hello world", "--set-by", "me"}, @@ -118,7 +155,6 @@ openAPI: name: replicas value: "3" setBy: me - count: 1 `, expectedResources: ` apiVersion: apps/v1 @@ -190,7 +226,6 @@ openAPI: - b - c setBy: me - count: 2 `, expectedResources: ` apiVersion: example.com/v1beta1 @@ -290,7 +325,6 @@ openAPI: - b - c setBy: me - count: 1 `, expectedResources: ` apiVersion: example.com/v1beta1 @@ -330,7 +364,6 @@ openAPI: name: replicas value: "3" setBy: me - count: 1 `, expectedResources: ` apiVersion: apps/v1 diff --git a/cmd/config/internal/commands/e2e/create_setter_test.go b/cmd/config/internal/commands/e2e/create_setter_test.go index 9cfeacc3a..999ec0eeb 100644 --- a/cmd/config/internal/commands/e2e/create_setter_test.go +++ b/cmd/config/internal/commands/e2e/create_setter_test.go @@ -49,7 +49,6 @@ openAPI: setter: name: replicas value: "3" - count: 1 `, }, }, diff --git a/kyaml/setters2/settersutil/settercreator.go b/kyaml/setters2/settersutil/settercreator.go index c168c51e7..7f123e1c7 100644 --- a/kyaml/setters2/settersutil/settercreator.go +++ b/kyaml/setters2/settersutil/settercreator.go @@ -4,9 +4,9 @@ package settersutil import ( + "fmt" "io/ioutil" - "sigs.k8s.io/kustomize/kyaml/errors" "sigs.k8s.io/kustomize/kyaml/fieldmeta" "sigs.k8s.io/kustomize/kyaml/kio" "sigs.k8s.io/kustomize/kyaml/openapi" @@ -65,7 +65,7 @@ func (c SetterCreator) Create(openAPIPath, resourcesPath string) error { Outputs: []kio.Writer{inout}, }.Execute() if a.Count == 0 { - return errors.Errorf("created setter doesn't match any fields") + fmt.Printf("setter %s doesn't match any field in resources, but creating setter definition\n", c.Name) } if err != nil { return err @@ -74,7 +74,7 @@ func (c SetterCreator) Create(openAPIPath, resourcesPath string) error { // Update the OpenAPI definitions to hace the setter sd := setters2.SetterDefinition{ Name: c.Name, Value: c.FieldValue, SetBy: c.SetBy, Description: c.Description, - Count: a.Count, Type: c.Type, Schema: schema, Required: c.Required, + Type: c.Type, Schema: schema, Required: c.Required, } if err := sd.AddToFile(openAPIPath); err != nil { return err