From 304f1c4684a319aeebc90750d4cc6d68677d0b32 Mon Sep 17 00:00:00 2001 From: Ian Howell Date: Fri, 22 Mar 2019 13:49:36 -0500 Subject: [PATCH] Specify JSONSchema spec Since JSONSchema is still in a draft state as of this commit, we need to specify a particular version of the JSONSchema spec Signed-off-by: Ian Howell --- .../testcharts/chart-with-schema-negative/values.schema.yaml | 1 + .../testdata/testcharts/chart-with-schema/values.schema.yaml | 1 + docs/charts.md | 1 + pkg/chartutil/testdata/test-values.schema.yaml | 1 + pkg/chartutil/values_test.go | 1 + 5 files changed, 5 insertions(+) diff --git a/cmd/helm/testdata/testcharts/chart-with-schema-negative/values.schema.yaml b/cmd/helm/testdata/testcharts/chart-with-schema-negative/values.schema.yaml index 2c8345c35..e33597305 100644 --- a/cmd/helm/testdata/testcharts/chart-with-schema-negative/values.schema.yaml +++ b/cmd/helm/testdata/testcharts/chart-with-schema-negative/values.schema.yaml @@ -1,3 +1,4 @@ +$schema: http://json-schema.org/draft-07/schema# title: Values type: object properties: diff --git a/cmd/helm/testdata/testcharts/chart-with-schema/values.schema.yaml b/cmd/helm/testdata/testcharts/chart-with-schema/values.schema.yaml index 2c8345c35..e33597305 100644 --- a/cmd/helm/testdata/testcharts/chart-with-schema/values.schema.yaml +++ b/cmd/helm/testdata/testcharts/chart-with-schema/values.schema.yaml @@ -1,3 +1,4 @@ +$schema: http://json-schema.org/draft-07/schema# title: Values type: object properties: diff --git a/docs/charts.md b/docs/charts.md index 17418682a..c760195b2 100644 --- a/docs/charts.md +++ b/docs/charts.md @@ -772,6 +772,7 @@ schema is the yaml representation of a [JSON Schema](https://json-schema.org/). It might look something like this: ```yaml +$schema: http://json-schema.org/draft-07/schema# title: Values type: object properties: diff --git a/pkg/chartutil/testdata/test-values.schema.yaml b/pkg/chartutil/testdata/test-values.schema.yaml index 2c8345c35..e33597305 100644 --- a/pkg/chartutil/testdata/test-values.schema.yaml +++ b/pkg/chartutil/testdata/test-values.schema.yaml @@ -1,3 +1,4 @@ +$schema: http://json-schema.org/draft-07/schema# title: Values type: object properties: diff --git a/pkg/chartutil/values_test.go b/pkg/chartutil/values_test.go index a73bd9049..7b4affef3 100644 --- a/pkg/chartutil/values_test.go +++ b/pkg/chartutil/values_test.go @@ -492,6 +492,7 @@ chapter: func TestReadSchema(t *testing.T) { schemaTest := `# Test YAML parse +$schema: http://json-schema.org/draft-07/schema# title: Values type: object properties: