From 199763dec8e8416311299ff97bb8c8894106f4d7 Mon Sep 17 00:00:00 2001 From: Jingfang Liu Date: Wed, 30 Jan 2019 09:48:12 -0800 Subject: [PATCH] add group name to kustomize.config.k8s.io --- docs/kustomization.yaml | 2 +- pkg/commands/kustfile/kustomizationfile_test.go | 6 +++--- pkg/fs/fakefs.go | 2 +- pkg/target/configmaps_test.go | 10 +++++----- pkg/target/crd_test.go | 4 ++-- pkg/target/generatormergeandreplace_test.go | 6 +++--- pkg/target/kusttarget_test.go | 2 +- pkg/target/multiplepatch_test.go | 4 ++-- pkg/target/namespacedgenerators_test.go | 2 +- pkg/target/utils_for_test.go | 2 +- pkg/target/variableref_test.go | 8 ++++---- pkg/types/kustomization.go | 2 +- 12 files changed, 25 insertions(+), 25 deletions(-) diff --git a/docs/kustomization.yaml b/docs/kustomization.yaml index 15f03864c..781da106e 100644 --- a/docs/kustomization.yaml +++ b/docs/kustomization.yaml @@ -32,7 +32,7 @@ # visible in configuration reviews. # ---------------------------------------------------- # apiVersion and kind of Kustomization -apiVersion: v1beta1 +apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization # Adds namespace to all resources. diff --git a/pkg/commands/kustfile/kustomizationfile_test.go b/pkg/commands/kustfile/kustomizationfile_test.go index d2dd19a45..79e3a5da3 100644 --- a/pkg/commands/kustfile/kustomizationfile_test.go +++ b/pkg/commands/kustfile/kustomizationfile_test.go @@ -127,7 +127,7 @@ func TestPreserveComments(t *testing.T) { `# shem qing some comments # This is some comment we should preserve # don't delete it -apiVersion: v1beta1 +apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - pod.yaml @@ -181,7 +181,7 @@ resources: # See which field this comment goes into - service.yaml -APIVersion: v1beta1 +apiVersion: kustomize.config.k8s.io/v1beta1 kind: kustomization # something you may want to keep @@ -219,7 +219,7 @@ resources: - pod.yaml - service.yaml -apiVersion: v1beta1 +apiVersion: kustomize.config.k8s.io/v1beta1 kind: kustomization # something you may want to keep diff --git a/pkg/fs/fakefs.go b/pkg/fs/fakefs.go index 1a8fad667..59c0966b2 100644 --- a/pkg/fs/fakefs.go +++ b/pkg/fs/fakefs.go @@ -40,7 +40,7 @@ func MakeFakeFS() *fakeFs { } // kustomizationContent is used in tests. -const kustomizationContent = `apiVersion: v1beta1 +const kustomizationContent = `apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namePrefix: some-prefix nameSuffix: some-suffix diff --git a/pkg/target/configmaps_test.go b/pkg/target/configmaps_test.go index 4de2ae326..9d62a6847 100644 --- a/pkg/target/configmaps_test.go +++ b/pkg/target/configmaps_test.go @@ -23,7 +23,7 @@ import ( func TestGenerator1(t *testing.T) { th := NewKustTestHarness(t, "/app/overlay") th.writeK("/app/base1", ` -apiVersion: v1beta1 +apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namePrefix: p1- configMapGenerator: @@ -33,7 +33,7 @@ configMapGenerator: - from=base `) th.writeK("/app/base2", ` -apiVersion: v1beta1 +apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namePrefix: p2- configMapGenerator: @@ -43,7 +43,7 @@ configMapGenerator: - from=base `) th.writeK("/app/overlay/o1", ` -apiVersion: v1beta1 +apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization bases: - ../../base1 @@ -54,7 +54,7 @@ configMapGenerator: - from=overlay `) th.writeK("/app/overlay/o2", ` -apiVersion: v1beta1 +apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization bases: - ../../base2 @@ -65,7 +65,7 @@ configMapGenerator: - from=overlay `) th.writeK("/app/overlay", ` -apiVersion: v1beta1 +apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization bases: - o1 diff --git a/pkg/target/crd_test.go b/pkg/target/crd_test.go index f6d955134..a8e9a757d 100644 --- a/pkg/target/crd_test.go +++ b/pkg/target/crd_test.go @@ -22,7 +22,7 @@ import ( func writeBaseWithCrd(th *KustTestHarness) { th.writeK("/app/base", ` -apiVersion: v1beta1 +apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization crds: - mycrd.json @@ -273,7 +273,7 @@ func TestCrdWithOverlay(t *testing.T) { th := NewKustTestHarness(t, "/app/overlay") writeBaseWithCrd(th) th.writeK("/app/overlay", ` -apiVersion: v1beta1 +apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namePrefix: prod- bases: diff --git a/pkg/target/generatormergeandreplace_test.go b/pkg/target/generatormergeandreplace_test.go index a08ad37dc..028dd63e9 100644 --- a/pkg/target/generatormergeandreplace_test.go +++ b/pkg/target/generatormergeandreplace_test.go @@ -23,7 +23,7 @@ import ( func TestSimpleBase(t *testing.T) { th := NewKustTestHarness(t, "/app/base") th.writeK("/app/base", ` -apiVersion: v1beta1 +apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namePrefix: team-foo- commonLabels: @@ -163,7 +163,7 @@ spec: func makeBaseWithGenerators(th *KustTestHarness) { th.writeK("/app", ` -apiVersion: v1beta1 +apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namePrefix: team-foo- commonLabels: @@ -341,7 +341,7 @@ spec: name: configmap-in-overlay `) th.writeK("/overlay", ` -apiVersion: v1beta1 +apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namePrefix: staging- commonLabels: diff --git a/pkg/target/kusttarget_test.go b/pkg/target/kusttarget_test.go index 7d720c666..de60fe016 100644 --- a/pkg/target/kusttarget_test.go +++ b/pkg/target/kusttarget_test.go @@ -33,7 +33,7 @@ import ( const ( kustomizationContent1 = ` -apiVersion: v1beta1 +apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namePrefix: foo- nameSuffix: -bar diff --git a/pkg/target/multiplepatch_test.go b/pkg/target/multiplepatch_test.go index ac4e350c6..6b5ed8ddb 100644 --- a/pkg/target/multiplepatch_test.go +++ b/pkg/target/multiplepatch_test.go @@ -23,7 +23,7 @@ import ( func makeCommonFileForMultiplePatchTest(th *KustTestHarness) { th.writeK("/app/base", ` -apiVersion: v1beta1 +apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namePrefix: team-foo- commonLabels: @@ -80,7 +80,7 @@ spec: app: nginx `) th.writeK("/app/overlay/staging", ` -apiVersion: v1beta1 +apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namePrefix: staging- commonLabels: diff --git a/pkg/target/namespacedgenerators_test.go b/pkg/target/namespacedgenerators_test.go index 7977d6737..2d46f0727 100644 --- a/pkg/target/namespacedgenerators_test.go +++ b/pkg/target/namespacedgenerators_test.go @@ -23,7 +23,7 @@ import ( func TestNamespacedGenerator(t *testing.T) { th := NewKustTestHarness(t, "/app") th.writeK("/app", ` -apiVersion: v1beta1 +apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization configMapGenerator: - name: the-non-default-namespace-map diff --git a/pkg/target/utils_for_test.go b/pkg/target/utils_for_test.go index e3541e6a7..d62598a3b 100644 --- a/pkg/target/utils_for_test.go +++ b/pkg/target/utils_for_test.go @@ -75,7 +75,7 @@ func (th *KustTestHarness) writeF(dir string, content string) { func (th *KustTestHarness) writeK(dir string, content string) { th.writeF(filepath.Join(dir, constants.KustomizationFileNames[0]), ` -apiVersion: v1beta1 +apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization `+content) } diff --git a/pkg/target/variableref_test.go b/pkg/target/variableref_test.go index f923a026a..afe6ea3cb 100644 --- a/pkg/target/variableref_test.go +++ b/pkg/target/variableref_test.go @@ -23,7 +23,7 @@ import ( func TestVariableRef(t *testing.T) { th := NewKustTestHarness(t, "/app/overlay/staging") th.writeK("/app/base", ` -apiVersion: v1beta1 +apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namePrefix: base- resources: @@ -323,7 +323,7 @@ spec: storage: 1Gi `) th.writeK("/app/overlay/staging", ` -apiVersion: v1beta1 +apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization namePrefix: dev- bases: @@ -583,7 +583,7 @@ spec: func TestVariableRefIngress(t *testing.T) { th := NewKustTestHarness(t, "/app/overlay") th.writeK("/app/base", ` -apiVersion: v1beta1 +apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - deployment.yaml @@ -657,7 +657,7 @@ spec: targetPort: http `) th.writeK("/app/overlay", ` -apiVersion: v1beta1 +apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization nameprefix: kustomized- bases: diff --git a/pkg/types/kustomization.go b/pkg/types/kustomization.go index 4c75b0a43..c78fb9f89 100644 --- a/pkg/types/kustomization.go +++ b/pkg/types/kustomization.go @@ -25,7 +25,7 @@ import ( ) const ( - KustomizationVersion = "v1beta1" + KustomizationVersion = "kustomize.config.k8s.io/v1beta1" KustomizationKind = "Kustomization" )