Merge pull request #412 from zlabjp/resolve-ref

k8s-ci-robot · web-flow · commit 075d9a84ece4 · 2020-03-09T22:27:36.000-07:00
Resolve reference in order to remove $ref which is not supported by k8s
diff --git a/pkg/crd/flatten.go b/pkg/crd/flatten.go
@@ -248,7 +248,7 @@ func (f *Flattener) loadUnflattenedSchema(typ TypeIdent) (*apiext.JSONSchemaProp
 	if !found {
 		return nil, fmt.Errorf("unable to locate schema for type %s", typ)
 	}
-	return &baseSchema, nil
+	return f.FlattenSchema(baseSchema, typ.Package), nil
 }
 
 // FlattenType flattens the given pre-loaded type, removing any references from it.

Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,7 @@ func (f Flattener) loadUnflattenedSchema(typ TypeIdent) (apiext.JSONSchemaProp`
`248`	`248`	`if !found {`
`249`	`249`	`return nil, fmt.Errorf("unable to locate schema for type %s", typ)`
`250`	`250`	`}`
`251`		`- return &baseSchema, nil`
	`251`	`+ return f.FlattenSchema(baseSchema, typ.Package), nil`
`252`	`252`	`}`
`253`	`253`
`254`	`254`	`// FlattenType flattens the given pre-loaded type, removing any references from it.`