Target selectors docs (#2534)

* Eval reference docs

* Resource selectors guide

* Document the available selectors

* SuggestedChanges

* More suggested changes

* Add diagram and suggested changes

* More changes

* Minor changes

* Update eval flag names

* Update flag names

* Add colon

* Update 01-declarative-function-execution.md

* Update docs

* Hold packagePath implementation

Co-authored-by: Frank Farzan <[email protected]>

Author: phanimarupaka

e2e/testdata/fn-eval/selectors/basicpipeline/.expected/exec.sh

@@ -15,4 +15,4 @@
 
 set -eo pipefail
 
-kpt fn eval -i set-namespace:v0.1.3 --name nginx-deployment --kind Deployment -- namespace=staging
+kpt fn eval -i set-namespace:v0.1.3 --match-name nginx-deployment --match-kind Deployment -- namespace=staging

e2e/testdata/fn-eval/selectors/out-of-place-fnchain-unwrap/.expected/exec.sh

@@ -17,6 +17,6 @@
 set -eo pipefail
 
 kpt fn source \
-| kpt fn eval - --image gcr.io/kpt-fn/set-namespace:v0.1.3 --kind Deployment -o stdout -- namespace=staging \
-| kpt fn eval - --image gcr.io/kpt-fn/set-annotations:v0.1.3 --name custom -- foo=bar \
+| kpt fn eval - --image gcr.io/kpt-fn/set-namespace:v0.1.3 --match-kind Deployment -o stdout -- namespace=staging \
+| kpt fn eval - --image gcr.io/kpt-fn/set-annotations:v0.1.3 --match-name custom -- foo=bar \
 | kpt fn eval - --image gcr.io/kpt-fn/set-labels:v0.1.3 -o unwrap -- tier=backend

e2e/testdata/fn-render/selectors/subpkg/.expected/diff.patch

@@ -20,7 +20,6 @@ import (
 	"io/ioutil"
 	"path/filepath"
 
-	"github.com/GoogleContainerTools/kpt/internal/pkg"
 	"github.com/GoogleContainerTools/kpt/internal/types"
 	fnresult "github.com/GoogleContainerTools/kpt/pkg/api/fnresult/v1"
 	kptfilev1 "github.com/GoogleContainerTools/kpt/pkg/api/kptfile/v1"
@@ -141,18 +140,14 @@ type SelectionContext struct {
 }
 
 // SelectInput returns the selected resources based on criteria in selectors
-func SelectInput(input []*yaml.RNode, selectors []kptfilev1.Selector, ctx *SelectionContext) ([]*yaml.RNode, error) {
+func SelectInput(input []*yaml.RNode, selectors []kptfilev1.Selector, _ *SelectionContext) ([]*yaml.RNode, error) {
 	if len(selectors) == 0 {
 		return input, nil
 	}
 	var filteredInput []*yaml.RNode
 	for _, node := range input {
 		for _, selector := range selectors {
-			match, err := isMatch(node, selector, ctx)
-			if err != nil {
-				return nil, err
-			}
-			if match {
+			if isMatch(node, selector) {
 				filteredInput = append(filteredInput, node)
 			}
 		}
@@ -161,14 +156,10 @@ func SelectInput(input []*yaml.RNode, selectors []kptfilev1.Selector, ctx *Selec
 }
 
 // isMatch returns true if the resource matches input selection criteria
-func isMatch(node *yaml.RNode, selector kptfilev1.Selector, ctx *SelectionContext) (bool, error) {
-	pkgPathMatch, err := packagePathMatch(node, selector, ctx.RootPackagePath.String())
-	if err != nil {
-		return false, err
-	}
+func isMatch(node *yaml.RNode, selector kptfilev1.Selector) bool {
 	// keep expanding with new selectors
 	return nameMatch(node, selector) && namespaceMatch(node, selector) &&
-		kindMatch(node, selector) && apiVersionMatch(node, selector) && pkgPathMatch, nil
+		kindMatch(node, selector) && apiVersionMatch(node, selector)
 }
 
 // nameMatch returns true if the resource name matches input selection criteria
@@ -190,13 +181,3 @@ func kindMatch(node *yaml.RNode, selector kptfilev1.Selector) bool {
 func apiVersionMatch(node *yaml.RNode, selector kptfilev1.Selector) bool {
 	return selector.APIVersion == "" || selector.APIVersion == node.GetApiVersion()
 }
-
-// packagePathMatch returns true if the package path of resource matches input selection criteria
-func packagePathMatch(node *yaml.RNode, selector kptfilev1.Selector, rootPackagePath string) (bool, error) {
-	resourcePkgPath, err := pkg.GetPkgPathAnnotation(node)
-	if err != nil {
-		return false, err
-	}
-	// TODO: pmarupaka Make this logic work for WINDOWS
-	return selector.PackagePath == "" || filepath.Join(rootPackagePath, selector.PackagePath) == resourcePkgPath, nil
-}

e2e/testdata/fn-render/selectors/subpkg/.krmignore

@@ -3,7 +3,6 @@ package fnruntime
 import (
 	"testing"
 
-	"github.com/GoogleContainerTools/kpt/internal/types"
 	kptfile "github.com/GoogleContainerTools/kpt/pkg/api/kptfile/v1"
 	"github.com/stretchr/testify/assert"
 	"sigs.k8s.io/kustomize/kyaml/yaml"
@@ -115,35 +114,14 @@ spec:
 			},
 			expected: false,
 		},
-		{
-			name: "packagePath match",
-			input: `apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: nginx-deployment
-  annotations:
-    internal.config.k8s.io/kpt-resource-id: "0"
-    internal.config.kubernetes.io/package-path: "/path/to/root/pkg/db"
-spec:
-  replicas: 3`,
-			selector: kptfile.Selector{
-				PackagePath: "./db",
-			},
-			expected: true,
-		},
 	}
 
 	for i := range tests {
 		tc := tests[i]
 		t.Run(tc.name, func(t *testing.T) {
 			node, err := yaml.Parse(tc.input)
 			assert.NoError(t, err)
-			var rootPackagePath string
-			if tc.selector.PackagePath != "" {
-				rootPackagePath = "/path/to/root/pkg"
-			}
-			actual, err := isMatch(node, tc.selector, &SelectionContext{RootPackagePath: types.UniquePath(rootPackagePath)})
-			assert.NoError(t, err)
+			actual := isMatch(node, tc.selector)
 			assert.Equal(t, tc.expected, actual)
 		})
 	}