From 97e7cb15129f672be9376e39886d8716cfc33832 Mon Sep 17 00:00:00 2001 From: Natasha Sarkar Date: Tue, 27 Jul 2021 17:56:58 -0700 Subject: [PATCH] remove annotations added by the kyaml reader --- api/krusty/fnplugin_test.go | 15 --------------- api/resource/resource.go | 5 +++++ 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/api/krusty/fnplugin_test.go b/api/krusty/fnplugin_test.go index 1dd8521997..eca491056b 100644 --- a/api/krusty/fnplugin_test.go +++ b/api/krusty/fnplugin_test.go @@ -63,7 +63,6 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - config.kubernetes.io/path: deployment_nginx.yaml tshirt-size: small labels: app: nginx @@ -146,8 +145,6 @@ type: Opaque apiVersion: policy/v1beta1 kind: PodDisruptionBudget metadata: - annotations: - config.kubernetes.io/path: config/demo-budget_poddisruptionbudget.yaml labels: app: cockroachdb name: demo @@ -162,8 +159,6 @@ spec: apiVersion: v1 kind: Service metadata: - annotations: - config.kubernetes.io/path: config/demo-public_service.yaml labels: app: cockroachdb name: demo @@ -184,7 +179,6 @@ apiVersion: v1 kind: Service metadata: annotations: - config.kubernetes.io/path: config/demo_service.yaml prometheus.io/path: _status/vars prometheus.io/port: "8080" prometheus.io/scrape: "true" @@ -209,8 +203,6 @@ spec: apiVersion: apps/v1 kind: StatefulSet metadata: - annotations: - config.kubernetes.io/path: config/demo_statefulset.yaml labels: app: cockroachdb name: demo @@ -383,7 +375,6 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - config.kubernetes.io/path: deployment_nginx.yaml tshirt-size: small labels: app: nginx @@ -450,8 +441,6 @@ data: apiVersion: v1 kind: Namespace metadata: - annotations: - config.kubernetes.io/path: namespace_my-namespace.yaml labels: my-ns-name: function-test name: my-namespace @@ -459,8 +448,6 @@ metadata: apiVersion: v1 kind: Namespace metadata: - annotations: - config.kubernetes.io/path: namespace_another-namespace.yaml labels: my-ns-name: function-test name: another-namespace @@ -508,8 +495,6 @@ data: value: value kind: ConfigMap metadata: - annotations: - config.kubernetes.io/path: configmap_env.yaml name: env `) } diff --git a/api/resource/resource.go b/api/resource/resource.go index 470ab457d0..e8c19161a1 100644 --- a/api/resource/resource.go +++ b/api/resource/resource.go @@ -13,6 +13,7 @@ import ( "sigs.k8s.io/kustomize/api/internal/utils" "sigs.k8s.io/kustomize/api/types" "sigs.k8s.io/kustomize/kyaml/kio" + "sigs.k8s.io/kustomize/kyaml/kio/kioutil" "sigs.k8s.io/kustomize/kyaml/resid" kyaml "sigs.k8s.io/kustomize/kyaml/yaml" "sigs.k8s.io/yaml" @@ -35,6 +36,10 @@ var BuildAnnotations = []string{ utils.BuildAnnotationAllowKindChange, utils.BuildAnnotationsRefBy, utils.BuildAnnotationsGenOptions, + + kioutil.PathAnnotation, + kioutil.IndexAnnotation, + kioutil.SeqIndentAnnotation, } func (r *Resource) ResetRNode(incoming *Resource) {