update the pr to handle the case when the setter to be deleted is used in substitution

kyaml/setters2/settersutil/deletecreator_test.go

@@ -0,0 +1,107 @@
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package settersutil
+
+import (
+	"io/ioutil"
+	"os"
+	"strings"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+var openAPIFile = `
+openAPI:
+  definitions:
+    io.k8s.cli.setters.image:
+      x-k8s-cli:
+        setter:
+          name: image
+          value: "2"
+    io.k8s.cli.setters.tag:
+      x-k8s-cli:
+        setter:
+          name: tag
+          value: "sometag"
+
+`
+
+var resourceFile = `
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: nginx-deployment
+  annotations:
+    image: 3 # {"$openapi":"image"}
+spec:
+  image: 3 # {"$openapi":"image"}
+`
+
+func TestDeleterCreator_Delete(t *testing.T) {
+	openAPI, err := ioutil.TempFile("", "openAPI.yaml")
+	if !assert.NoError(t, err) {
+		t.FailNow()
+	}
+	defer os.Remove(openAPI.Name())
+	//write openapi to temp dir
+	err = ioutil.WriteFile(openAPI.Name(), []byte(openAPIFile), 0666)
+	if !assert.NoError(t, err) {
+		t.FailNow()
+	}
+
+	//write resource file to temp dir
+	resource, err := ioutil.TempFile("", "k8s-cli-*.yaml")
+	if !assert.NoError(t, err) {
+		t.FailNow()
+	}
+	defer os.Remove(resource.Name())
+	err = ioutil.WriteFile(resource.Name(), []byte(resourceFile), 0666)
+	if !assert.NoError(t, err) {
+		t.FailNow()
+	}
+
+	//add a delete creator
+	dc := DeleterCreator{
+		Name: "image",
+	}
+
+	err = dc.Delete(openAPI.Name(), resource.Name())
+	if !assert.NoError(t, err) {
+		t.FailNow()
+	}
+
+	actualOpenAPI, err := ioutil.ReadFile(openAPI.Name())
+	if err != nil {
+		t.FailNow()
+	}
+
+	actualResource, err := ioutil.ReadFile(resource.Name())
+	if err != nil {
+		t.FailNow()
+	}
+
+	expectedOpenAPI := `
+openAPI:
+  definitions:
+    io.k8s.cli.setters.tag:
+      x-k8s-cli:
+        setter:
+          name: tag
+          value: "sometag"
+`
+	expectedResoure := `
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: nginx-deployment
+  annotations:
+    image: 3
+spec:
+  image: 3
+`
+
+	assert.Equal(t, strings.TrimSpace(expectedOpenAPI), strings.TrimSpace(string(actualOpenAPI)))
+	assert.Equal(t, strings.TrimSpace(expectedResoure), strings.TrimSpace(string(actualResource)))
+}

kyaml/setters2/settersutil/deletercreator.go

@@ -0,0 +1,42 @@
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package settersutil
+
+import (
+	"sigs.k8s.io/kustomize/kyaml/kio"
+	"sigs.k8s.io/kustomize/kyaml/openapi"
+	"sigs.k8s.io/kustomize/kyaml/setters2"
+)
+
+// DeleterCreator delete a setter in the OpenAPI definitions, and removes references
+// to the setter from matching resource fields.
+type DeleterCreator struct {
+	// Name is the name of the setter to create or update.
+	Name string
+}
+
+func (d DeleterCreator) Delete(openAPIPath, resourcesPath string) error {
+	dd := setters2.DeleterDefinition{
+		Name: d.Name,
+	}
+	if err := dd.DeleteFromFile(openAPIPath); err != nil {
+		return err
+	}
+
+	// Load the updated definitions
+	if err := openapi.AddSchemaFromFile(openAPIPath); err != nil {
+		return err
+	}
+
+	// Update the resources with the deleter reference
+	inout := &kio.LocalPackageReadWriter{PackagePath: resourcesPath}
+	return kio.Pipeline{
+		Inputs: []kio.Reader{inout},
+		Filters: []kio.Filter{kio.FilterAll(
+			&setters2.Delete{
+				FieldName: d.Name,
+			})},
+		Outputs: []kio.Writer{inout},
+	}.Execute()
+}