From 95cd23b7a3e41b8196859a23e8ee6638a8e94c4a Mon Sep 17 00:00:00 2001 From: zryfish Date: Thu, 13 Aug 2020 15:33:00 +0800 Subject: [PATCH] fix servicemesh controller nil pointer exception (#2870) Signed-off-by: Jeff --- pkg/controller/storage/capability/capability_controller.go | 2 +- pkg/controller/virtualservice/util/util.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/controller/storage/capability/capability_controller.go b/pkg/controller/storage/capability/capability_controller.go index e0cf511f7..e7e1c7d13 100644 --- a/pkg/controller/storage/capability/capability_controller.go +++ b/pkg/controller/storage/capability/capability_controller.go @@ -386,7 +386,7 @@ func (c *StorageCapabilityController) capabilityFromProvisioner(provisioner stri } return nil, err } - klog.V(4).Infof("get provisioner capability:%s %v", provisioner, provisionerCapability) + klog.V(4).Infof("get provisioner capability:%s %s", provisioner, provisionerCapability.Name) capabilitySpec := &capability.StorageClassCapabilitySpec{ Features: provisionerCapability.Spec.Features, } diff --git a/pkg/controller/virtualservice/util/util.go b/pkg/controller/virtualservice/util/util.go index 532149e88..d9985bbb4 100644 --- a/pkg/controller/virtualservice/util/util.go +++ b/pkg/controller/virtualservice/util/util.go @@ -129,7 +129,7 @@ func FillDestinationPort(vs *clientgonetworkingv1alpha3.VirtualService, service // fill tcp port for i := range vs.Spec.Tcp { for j := range vs.Spec.Tcp[i].Route { - if vs.Spec.Tcp[i].Route[j].Destination.Port.Number == 0 { + if vs.Spec.Tcp[i].Route[j].Destination.Port == nil || vs.Spec.Tcp[i].Route[j].Destination.Port.Number == 0 { vs.Spec.Tcp[i].Route[j].Destination.Port = &v1alpha3.PortSelector{ Number: uint32(service.Spec.Ports[0].Port), }