Skip to content

Commit ff7b47b

Browse files
author
Mengqi Yu
authored
use the right apiVersion according to the spec (#439)
* use the right apiVersion according to the spec * update tests
1 parent 42711f0 commit ff7b47b

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

ts/kpt-functions/src/io_test.ts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ items:
5353
it('parses ResourceList object', () => {
5454
const result = parse(
5555
`
56-
apiVersion: v1
56+
apiVersion: config.kubernetes.io/v1
5757
kind: ResourceList
5858
items:
5959
- apiVersion: v1
@@ -378,7 +378,7 @@ describe('write', () => {
378378
it('writes empty Configs as empty List', () => {
379379
const result = stringify(new Configs(), FileFormat.YAML);
380380

381-
expect(result).toEqual(`apiVersion: v1
381+
expect(result).toEqual(`apiVersion: config.kubernetes.io/v1
382382
kind: ResourceList
383383
metadata:
384384
name: output
@@ -401,7 +401,7 @@ items: []
401401
);
402402

403403
expect(result).toEqual(
404-
`apiVersion: v1
404+
`apiVersion: config.kubernetes.io/v1
405405
kind: ResourceList
406406
metadata:
407407
name: output
@@ -435,7 +435,7 @@ items:
435435
FileFormat.YAML
436436
);
437437

438-
expect(result).toEqual(`apiVersion: v1
438+
expect(result).toEqual(`apiVersion: config.kubernetes.io/v1
439439
kind: ResourceList
440440
metadata:
441441
name: output
@@ -457,7 +457,7 @@ items:
457457

458458
const result = stringify(configs, FileFormat.YAML);
459459

460-
expect(result).toEqual(`apiVersion: v1
460+
expect(result).toEqual(`apiVersion: config.kubernetes.io/v1
461461
kind: ResourceList
462462
metadata:
463463
name: output
@@ -483,7 +483,7 @@ results:
483483
);
484484

485485
expect(result).toEqual(
486-
`apiVersion: v1
486+
`apiVersion: config.kubernetes.io/v1
487487
kind: ResourceList
488488
metadata:
489489
name: output
@@ -510,7 +510,7 @@ items:
510510

511511
const result = stringify(configs, FileFormat.YAML);
512512

513-
expect(result).toEqual(`apiVersion: v1
513+
expect(result).toEqual(`apiVersion: config.kubernetes.io/v1
514514
kind: ResourceList
515515
metadata:
516516
name: output
@@ -541,7 +541,7 @@ results:
541541

542542
const result = stringify(configs, FileFormat.YAML);
543543

544-
expect(result).toEqual(`apiVersion: v1
544+
expect(result).toEqual(`apiVersion: config.kubernetes.io/v1
545545
kind: ResourceList
546546
metadata:
547547
name: output
@@ -574,7 +574,7 @@ results:
574574

575575
const result = stringify(configs, FileFormat.YAML);
576576

577-
expect(result).toEqual(`apiVersion: v1
577+
expect(result).toEqual(`apiVersion: config.kubernetes.io/v1
578578
kind: ResourceList
579579
metadata:
580580
name: output
@@ -595,7 +595,7 @@ results:
595595
const result = stringify(new Configs(), FileFormat.JSON);
596596

597597
expect(result).toEqual(`{
598-
"apiVersion": "v1",
598+
"apiVersion": "config.kubernetes.io/v1",
599599
"kind": "ResourceList",
600600
"metadata": {
601601
"name": "output"
@@ -620,7 +620,7 @@ results:
620620
);
621621

622622
expect(result).toEqual(`{
623-
"apiVersion": "v1",
623+
"apiVersion": "config.kubernetes.io/v1",
624624
"kind": "ResourceList",
625625
"metadata": {
626626
"name": "output"
@@ -660,7 +660,7 @@ results:
660660
);
661661

662662
expect(result).toEqual(`{
663-
"apiVersion": "v1",
663+
"apiVersion": "config.kubernetes.io/v1",
664664
"kind": "ResourceList",
665665
"metadata": {
666666
"name": "output"
@@ -719,7 +719,7 @@ describe('roundtrip', () => {
719719
const stringified = stringify(configs, FileFormat.YAML);
720720

721721
// We want to verify that there are no back-references like &ref and *ref in the output
722-
expect(stringified).toEqual(`apiVersion: v1
722+
expect(stringified).toEqual(`apiVersion: config.kubernetes.io/v1
723723
kind: ResourceList
724724
metadata:
725725
name: output

ts/kpt-functions/src/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ export function kubernetesKey(o: KubernetesObject): string {
376376
* https://github.com/kubernetes-sigs/kustomize/blob/master/cmd/config/docs/api-conventions/functions-spec.md
377377
*/
378378
export class ResourceList implements KubernetesObject {
379-
readonly apiVersion = 'v1';
379+
readonly apiVersion = 'config.kubernetes.io/v1';
380380
readonly kind = 'ResourceList';
381381
readonly metadata = {
382382
name: 'output',

0 commit comments

Comments
 (0)