From 72c7db39f2b087dd1c75658cf580489a35279122 Mon Sep 17 00:00:00 2001 From: jregan Date: Fri, 24 Apr 2020 15:53:53 -0700 Subject: [PATCH] Migrate the label transformer. --- api/builtins/LabelTransformer.go | 19 +++++++++++-------- .../labeltransformer/LabelTransformer.go | 19 +++++++++++-------- plugin/builtin/labeltransformer/go.mod | 1 + 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/api/builtins/LabelTransformer.go b/api/builtins/LabelTransformer.go index 88df34561..eaa7d8a81 100644 --- a/api/builtins/LabelTransformer.go +++ b/api/builtins/LabelTransformer.go @@ -4,9 +4,10 @@ package builtins import ( + "sigs.k8s.io/kustomize/api/filters/labels" "sigs.k8s.io/kustomize/api/resmap" - "sigs.k8s.io/kustomize/api/transform" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/filtersutil" "sigs.k8s.io/yaml" ) @@ -24,14 +25,16 @@ func (p *LabelTransformerPlugin) Config( } func (p *LabelTransformerPlugin) Transform(m resmap.ResMap) error { - t, err := transform.NewMapTransformer( - p.FieldSpecs, - p.Labels, - ) - if err != nil { - return err + for _, r := range m.Resources() { + err := filtersutil.ApplyToJSON(labels.Filter{ + Labels: p.Labels, + FsSlice: p.FieldSpecs, + }, r.Kunstructured) + if err != nil { + return err + } } - return t.Transform(m) + return nil } func NewLabelTransformerPlugin() resmap.TransformerPlugin { diff --git a/plugin/builtin/labeltransformer/LabelTransformer.go b/plugin/builtin/labeltransformer/LabelTransformer.go index df852c497..93697719e 100644 --- a/plugin/builtin/labeltransformer/LabelTransformer.go +++ b/plugin/builtin/labeltransformer/LabelTransformer.go @@ -5,9 +5,10 @@ package main import ( + "sigs.k8s.io/kustomize/api/filters/labels" "sigs.k8s.io/kustomize/api/resmap" - "sigs.k8s.io/kustomize/api/transform" "sigs.k8s.io/kustomize/api/types" + "sigs.k8s.io/kustomize/kyaml/filtersutil" "sigs.k8s.io/yaml" ) @@ -28,12 +29,14 @@ func (p *plugin) Config( } func (p *plugin) Transform(m resmap.ResMap) error { - t, err := transform.NewMapTransformer( - p.FieldSpecs, - p.Labels, - ) - if err != nil { - return err + for _, r := range m.Resources() { + err := filtersutil.ApplyToJSON(labels.Filter{ + Labels: p.Labels, + FsSlice: p.FieldSpecs, + }, r.Kunstructured) + if err != nil { + return err + } } - return t.Transform(m) + return nil } diff --git a/plugin/builtin/labeltransformer/go.mod b/plugin/builtin/labeltransformer/go.mod index 48b93a9e4..e1eeca9c3 100644 --- a/plugin/builtin/labeltransformer/go.mod +++ b/plugin/builtin/labeltransformer/go.mod @@ -4,6 +4,7 @@ go 1.13 require ( sigs.k8s.io/kustomize/api v0.3.1 + sigs.k8s.io/kustomize/kyaml v0.1.5 sigs.k8s.io/yaml v1.1.0 )