kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-09-18 05:17:40 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #4327 from mengqiy/fixanno

Browse Source 
use internal.config.kubernetes.io prefix instead of internal.config.k8s.io
This commit is contained in:
Kubernetes Prow Robot
2021-12-03 10:02:27 -08:00
committed by GitHub
parent fe551be87b 6850408f6c
commit 8c6af9440c
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/filters/fieldspec/fieldspec_test.go
View File

@@ -65,7 +65,7 @@ kind: Bar
xxx:
metadata:
annotations:
internal.config.k8s.io/annotations-migration-resource-id: '0'
internal.config.kubernetes.io/annotations-migration-resource-id: '0'
: cannot set or create an empty field name`,
filter: fieldspec.Filter{
SetValue: filtersutil.SetScalar("e"),
@@ -225,7 +225,7 @@ a:
b: a
metadata:
annotations:
internal.config.k8s.io/annotations-migration-resource-id: '0'
internal.config.kubernetes.io/annotations-migration-resource-id: '0'
: expected sequence or mapping node`,
filter: fieldspec.Filter{
SetValue: filtersutil.SetScalar("e"),

4
api/filters/refvar/refvar_test.go
View File

@@ -251,7 +251,7 @@ metadata:
annotations:
config.kubernetes.io/index: '0'
internal.config.kubernetes.io/index: '0'
internal.config.k8s.io/annotations-migration-resource-id: '0'
internal.config.kubernetes.io/annotations-migration-resource-id: '0'
data:
slice:
- false
@@ -279,7 +279,7 @@ metadata:
annotations:
config.kubernetes.io/index: '0'
internal.config.kubernetes.io/index: '0'
internal.config.k8s.io/annotations-migration-resource-id: '0'
internal.config.kubernetes.io/annotations-migration-resource-id: '0'
data:
1: str
: invalid map key: value='1', tag='` + yaml.NodeTagInt + `'`,

2
cmd/config/internal/commands/e2e/e2e_test.go
View File

@@ -294,7 +294,7 @@ kind: Deployment
metadata:
name: foo
annotations:
internal.config.k8s.io/annotations-migration-resource-id: '1'
internal.config.kubernetes.io/annotations-migration-resource-id: '1'
`,
}
},

2
kyaml/kio/kioutil/kioutil.go
View File

@@ -45,7 +45,7 @@ const (
// InternalAnnotationsMigrationResourceIDAnnotation is used to uniquely identify
// resources during round trip to and from a function execution. We will use it
// to track the internal annotations and reconcile them if needed.
InternalAnnotationsMigrationResourceIDAnnotation = "internal.config.k8s.io/annotations-migration-resource-id"
InternalAnnotationsMigrationResourceIDAnnotation = internalPrefix + "annotations-migration-resource-id"
)
func GetFileAnnotations(rn *yaml.RNode) (string, string, error) {