mirror of
https://github.com/kubernetes-sigs/kustomize.git
synced 2026-06-11 17:12:51 +00:00
fix the bug for setting annotations when triggering transformers
This commit is contained in:
@@ -208,12 +208,10 @@ func (p *ExecPlugin) getResMapWithIdAnnotation(rm resmap.ResMap) (resmap.ResMap,
|
|||||||
}
|
}
|
||||||
annotations := r.GetAnnotations()
|
annotations := r.GetAnnotations()
|
||||||
if annotations == nil {
|
if annotations == nil {
|
||||||
annotations = map[string]string{
|
annotations = make(map[string]string)
|
||||||
idAnnotation: string(idString),
|
|
||||||
}
|
|
||||||
r.SetAnnotations(annotations)
|
|
||||||
}
|
}
|
||||||
annotations[idAnnotation] = string(idString)
|
annotations[idAnnotation] = string(idString)
|
||||||
|
r.SetAnnotations(annotations)
|
||||||
}
|
}
|
||||||
return inputRM, nil
|
return inputRM, nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -113,6 +113,9 @@ func TestSedTransformer(t *testing.T) {
|
|||||||
th := kusttest_test.NewKustTestHarnessWithPluginConfig(
|
th := kusttest_test.NewKustTestHarnessWithPluginConfig(
|
||||||
t, "/app", plugin.ActivePluginConfig())
|
t, "/app", plugin.ActivePluginConfig())
|
||||||
th.WriteK("/app", `
|
th.WriteK("/app", `
|
||||||
|
resources:
|
||||||
|
- configmap.yaml
|
||||||
|
|
||||||
transformers:
|
transformers:
|
||||||
- sed-transformer.yaml
|
- sed-transformer.yaml
|
||||||
|
|
||||||
@@ -134,12 +137,32 @@ s/$FOO/foo/g
|
|||||||
s/$BAR/bar/g
|
s/$BAR/bar/g
|
||||||
`)
|
`)
|
||||||
|
|
||||||
|
th.WriteF("/app/configmap.yaml", `
|
||||||
|
apiVersion: v1
|
||||||
|
kind: ConfigMap
|
||||||
|
metadata:
|
||||||
|
name: configmap-a
|
||||||
|
annotations:
|
||||||
|
kustomize.k8s.io/Generated: "false"
|
||||||
|
data:
|
||||||
|
foo: $FOO
|
||||||
|
`)
|
||||||
|
|
||||||
m, err := th.MakeKustTarget().MakeCustomizedResMap()
|
m, err := th.MakeKustTarget().MakeCustomizedResMap()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("Err: %v", err)
|
t.Fatalf("Err: %v", err)
|
||||||
}
|
}
|
||||||
th.AssertActualEqualsExpected(m, `
|
th.AssertActualEqualsExpected(m, `
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
|
data:
|
||||||
|
foo: foo
|
||||||
|
kind: ConfigMap
|
||||||
|
metadata:
|
||||||
|
annotations:
|
||||||
|
kustomize.k8s.io/Generated: "false"
|
||||||
|
name: configmap-a
|
||||||
|
---
|
||||||
|
apiVersion: v1
|
||||||
data:
|
data:
|
||||||
BAR: bar
|
BAR: bar
|
||||||
FOO: foo
|
FOO: foo
|
||||||
|
|||||||
Reference in New Issue
Block a user