mirrors/kyverno
mirrors/kyverno
1
0
Fork 0
mirror of https://github.com/kyverno/kyverno.git synced 2025-03-31 03:45:17 +00:00
Code Activity

800 crd sync panic

Browse source
This commit is contained in:
shravan 2020-04-03 18:29:21 +05:30
parent c22e003a40
commit c804750f44
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkg/openapi/crdSync.go
View file

@ -2,6 +2,7 @@ package openapi
import ( import (
"encoding/json" "encoding/json"
"errors"
"fmt" "fmt"
"time" "time"
@ -88,6 +89,7 @@ func (o *Controller) deleteCRDFromPreviousSync() {
} }
func (o *Controller) parseCRD(crd unstructured.Unstructured) { func (o *Controller) parseCRD(crd unstructured.Unstructured) {
var err error
var crdDefinition struct { var crdDefinition struct {
Spec struct { Spec struct {
Names struct { Names struct {
@ -111,7 +113,11 @@ func (o *Controller) parseCRD(crd unstructured.Unstructured) {
return return
} }
schemaRaw = addingDefaultFieldsToSchema(schemaRaw) schemaRaw, err = addingDefaultFieldsToSchema(schemaRaw)
if err != nil {
log.Log.Error(err, "could not parse crd schema:")
return
}
_ = yaml.Unmarshal(schemaRaw, &schema) _ = yaml.Unmarshal(schemaRaw, &schema)
parsedSchema, err := openapi_v2.NewSchema(schema, compiler.NewContext("schema", nil)) parsedSchema, err := openapi_v2.NewSchema(schema, compiler.NewContext("schema", nil))
@ -127,12 +133,16 @@ func (o *Controller) parseCRD(crd unstructured.Unstructured) {
} }
// addingDefaultFieldsToSchema will add any default missing fields like apiVersion, metadata // addingDefaultFieldsToSchema will add any default missing fields like apiVersion, metadata
func addingDefaultFieldsToSchema(schemaRaw []byte) []byte { func addingDefaultFieldsToSchema(schemaRaw []byte) ([]byte, error) {
var schema struct { var schema struct {
Properties map[string]interface{} `json:"properties"` Properties map[string]interface{} `json:"properties"`
} }
_ = json.Unmarshal(schemaRaw, &schema) _ = json.Unmarshal(schemaRaw, &schema)
if len(schema.Properties) < 1 {
return nil, errors.New("crd schema has no properties")
}
if schema.Properties["apiVersion"] == nil { if schema.Properties["apiVersion"] == nil {
apiVersionDefRaw := `{"description":"APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources","type":"string"}` apiVersionDefRaw := `{"description":"APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources","type":"string"}`
apiVersionDef := make(map[string]interface{}) apiVersionDef := make(map[string]interface{})
@ -149,5 +159,5 @@ func addingDefaultFieldsToSchema(schemaRaw []byte) []byte {
schemaWithDefaultFields, _ := json.Marshal(schema) schemaWithDefaultFields, _ := json.Marshal(schema)
return schemaWithDefaultFields return schemaWithDefaultFields, nil
} }

5
pkg/openapi/validation_test.go
View file

@ -65,3 +65,8 @@ func Test_ValidateMutationPolicy(t *testing.T) {
} }
} }
func Test_addDefaultFieldsToSchema(t *testing.T) {
addingDefaultFieldsToSchema([]byte(`null`))
addingDefaultFieldsToSchema(nil)
}