Add builtin label transformer.

pkg/target/kusttarget.go

@@ -1,20 +1,8 @@
-/*
-Copyright 2018 The Kubernetes Authors.
+// Copyright 2019 The Kubernetes Authors.
+// SPDX-License-Identifier: Apache-2.0
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Package target implements state for the set of all resources to customize.
+// Package target implements state for the set of all
+// resources to customize.
 package target
 
 import (
@@ -355,12 +343,6 @@ func (kt *KustTarget) newTransformer(
 	r = append(r, t)
 	r = append(r, transformers.NewNamespaceTransformer(
 		string(kt.kustomization.Namespace), tConfig.NameSpace))
-	t, err = transformers.NewLabelsMapTransformer(
-		kt.kustomization.CommonLabels, tConfig.CommonLabels)
-	if err != nil {
-		return nil, err
-	}
-	r = append(r, t)
 	t, err = transformers.NewAnnotationsMapTransformer(
 		kt.kustomization.CommonAnnotations, tConfig.CommonAnnotations)
 	if err != nil {

pkg/target/kusttarget_configplugin.go

@@ -63,11 +63,11 @@ func (kt *KustTarget) configureBuiltinTransformers(
 	//   with tests:
 	//   patch SMP
 	//   patch JSON
-	//   labels
 	//   annos
 	configurators := []transformerConfigurator{
 		kt.configureBuiltinNameTransformer,
 		kt.configureBuiltinImageTagTransformer,
+		kt.configureBuiltinLabelTransformer,
 	}
 	var result []transformers.Transformer
 	for _, f := range configurators {
@@ -122,6 +122,24 @@ func (kt *KustTarget) configureBuiltinConfigMapGenerator() (
 	return
 }
 
+func (kt *KustTarget) configureBuiltinLabelTransformer(
+	tConfig *config.TransformerConfig) (
+	result []transformers.Transformer, err error) {
+	var c struct {
+		Labels     map[string]string
+		FieldSpecs []config.FieldSpec
+	}
+	c.Labels = kt.kustomization.CommonLabels
+	c.FieldSpecs = tConfig.CommonLabels
+	p := builtin.NewLabelTransformerPlugin()
+	err = kt.configureBuiltinPlugin(p, c, "label")
+	if err != nil {
+		return nil, err
+	}
+	result = append(result, p)
+	return
+}
+
 func (kt *KustTarget) configureBuiltinNameTransformer(
 	tConfig *config.TransformerConfig) (
 	result []transformers.Transformer, err error) {