From 26f3c86e7f728886672e0de69124923ccf0ee20e Mon Sep 17 00:00:00 2001 From: cndoit18 Date: Fri, 13 Aug 2021 23:27:33 +0800 Subject: [PATCH] fix json unmarshal bug Signed-off-by: cndoit18 --- apis/goharbor.io/v1beta1/harbor_configuration.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/apis/goharbor.io/v1beta1/harbor_configuration.go b/apis/goharbor.io/v1beta1/harbor_configuration.go index c79d15d33..be760ff68 100644 --- a/apis/goharbor.io/v1beta1/harbor_configuration.go +++ b/apis/goharbor.io/v1beta1/harbor_configuration.go @@ -94,8 +94,12 @@ func (h HarborConfigurationSpec) ToJSON() ([]byte, error) { return nil, err } - extension := make(map[string]interface{}) - if json.Unmarshal(h.Extension.Raw, &extension) != nil { + if len(h.Extension.Raw) > 0 { + extension := make(map[string]interface{}) + if err = json.Unmarshal(h.Extension.Raw, &extension); err != nil { + return nil, err + } + delete(data, "extension") for k, v := range extension {