diff --git a/pkg/commands/build/testdata/testcase-base-only/in/kustomization.yaml b/pkg/commands/build/testdata/testcase-base-only/in/kustomization.yaml index f416f4fad..75bcee92f 100644 --- a/pkg/commands/build/testdata/testcase-base-only/in/kustomization.yaml +++ b/pkg/commands/build/testdata/testcase-base-only/in/kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: v1 +apiVersion: v1beta1 kind: Kustomization namePrefix: team-foo- commonLabels: diff --git a/pkg/commands/build/testdata/testcase-configmaps/base/myapp/mycomponent/kustomization.yaml b/pkg/commands/build/testdata/testcase-configmaps/base/myapp/mycomponent/kustomization.yaml index feb3ada5f..fe386b14b 100644 --- a/pkg/commands/build/testdata/testcase-configmaps/base/myapp/mycomponent/kustomization.yaml +++ b/pkg/commands/build/testdata/testcase-configmaps/base/myapp/mycomponent/kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: v1 +apiVersion: v1beta1 kind: Kustomization namePrefix: p1- configMapGenerator: diff --git a/pkg/commands/build/testdata/testcase-configmaps/base/myapp/mycomponent2/kustomization.yaml b/pkg/commands/build/testdata/testcase-configmaps/base/myapp/mycomponent2/kustomization.yaml index a4041a390..18b0347bb 100644 --- a/pkg/commands/build/testdata/testcase-configmaps/base/myapp/mycomponent2/kustomization.yaml +++ b/pkg/commands/build/testdata/testcase-configmaps/base/myapp/mycomponent2/kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: v1 +apiVersion: v1beta1 kind: Kustomization namePrefix: p2- configMapGenerator: diff --git a/pkg/commands/build/testdata/testcase-configmaps/overlay/dev/kustomization.yaml b/pkg/commands/build/testdata/testcase-configmaps/overlay/dev/kustomization.yaml index 580d08d91..e34a4767b 100644 --- a/pkg/commands/build/testdata/testcase-configmaps/overlay/dev/kustomization.yaml +++ b/pkg/commands/build/testdata/testcase-configmaps/overlay/dev/kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: v1 +apiVersion: v1beta1 kind: Kustomization bases: - myapp/mycomponent diff --git a/pkg/commands/build/testdata/testcase-configmaps/overlay/dev/myapp/mycomponent/kustomization.yaml b/pkg/commands/build/testdata/testcase-configmaps/overlay/dev/myapp/mycomponent/kustomization.yaml index 77569d895..f14834eab 100644 --- a/pkg/commands/build/testdata/testcase-configmaps/overlay/dev/myapp/mycomponent/kustomization.yaml +++ b/pkg/commands/build/testdata/testcase-configmaps/overlay/dev/myapp/mycomponent/kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: v1 +apiVersion: v1beta1 kind: Kustomization bases: - ../../../../base/myapp/mycomponent diff --git a/pkg/commands/build/testdata/testcase-configmaps/overlay/dev/myapp/mycomponent2/kustomization.yaml b/pkg/commands/build/testdata/testcase-configmaps/overlay/dev/myapp/mycomponent2/kustomization.yaml index 76c6468c3..f66340c38 100644 --- a/pkg/commands/build/testdata/testcase-configmaps/overlay/dev/myapp/mycomponent2/kustomization.yaml +++ b/pkg/commands/build/testdata/testcase-configmaps/overlay/dev/myapp/mycomponent2/kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: v1 +apiVersion: v1beta1 kind: Kustomization bases: - ../../../../base/myapp/mycomponent2 diff --git a/pkg/commands/build/testdata/testcase-crds/crd/kustomization.yaml b/pkg/commands/build/testdata/testcase-crds/crd/kustomization.yaml index 3c7934039..b5f7ff246 100644 --- a/pkg/commands/build/testdata/testcase-crds/crd/kustomization.yaml +++ b/pkg/commands/build/testdata/testcase-crds/crd/kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: v1 +apiVersion: v1beta1 kind: Kustomization crds: - mycrd.json diff --git a/pkg/commands/build/testdata/testcase-generators-namespace/in/kustomization.yaml b/pkg/commands/build/testdata/testcase-generators-namespace/in/kustomization.yaml index a0a2585f9..5dc4dba90 100644 --- a/pkg/commands/build/testdata/testcase-generators-namespace/in/kustomization.yaml +++ b/pkg/commands/build/testdata/testcase-generators-namespace/in/kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: v1 +apiVersion: v1beta1 kind: Kustomization configMapGenerator: - name: the-non-default-namespace-map diff --git a/pkg/commands/build/testdata/testcase-multiple-patches-conflict/in/overlay/kustomization.yaml b/pkg/commands/build/testdata/testcase-multiple-patches-conflict/in/overlay/kustomization.yaml index 207e52395..f153f0692 100644 --- a/pkg/commands/build/testdata/testcase-multiple-patches-conflict/in/overlay/kustomization.yaml +++ b/pkg/commands/build/testdata/testcase-multiple-patches-conflict/in/overlay/kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: v1 +apiVersion: v1beta1 kind: Kustomization namePrefix: staging- commonLabels: diff --git a/pkg/commands/build/testdata/testcase-multiple-patches-conflict/in/package/kustomization.yaml b/pkg/commands/build/testdata/testcase-multiple-patches-conflict/in/package/kustomization.yaml index f269394d3..34b6d11b3 100644 --- a/pkg/commands/build/testdata/testcase-multiple-patches-conflict/in/package/kustomization.yaml +++ b/pkg/commands/build/testdata/testcase-multiple-patches-conflict/in/package/kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: v1 +apiVersion: v1beta1 kind: Kustomization namePrefix: team-foo- commonLabels: diff --git a/pkg/commands/build/testdata/testcase-multiple-patches-noconflict/in/overlay/kustomization.yaml b/pkg/commands/build/testdata/testcase-multiple-patches-noconflict/in/overlay/kustomization.yaml index d0c5a3389..4fb0c9391 100644 --- a/pkg/commands/build/testdata/testcase-multiple-patches-noconflict/in/overlay/kustomization.yaml +++ b/pkg/commands/build/testdata/testcase-multiple-patches-noconflict/in/overlay/kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: v1 +apiVersion: v1beta1 kind: Kustomization namePrefix: staging- commonLabels: diff --git a/pkg/commands/build/testdata/testcase-multiple-patches-noconflict/in/package/kustomization.yaml b/pkg/commands/build/testdata/testcase-multiple-patches-noconflict/in/package/kustomization.yaml index f269394d3..34b6d11b3 100644 --- a/pkg/commands/build/testdata/testcase-multiple-patches-noconflict/in/package/kustomization.yaml +++ b/pkg/commands/build/testdata/testcase-multiple-patches-noconflict/in/package/kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: v1 +apiVersion: v1beta1 kind: Kustomization namePrefix: team-foo- commonLabels: diff --git a/pkg/commands/build/testdata/testcase-single-overlay/in/overlay/kustomization.yaml b/pkg/commands/build/testdata/testcase-single-overlay/in/overlay/kustomization.yaml index 876f26406..307752281 100644 --- a/pkg/commands/build/testdata/testcase-single-overlay/in/overlay/kustomization.yaml +++ b/pkg/commands/build/testdata/testcase-single-overlay/in/overlay/kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: v1 +apiVersion: v1beta1 kind: Kustomization namePrefix: staging- commonLabels: diff --git a/pkg/commands/build/testdata/testcase-single-overlay/in/package/kustomization.yaml b/pkg/commands/build/testdata/testcase-single-overlay/in/package/kustomization.yaml index 8905b2656..5ea5cab5f 100644 --- a/pkg/commands/build/testdata/testcase-single-overlay/in/package/kustomization.yaml +++ b/pkg/commands/build/testdata/testcase-single-overlay/in/package/kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: v1 +apiVersion: v1beta1 kind: Kustomization namePrefix: team-foo- commonLabels: diff --git a/pkg/commands/build/testdata/testcase-variable-ref-ingress/in/base/kustomization.yaml b/pkg/commands/build/testdata/testcase-variable-ref-ingress/in/base/kustomization.yaml index 6e96e7a37..403316ec8 100644 --- a/pkg/commands/build/testdata/testcase-variable-ref-ingress/in/base/kustomization.yaml +++ b/pkg/commands/build/testdata/testcase-variable-ref-ingress/in/base/kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: v1 +apiVersion: v1beta1 kind: Kustomization resources: - deployment.yaml diff --git a/pkg/commands/build/testdata/testcase-variable-ref-ingress/in/overlay/kustomization.yaml b/pkg/commands/build/testdata/testcase-variable-ref-ingress/in/overlay/kustomization.yaml index e544f7d0a..0ae516e62 100644 --- a/pkg/commands/build/testdata/testcase-variable-ref-ingress/in/overlay/kustomization.yaml +++ b/pkg/commands/build/testdata/testcase-variable-ref-ingress/in/overlay/kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: v1 +apiVersion: v1beta1 kind: Kustomization nameprefix: kustomized- diff --git a/pkg/commands/build/testdata/testcase-variable-ref/in/overlay/kustomization.yaml b/pkg/commands/build/testdata/testcase-variable-ref/in/overlay/kustomization.yaml index 781f1e4fc..9d4cc170d 100644 --- a/pkg/commands/build/testdata/testcase-variable-ref/in/overlay/kustomization.yaml +++ b/pkg/commands/build/testdata/testcase-variable-ref/in/overlay/kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: v1 +apiVersion: v1beta1 kind: Kustomization namePrefix: dev- bases: diff --git a/pkg/commands/build/testdata/testcase-variable-ref/in/package/kustomization.yaml b/pkg/commands/build/testdata/testcase-variable-ref/in/package/kustomization.yaml index d811d59ca..e081ba807 100644 --- a/pkg/commands/build/testdata/testcase-variable-ref/in/package/kustomization.yaml +++ b/pkg/commands/build/testdata/testcase-variable-ref/in/package/kustomization.yaml @@ -1,4 +1,4 @@ -apiVersion: v1 +apiVersion: v1beta1 kind: Kustomization namePrefix: base- resources: diff --git a/pkg/commands/edit/fix/fix.go b/pkg/commands/edit/fix/fix.go index fe3241249..e940d6d34 100644 --- a/pkg/commands/edit/fix/fix.go +++ b/pkg/commands/edit/fix/fix.go @@ -17,9 +17,6 @@ limitations under the License. package fix import ( - "log" - "strings" - "github.com/spf13/cobra" "sigs.k8s.io/kustomize/pkg/commands/kustfile" "sigs.k8s.io/kustomize/pkg/fs" @@ -53,10 +50,6 @@ func RunFix(fSys fs.FileSystem) error { if err != nil { return err } - msgs := m.DealWithMissingFields() - if len(msgs) > 0 { - log.Printf(strings.Join(msgs, "\n")) - } return mf.Write(m) } diff --git a/pkg/commands/kustfile/kustomizationfile_test.go b/pkg/commands/kustfile/kustomizationfile_test.go index 9cfc89839..3738baf62 100644 --- a/pkg/commands/kustfile/kustomizationfile_test.go +++ b/pkg/commands/kustfile/kustomizationfile_test.go @@ -173,7 +173,7 @@ func TestPreserveComments(t *testing.T) { `# shem qing some comments # This is some comment we should preserve # don't delete it -apiVersion: v1 +apiVersion: v1beta1 kind: Kustomization resources: - pod.yaml @@ -228,7 +228,7 @@ resources: - service.yaml APIVersion: v1beta1 -kind: kustomization.yaml +kind: kustomization # something you may want to keep vars: @@ -266,7 +266,7 @@ resources: - service.yaml apiVersion: v1beta1 -kind: kustomization.yaml +kind: kustomization # something you may want to keep vars: diff --git a/pkg/fs/fakefs.go b/pkg/fs/fakefs.go index dffb96039..a68187908 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: v1 +const kustomizationContent = `apiVersion: v1beta1 kind: Kustomization namePrefix: some-prefix nameSuffix: some-suffix diff --git a/pkg/target/kusttarget_test.go b/pkg/target/kusttarget_test.go index c80c60815..416e4fd07 100644 --- a/pkg/target/kusttarget_test.go +++ b/pkg/target/kusttarget_test.go @@ -35,7 +35,7 @@ import ( const ( kustomizationContent1 = ` -apiVersion: v1 +apiVersion: v1beta1 kind: Kustomization namePrefix: foo- nameSuffix: -bar @@ -67,7 +67,7 @@ patchesJson6902: path: jsonpatch.json ` kustomizationContent2 = ` -apiVersion: v1 +apiVersion: v1beta1 kind: Kustomization secretGenerator: - name: secret diff --git a/pkg/target/utils_for_test.go b/pkg/target/utils_for_test.go index c799f3ad5..4b3f429c4 100644 --- a/pkg/target/utils_for_test.go +++ b/pkg/target/utils_for_test.go @@ -60,7 +60,7 @@ func writeF( func writeK( t *testing.T, ldr loadertest.FakeLoader, dir string, content string) { writeF(t, ldr, filepath.Join(dir, constants.KustomizationFileName), ` -apiVersion: v1 +apiVersion: v1beta1 kind: Kustomization `+content) } diff --git a/pkg/types/kustomization.go b/pkg/types/kustomization.go index 8cbeccaf8..28dff3469 100644 --- a/pkg/types/kustomization.go +++ b/pkg/types/kustomization.go @@ -22,7 +22,7 @@ import ( ) const ( - KustomizationVersion = "v1" + KustomizationVersion = "v1beta1" KustomizationKind = "Kustomization" )