From a323d78bbc4e0ded67fcb72e0889cf7aca59dfb3 Mon Sep 17 00:00:00 2001 From: jregan Date: Fri, 26 Jun 2020 10:30:02 -0700 Subject: [PATCH] Convert all deployments to v1 to use openapi schema. --- api/krusty/extendedpatch_test.go | 72 +++++++++---------- api/krusty/generatormergeandreplace_test.go | 12 ++-- api/krusty/multiplepatch_test.go | 30 ++++---- cmd/config/internal/generateddocs/api/docs.go | 4 +- 4 files changed, 59 insertions(+), 59 deletions(-) diff --git a/api/krusty/extendedpatch_test.go b/api/krusty/extendedpatch_test.go index ee04cef7a..84c7accba 100644 --- a/api/krusty/extendedpatch_test.go +++ b/api/krusty/extendedpatch_test.go @@ -11,7 +11,7 @@ import ( func makeCommonFileForExtendedPatchTest(th kusttest_test.Harness) { th.WriteF("/app/base/deployment.yaml", ` -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: name: nginx @@ -36,7 +36,7 @@ spec: name: configmap-in-base name: configmap-in-base --- -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: name: busybox @@ -101,7 +101,7 @@ patches: name: busybox `) th.WriteF("/app/base/patch.yaml", ` -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: name: busybox @@ -110,7 +110,7 @@ metadata: `) m := th.Run("/app/base", th.MakeDefaultOptions()) th.AssertActualEqualsExpected(m, ` -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: labels: @@ -135,7 +135,7 @@ spec: name: configmap-in-base name: configmap-in-base --- -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: annotations: @@ -203,7 +203,7 @@ patches: kind: Deployment `) th.WriteF("/app/base/patch.yaml", ` -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: name: busybox @@ -212,7 +212,7 @@ metadata: `) m := th.Run("/app/base", th.MakeDefaultOptions()) th.AssertActualEqualsExpected(m, ` -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: annotations: @@ -239,7 +239,7 @@ spec: name: configmap-in-base name: configmap-in-base --- -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: annotations: @@ -305,7 +305,7 @@ patches: labelSelector: app=nginx `) th.WriteF("/app/base/patch.yaml", ` -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: name: nginx @@ -314,7 +314,7 @@ metadata: `) m := th.Run("/app/base", th.MakeDefaultOptions()) th.AssertActualEqualsExpected(m, ` -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: annotations: @@ -341,7 +341,7 @@ spec: name: configmap-in-base name: configmap-in-base --- -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: labels: @@ -408,7 +408,7 @@ patches: kind: Deployment `) th.WriteF("/app/base/patch.yaml", ` -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: name: busybox @@ -417,7 +417,7 @@ metadata: `) m := th.Run("/app/base", th.MakeDefaultOptions()) th.AssertActualEqualsExpected(m, ` -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: labels: @@ -442,7 +442,7 @@ spec: name: configmap-in-base name: configmap-in-base --- -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: annotations: @@ -509,7 +509,7 @@ patches: labelSelector: app=busybox `) th.WriteF("/app/base/patch.yaml", ` -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: name: busybox @@ -518,7 +518,7 @@ metadata: `) m := th.Run("/app/base", th.MakeDefaultOptions()) th.AssertActualEqualsExpected(m, ` -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: labels: @@ -543,7 +543,7 @@ spec: name: configmap-in-base name: configmap-in-base --- -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: annotations: @@ -612,7 +612,7 @@ patches: labelSelector: app=busybox `) th.WriteF("/app/base/patch.yaml", ` -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: name: busybox @@ -621,7 +621,7 @@ metadata: `) m := th.Run("/app/base", th.MakeDefaultOptions()) th.AssertActualEqualsExpected(m, ` -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: labels: @@ -646,7 +646,7 @@ spec: name: configmap-in-base name: configmap-in-base --- -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: annotations: @@ -714,7 +714,7 @@ patches: labelSelector: app=busybox `) th.WriteF("/app/base/patch.yaml", ` -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: name: busybox @@ -723,7 +723,7 @@ metadata: `) m := th.Run("/app/base", th.MakeDefaultOptions()) th.AssertActualEqualsExpected(m, ` -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: labels: @@ -748,7 +748,7 @@ spec: name: configmap-in-base name: configmap-in-base --- -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: annotations: @@ -814,7 +814,7 @@ patches: name: no-match `) th.WriteF("/app/base/patch.yaml", ` -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: name: busybox @@ -823,7 +823,7 @@ metadata: `) m := th.Run("/app/base", th.MakeDefaultOptions()) th.AssertActualEqualsExpected(m, ` -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: labels: @@ -848,7 +848,7 @@ spec: name: configmap-in-base name: configmap-in-base --- -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: labels: @@ -910,7 +910,7 @@ patches: - path: patch.yaml `) th.WriteF("/app/base/patch.yaml", ` -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: name: busybox @@ -919,7 +919,7 @@ metadata: `) m := th.Run("/app/base", th.MakeDefaultOptions()) th.AssertActualEqualsExpected(m, ` -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: labels: @@ -944,7 +944,7 @@ spec: name: configmap-in-base name: configmap-in-base --- -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: annotations: @@ -1014,7 +1014,7 @@ patches: kind: Job `) th.WriteF("/app/base/patch.yaml", ` -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: name: busybox @@ -1023,7 +1023,7 @@ metadata: `) m := th.Run("/app/base", th.MakeDefaultOptions()) th.AssertActualEqualsExpected(m, ` -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: labels: @@ -1048,7 +1048,7 @@ spec: name: configmap-in-base name: configmap-in-base --- -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: labels: @@ -1116,7 +1116,7 @@ patches: kind: Deployment `) th.WriteF("/app/base/patch1.yaml", ` -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: name: busybox @@ -1124,7 +1124,7 @@ metadata: new-key-from-patch1: new-value `) th.WriteF("/app/base/patch2.yaml", ` -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: name: busybox @@ -1133,7 +1133,7 @@ metadata: `) m := th.Run("/app/base", th.MakeDefaultOptions()) th.AssertActualEqualsExpected(m, ` -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: labels: @@ -1158,7 +1158,7 @@ spec: name: configmap-in-base name: configmap-in-base --- -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: annotations: diff --git a/api/krusty/generatormergeandreplace_test.go b/api/krusty/generatormergeandreplace_test.go index 1b6798502..7642028b7 100644 --- a/api/krusty/generatormergeandreplace_test.go +++ b/api/krusty/generatormergeandreplace_test.go @@ -56,7 +56,7 @@ spec: app: nginx `) th.WriteF("/app/base/deployment.yaml", ` -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: name: nginx @@ -92,7 +92,7 @@ spec: org: example.com team: foo --- -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: annotations: @@ -173,7 +173,7 @@ secretGenerator: - password=somepw `) th.WriteF("/app/deployment.yaml", ` -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: name: nginx @@ -218,7 +218,7 @@ func TestBaseWithGeneratorsAlone(t *testing.T) { makeBaseWithGenerators(th) m := th.Run("/app", th.MakeDefaultOptions()) th.AssertActualEqualsExpected(m, ` -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: annotations: @@ -308,7 +308,7 @@ func TestMergeAndReplaceGenerators(t *testing.T) { th := kusttest_test.MakeHarness(t) makeBaseWithGenerators(th) th.WriteF("/overlay/deployment.yaml", ` -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: name: nginx @@ -351,7 +351,7 @@ secretGenerator: `) m := th.Run("/overlay", th.MakeDefaultOptions()) th.AssertActualEqualsExpected(m, ` -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: annotations: diff --git a/api/krusty/multiplepatch_test.go b/api/krusty/multiplepatch_test.go index 4e93b1556..7ed0d8c4c 100644 --- a/api/krusty/multiplepatch_test.go +++ b/api/krusty/multiplepatch_test.go @@ -25,7 +25,7 @@ configMapGenerator: - foo=bar `) th.WriteF("base/deployment.yaml", ` -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: name: nginx @@ -71,7 +71,7 @@ configMapGenerator: - hello=world `) th.WriteF("overlay/deployment-patch1.yaml", ` -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: name: nginx @@ -94,7 +94,7 @@ spec: name: configmap-in-overlay `) th.WriteF("overlay/deployment-patch2.yaml", ` -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: name: nginx @@ -111,7 +111,7 @@ spec: `) m := th.Run("overlay", th.MakeDefaultOptions()) th.AssertActualEqualsExpected(m, ` -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: labels: @@ -208,7 +208,7 @@ configMapGenerator: - foo=bar `) th.WriteF("/app/base/deployment.yaml", ` -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: name: nginx @@ -270,7 +270,7 @@ func TestMultiplePatchesNoConflict(t *testing.T) { th := kusttest_test.MakeHarness(t) makeCommonFileForMultiplePatchTest(th) th.WriteF("/app/overlay/staging/deployment-patch1.yaml", ` -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: name: nginx @@ -293,7 +293,7 @@ spec: name: configmap-in-overlay `) th.WriteF("/app/overlay/staging/deployment-patch2.yaml", ` -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: name: nginx @@ -310,7 +310,7 @@ spec: `) m := th.Run("/app/overlay/staging", th.MakeDefaultOptions()) th.AssertActualEqualsExpected(m, ` -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: annotations: @@ -411,7 +411,7 @@ func TestMultiplePatchesWithConflict(t *testing.T) { th := kusttest_test.MakeHarness(t) makeCommonFileForMultiplePatchTest(th) th.WriteF("/app/overlay/staging/deployment-patch1.yaml", ` -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: name: nginx @@ -433,7 +433,7 @@ spec: name: configmap-in-overlay `) th.WriteF("/app/overlay/staging/deployment-patch2.yaml", ` -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: name: nginx @@ -457,7 +457,7 @@ spec: } func TestMultiplePatchesWithOnePatchDeleteDirective(t *testing.T) { - additivePatch := `apiVersion: apps/v1beta2 + additivePatch := `apiVersion: apps/v1 kind: Deployment metadata: name: nginx @@ -470,7 +470,7 @@ spec: - name: SOME_NAME value: somevalue ` - deletePatch := `apiVersion: apps/v1beta2 + deletePatch := `apiVersion: apps/v1 kind: Deployment metadata: name: nginx @@ -506,7 +506,7 @@ spec: th.WriteF("/app/overlay/staging/deployment-patch1.yaml", c.patch1) th.WriteF("/app/overlay/staging/deployment-patch2.yaml", c.patch2) m := th.Run("/app/overlay/staging", th.MakeDefaultOptions()) - th.AssertActualEqualsExpected(m, `apiVersion: apps/v1beta2 + th.AssertActualEqualsExpected(m, `apiVersion: apps/v1 kind: Deployment metadata: annotations: @@ -601,7 +601,7 @@ func TestMultiplePatchesBothWithPatchDeleteDirective(t *testing.T) { th := kusttest_test.MakeHarness(t) makeCommonFileForMultiplePatchTest(th) th.WriteF("/app/overlay/staging/deployment-patch1.yaml", ` -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: name: nginx @@ -613,7 +613,7 @@ spec: name: sidecar `) th.WriteF("/app/overlay/staging/deployment-patch2.yaml", ` -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: name: nginx diff --git a/cmd/config/internal/generateddocs/api/docs.go b/cmd/config/internal/generateddocs/api/docs.go index 70d8b2bf8..d03933c6e 100644 --- a/cmd/config/internal/generateddocs/api/docs.go +++ b/cmd/config/internal/generateddocs/api/docs.go @@ -244,7 +244,7 @@ containers that can be chained together as part of a configuration management pi The end result of such a pipeline are fully rendered configurations that can then be applied to a control plane (e.g. Using ‘kubectl apply’ for Kubernetes control plane). As such, although this document references Kubernetes Resource Model and API conventions, -it is completely decoupled from Kuberentes API machinery and does not depend on any +it is completely decoupled from Kubernetes API machinery and does not depend on any in-cluster components. This document references terms described in [Kubernetes API Conventions][1]. @@ -267,7 +267,7 @@ interpreted as described in [RFC 2119][2]. Performing these on the client rather than the server enables: - Configuration to be reviewed prior to being sent to the API server -- Configuration to be validated as part of the CI?CD pipeline +- Configuration to be validated as part of the CI/CD pipeline - Configuration for Resources to validated holistically rather than individually per-Resource - e.g. ensure the ` + "`" + `Service.selector` + "`" + ` and ` + "`" + `Deployment.spec.template` + "`" + ` labels