admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix servicemesh controller nil pointer exception (#2870)

Browse Source 
Signed-off-by: Jeff <zw0948@gmail.com>
This commit is contained in:
zryfish
2020-08-13 15:33:00 +08:00
committed by GitHub
parent 6f367e4f22
commit 95cd23b7a3
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/storage/capability/capability_controller.go
View File

@@ -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,
}

2
pkg/controller/virtualservice/util/util.go
View File

@@ -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),
}