Merge pull request #42 from cert-manager/global_set_additionalProperties_false

Update global section to not have "additionalProperties: false"

Author: cert-manager-prow[bot]

schema/render.go

@@ -50,9 +50,12 @@ func (t *treeLevel) Type() parser.Type {
 	return parser.TypeUnknown
 }
 
-func (t *treeLevel) add(path paths.Path, property parser.Property) error {
+func (t *treeLevel) add(path paths.Path, property parser.Property, pruneBranch bool) error {
 	if path.Equal(t.Path) {
 		t.Property = &property
+		if pruneBranch {
+			t.Children = nil
+		}
 		return nil
 	}
 
@@ -62,14 +65,14 @@ func (t *treeLevel) add(path paths.Path, property parser.Property) error {
 
 	for i, child := range t.Children {
 		if child.Path.IsSubPathOf(path) {
-			child.add(path, property)
+			child.add(path, property, pruneBranch)
 			t.Children[i] = child
 			return nil
 		}
 	}
 
 	t.Children = append(t.Children, treeLevel{Path: t.Path.Expand(path, 1)})
-	t.Children[len(t.Children)-1].add(path, property)
+	t.Children[len(t.Children)-1].add(path, property, pruneBranch)
 	return nil
 }
 
@@ -88,14 +91,12 @@ func buildTree(document *parser.Document) (treeLevel, error) {
 
 	root := treeLevel{}
 	for _, property := range allProperties {
-		if err := root.add(property.Path, property); err != nil {
+		if err := root.add(property.Path, property, false); err != nil {
 			return treeLevel{}, err
 		}
 	}
 
 	// Add a global section to the root, as this is a special case.
-	// TODO: also handle the case where there is a global section in the
-	// values.yaml file.
 	root.add(paths.Path{}.WithProperty("global"), parser.Property{
 		Type: parser.TypeUnknown,
 		Description: parser.Comment{
@@ -108,7 +109,7 @@ func buildTree(document *parser.Document) (treeLevel, error) {
 				},
 			},
 		},
-	})
+	}, true)
 
 	return root, nil
 }