Skip kustomize transformers for paths

Makefile

@@ -1,4 +1,5 @@
-BIN_NAME=kustomize
+KUSTOMIZE_NAME=kustomize
+PLUGINATOR_NAME=pluginator
 
 COVER_FILE=coverage.out
 
@@ -18,10 +19,12 @@ generate-code:
 	./plugin/generateBuiltins.sh $(GOPATH)
 
 build:
-	go build -o $(BIN_NAME) cmd/kustomize/main.go
+	cd pluginator && go build -o $(PLUGINATOR_NAME) .
+	cd kustomize && go build -o $(KUSTOMIZE_NAME) ./main.go
 
 install:
-	go install $(PWD)/cmd/kustomize
+	cd pluginator && go install $(PWD)/pluginator
+	cd kustomize && go install $(PWD)/kustomize
 
 cover:
 	# The plugin directory eludes coverage, and is therefore omitted
@@ -30,8 +33,7 @@ cover:
 
 
 clean:
-	go clean
-	rm -f $(BIN_NAME)
+	cd kustomize && go clean && rm -f $(KUSTOMIZE_NAME)
 	rm -f $(COVER_FILE)
 
 .PHONY: test build install clean generate-code test-go test-lint cover

pkg/gvk/gvk.go

@@ -125,6 +125,25 @@ func (x Gvk) IsLessThan(o Gvk) bool {
 	return x.String() < o.String()
 }
 
+// IsLessThan2 returns true if self is less than the argument.
+func (x Gvk) IsLessThan2(o Gvk) bool {
+	if x.Kind != o.Kind {
+		indexI := typeOrders[x.Kind]
+		indexJ := typeOrders[o.Kind]
+		if indexI != indexJ {
+			return indexI < indexJ
+		}
+		return x.Kind < o.Kind
+	}
+	if x.Group != o.Group {
+		return x.Group != "" && (o.Group == "" || x.Group < o.Group)
+	}
+	if x.Version != o.Version {
+		return x.Version != "" && (o.Version == "" || x.Version < o.Version)
+	}
+	return false
+}
+
 // IsSelected returns true if `selector` selects `x`; otherwise, false.
 // If `selector` and `x` are the same, return true.
 // If `selector` is nil, it is considered a wildcard match, returning true.

pkg/gvk/gvk_test.go

@@ -72,6 +72,10 @@ var lessThanTests = []struct {
 		Gvk{Group: "a", Version: "b", Kind: "ValidatingWebhookConfiguration"}},
 	{Gvk{Group: "a", Version: "b", Kind: "Service"},
 		Gvk{Group: "a", Version: "b", Kind: "APIService"}},
+	{Gvk{Group: "a", Version: "b", Kind: "c"},
+		Gvk{Group: "", Version: "b", Kind: "c"}},
+	{Gvk{Group: "a", Version: "b", Kind: "c"},
+		Gvk{Group: "a", Version: "", Kind: "c"}},
 }
 
 func TestIsLessThan1(t *testing.T) {
@@ -85,6 +89,17 @@ func TestIsLessThan1(t *testing.T) {
 	}
 }
 
