diff --git a/api/filters/fieldspec/fieldspec_test.go b/api/filters/fieldspec/fieldspec_test.go index 49f38e6ca..43a4362c7 100644 --- a/api/filters/fieldspec/fieldspec_test.go +++ b/api/filters/fieldspec/fieldspec_test.go @@ -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"), diff --git a/api/filters/refvar/refvar_test.go b/api/filters/refvar/refvar_test.go index 67e1ee03d..fb29dbe95 100644 --- a/api/filters/refvar/refvar_test.go +++ b/api/filters/refvar/refvar_test.go @@ -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 + `'`, diff --git a/cmd/config/internal/commands/e2e/e2e_test.go b/cmd/config/internal/commands/e2e/e2e_test.go index d0bf7d092..8a1f39354 100644 --- a/cmd/config/internal/commands/e2e/e2e_test.go +++ b/cmd/config/internal/commands/e2e/e2e_test.go @@ -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' `, } }, diff --git a/kyaml/kio/kioutil/kioutil.go b/kyaml/kio/kioutil/kioutil.go index 7d1a85273..510ecae18 100644 --- a/kyaml/kio/kioutil/kioutil.go +++ b/kyaml/kio/kioutil/kioutil.go @@ -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) {