kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-11 17:12:51 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #4091 from natasha41575/RemovePathAnno

Browse Source 
remove annotations added by the kyaml reader
This commit is contained in:
Kubernetes Prow Robot
2021-07-28 11:28:48 -07:00
committed by GitHub
parent 91b862b556 97e7cb1512
commit 3ebdb3fcef
2 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
api/krusty/fnplugin_test.go
View File

@@ -63,7 +63,6 @@ apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
annotations: annotations:
config.kubernetes.io/path: deployment_nginx.yaml
tshirt-size: small tshirt-size: small
labels: labels:
app: nginx app: nginx
@@ -146,8 +145,6 @@ type: Opaque
apiVersion: policy/v1beta1 apiVersion: policy/v1beta1
kind: PodDisruptionBudget kind: PodDisruptionBudget
metadata: metadata:
annotations:
config.kubernetes.io/path: config/demo-budget_poddisruptionbudget.yaml
labels: labels:
app: cockroachdb app: cockroachdb
name: demo name: demo
@@ -162,8 +159,6 @@ spec:
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
annotations:
config.kubernetes.io/path: config/demo-public_service.yaml
labels: labels:
app: cockroachdb app: cockroachdb
name: demo name: demo
@@ -184,7 +179,6 @@ apiVersion: v1
kind: Service kind: Service
metadata: metadata:
annotations: annotations:
config.kubernetes.io/path: config/demo_service.yaml
prometheus.io/path: _status/vars prometheus.io/path: _status/vars
prometheus.io/port: "8080" prometheus.io/port: "8080"
prometheus.io/scrape: "true" prometheus.io/scrape: "true"
@@ -209,8 +203,6 @@ spec:
apiVersion: apps/v1 apiVersion: apps/v1
kind: StatefulSet kind: StatefulSet
metadata: metadata:
annotations:
config.kubernetes.io/path: config/demo_statefulset.yaml
labels: labels:
app: cockroachdb app: cockroachdb
name: demo name: demo
@@ -383,7 +375,6 @@ apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
annotations: annotations:
config.kubernetes.io/path: deployment_nginx.yaml
tshirt-size: small tshirt-size: small
labels: labels:
app: nginx app: nginx
@@ -450,8 +441,6 @@ data:
apiVersion: v1 apiVersion: v1
kind: Namespace kind: Namespace
metadata: metadata:
annotations:
config.kubernetes.io/path: namespace_my-namespace.yaml
labels: labels:
my-ns-name: function-test my-ns-name: function-test
name: my-namespace name: my-namespace
@@ -459,8 +448,6 @@ metadata:
apiVersion: v1 apiVersion: v1
kind: Namespace kind: Namespace
metadata: metadata:
annotations:
config.kubernetes.io/path: namespace_another-namespace.yaml
labels: labels:
my-ns-name: function-test my-ns-name: function-test
name: another-namespace name: another-namespace
@@ -508,8 +495,6 @@ data:
value: value value: value
kind: ConfigMap kind: ConfigMap
metadata: metadata:
annotations:
config.kubernetes.io/path: configmap_env.yaml
name: env name: env
`) `)
} }

5
api/resource/resource.go
View File

@@ -13,6 +13,7 @@ import (
"sigs.k8s.io/kustomize/api/internal/utils" "sigs.k8s.io/kustomize/api/internal/utils"
"sigs.k8s.io/kustomize/api/types" "sigs.k8s.io/kustomize/api/types"
"sigs.k8s.io/kustomize/kyaml/kio" "sigs.k8s.io/kustomize/kyaml/kio"
"sigs.k8s.io/kustomize/kyaml/kio/kioutil"
"sigs.k8s.io/kustomize/kyaml/resid" "sigs.k8s.io/kustomize/kyaml/resid"
kyaml "sigs.k8s.io/kustomize/kyaml/yaml" kyaml "sigs.k8s.io/kustomize/kyaml/yaml"
"sigs.k8s.io/yaml" "sigs.k8s.io/yaml"
@@ -35,6 +36,10 @@ var BuildAnnotations = []string{
utils.BuildAnnotationAllowKindChange, utils.BuildAnnotationAllowKindChange,
utils.BuildAnnotationsRefBy, utils.BuildAnnotationsRefBy,
utils.BuildAnnotationsGenOptions, utils.BuildAnnotationsGenOptions,
kioutil.PathAnnotation,
kioutil.IndexAnnotation,
kioutil.SeqIndentAnnotation,
} }
func (r *Resource) ResetRNode(incoming *Resource) { func (r *Resource) ResetRNode(incoming *Resource) {