+func TestIsLessThan2(t *testing.T) {
+	for _, hey := range lessThanTests {
+		if !hey.x1.IsLessThan2(hey.x2) {
+			t.Fatalf("%v should be less than %v", hey.x1, hey.x2)
+		}
+		if hey.x2.IsLessThan2(hey.x1) {
+			t.Fatalf("%v should not be less than %v", hey.x2, hey.x1)
+		}
+	}
+}
+
 var stringTests = []struct {
 	x Gvk
 	s string

pkg/target/skip_nameprefix_for_kind_test.go

@@ -0,0 +1,70 @@
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package target_test
+
+import (
+	"testing"
+
+	kusttest_test "sigs.k8s.io/kustomize/v3/pkg/kusttest"
+)
+
+// TestNameTransformation_skippingSecrets validates that
+// PrefixSuffixTransformer can skip based on resource kind, and that CustomResourceDefinitions are always skipped.
+// TODO: also the nameref stuff?
+func TestNameTransformation_skippingSecrets(t *testing.T) {
+	th := kusttest_test.NewKustTestHarness(t, "/nameandconfig")
+
+	th.WriteK("/nameandconfig", `
+namePrefix: p1-
+nameSuffix: -s1
+resources:
+- resources.yaml
+configurations:
+- skip-secrets-prefix.yaml
+`)
+
+	th.WriteF("/nameandconfig/resources.yaml", `
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: cm1
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: secret
+---
+kind: CustomResourceDefinition
+metadata:
+  name: my-crd
+`)
+
+	th.WriteF("/nameandconfig/skip-secrets-prefix.yaml", `
+namePrefix:
+- path: metadata/name
+  apiVersion: v1
+  kind: Secret
+  skip: true
+`)
+
+	m, err := th.MakeKustTarget().MakeCustomizedResMap()
+	if err != nil {
+		t.Fatalf("Err: %v", err)
+	}
+	th.AssertActualEqualsExpected(m, `
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: p1-cm1-s1
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: secret
+---
+kind: CustomResourceDefinition
+metadata:
+  name: my-crd
+`)
+}

pkg/transformers/config/defaultconfig/commonlabels.go

@@ -64,6 +64,12 @@ commonLabels:
   group: apps
   kind: Deployment
 
+- path: spec/selector/matchLabels
+  create: false
+  group: extensions
+  version: v1beta1
+  kind: ReplicaSet
+
 - path: spec/selector/matchLabels
   create: true
   kind: ReplicaSet
@@ -72,6 +78,12 @@ commonLabels:
   create: true
   kind: ReplicaSet
 
+- path: spec/selector/matchLabels
+  create: false
+  group: extensions
+  version: v1beta1
+  kind: DaemonSet
+
 - path: spec/selector/matchLabels
   create: true
   kind: DaemonSet
@@ -80,6 +92,12 @@ commonLabels:
   create: true
   kind: DaemonSet
 
+- path: spec/selector/matchLabels
+  create: false
+  group: apps
+  version: v1beta1
+  kind: StatefulSet
+
 - path: spec/selector/matchLabels
   create: true
   group: apps

pkg/transformers/config/defaultconfig/nameprefix.go

@@ -20,5 +20,27 @@ const (
 	namePrefixFieldSpecs = `
 namePrefix:
 - path: metadata/name
+- path: metadata/name
+  kind: CustomResourceDefinition
+  skip: true
+
+# Following merge PR broke backward compatility
+# https://github.com/kubernetes-sigs/kustomize/pull/1526
+- path: metadata/name
+  kind: APIService
+  group: apiregistration.k8s.io
+  skip: true
+
+# Would make sense to skip those
+# by default but would break backward
+# compatility
+#
+# - path: metadata/name
+#   kind: Namespace
+#   skip: true
+# - path: metadata/name
+#   group: storage.k8s.io
+#   kind: StorageClass
+#   skip: true
 `
 )

pkg/transformers/config/defaultconfig/namereference.go

@@ -269,7 +269,7 @@ nameReference:
     kind: Ingress
   - path: spec/backend/serviceName
     kind: Ingress
-  - path: spec/service/name
+  - path: spec/service
     kind: APIService
     group: apiregistration.k8s.io
   - path: webhooks/clientConfig/service

pkg/transformers/config/defaultconfig/namespace.go

@@ -19,11 +19,90 @@ package defaultconfig
 const (
 	namespaceFieldSpecs = `
 namespace:
+# replace or add namespace field
+# on all entities by default
 - path: metadata/namespace
   create: true
+
+# Update namespace if necessary
+# in the subjects fields
 - path: subjects
   kind: RoleBinding
 - path: subjects
   kind: ClusterRoleBinding
+
+# Would make sense to skip those
+# by default but would break backward
+# compatility. 
+# - path: metadata/name
+#   kind: Namespace
+
+# skip those ClusterWide entities
+- path: metadata/namespace
+  kind: APIService
+  skip: true
+- path: metadata/namespace
+  kind: CSIDriver
+  skip: true
+- path: metadata/namespace
+  kind: CSINode
+  skip: true
+- path: metadata/namespace
+  kind: CertificateSigningRequest
+  skip: true
+- path: metadata/namespace
+  kind: ClusterRole
+  skip: true
+- path: metadata/namespace
+  kind: ClusterRoleBinding
+  skip: true
+- path: metadata/namespace
+  kind: ComponentStatus
+  skip: true
+- path: metadata/namespace
+  kind: CustomResourceDefinition
+  skip: true
+- path: metadata/namespace
+  kind: MutatingWebhookConfiguration
+  skip: true
+- path: metadata/namespace
+  kind: Namespace
+  skip: true
+- path: metadata/namespace
+  kind: Node
+  skip: true
+- path: metadata/namespace
+  kind: PersistentVolume
+  skip: true
+- path: metadata/namespace
+  kind: PodSecurityPolicy
+  skip: true
+- path: metadata/namespace
+  kind: PriorityClass
+  skip: true
+- path: metadata/namespace
+  kind: RuntimeClass
+  skip: true
+- path: metadata/namespace
+  kind: SelfSubjectAccessReview
+  skip: true
+- path: metadata/namespace
+  kind: SelfSubjectRulesReview
+  skip: true
+- path: metadata/namespace
+  kind: StorageClass
+  skip: true
+- path: metadata/namespace
+  kind: SubjectAccessReview
+  skip: true
+- path: metadata/namespace
+  kind: TokenReview
+  skip: true
+- path: metadata/namespace
+  kind: ValidatingWebhookConfiguration
+  skip: true
+- path: metadata/namespace
+  kind: VolumeAttachment
+  skip: true
 `
 )

pkg/transformers/config/factory.go

@@ -32,15 +32,26 @@ type Factory struct {
 // if any, with default config.
 func MakeTransformerConfig(
 	ldr ifc.Loader, paths []string) (*TransformerConfig, error) {
-	t1 := MakeDefaultConfig()
+
+	result := &TransformerConfig{}
+	var err error
+
+	//  merge and normalize Default Config
+	defaultcfg := MakeDefaultConfig()
+	result, err = result.Merge(defaultcfg)
+	if err != nil {
+		return nil, err
+	}
 	if len(paths) == 0 {
-		return t1, nil
+		return defaultcfg, nil
 	}
-	t2, err := NewFactory(ldr).FromFiles(paths)
+
+	//  merge and normalize user provided configurations
+	result, err = NewFactory(ldr).FromFiles(result, paths)
 	if err != nil {
 		return nil, err
 	}
-	return t1.Merge(t2)
+	return result, nil
 }
 
 func NewFactory(l ifc.Loader) *Factory {
@@ -56,8 +67,8 @@ func (tf *Factory) loader() ifc.Loader {
 
 // FromFiles returns a TranformerConfig object from a list of files
 func (tf *Factory) FromFiles(
+	result *TransformerConfig,
 	paths []string) (*TransformerConfig, error) {
-	result := &TransformerConfig{}
 	for _, path := range paths {
 		data, err := tf.loader().Load(path)
 		if err != nil {

pkg/transformers/config/factory_test.go

@@ -24,7 +24,8 @@ namePrefix:
 - path: nameprefix/path
   kind: SomeKind
 `))
-	tcfg, err := NewFactory(ldr).FromFiles([]string{"/app/config.yaml"})
+	emptycfg := &TransformerConfig{}
+	tcfg, err := NewFactory(ldr).FromFiles(emptycfg, []string{"/app/config.yaml"})
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}