d8dfun/virtual-kubelet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix the potential runtime type casting error

Browse Source
This commit is contained in:
robbiezhang
2018-10-18 19:15:05 +00:00
parent 4a7b74ed42
commit a6bab6e3bb
1 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
vkubelet/pod.go
View File

@@ -3,6 +3,7 @@ package vkubelet
import (
"context"
"fmt"
"reflect"
"time"
pkgerrors "github.com/pkg/errors"
@@ -30,11 +31,10 @@ func (s *Server) onAddPod(ctx context.Context, obj interface{}) {
defer span.End()
logger := log.G(ctx).WithField("method", "onAddPod")
pod := obj.(*corev1.Pod)
if pod == nil {
span.SetStatus(trace.Status{Code: trace.StatusCodeInvalidArgument, Message: fmt.Sprintf("Unexpected object from event: %v", obj)})
logger.Errorf("obj is not a valid pod: %v", obj)
pod, ok := obj.(*corev1.Pod)
if !ok {
span.SetStatus(trace.Status{Code: trace.StatusCodeInvalidArgument, Message: fmt.Sprintf("Unexpected object from event: %s", reflect.TypeOf(obj))})
logger.Errorf("obj is not of a valid type: %s", reflect.TypeOf(obj))
return
}
@@ -53,11 +53,10 @@ func (s *Server) onUpdatePod(ctx context.Context, obj interface{}) {
defer span.End()
logger := log.G(ctx).WithField("method", "onUpdatePod")
pod := obj.(*corev1.Pod)
if pod == nil {
span.SetStatus(trace.Status{Code: trace.StatusCodeInvalidArgument, Message: fmt.Sprintf("Unexpected object from event: %v", obj)})
logger.Errorf("obj is not a valid pod: %v", obj)
pod, ok := obj.(*corev1.Pod)
if !ok {
span.SetStatus(trace.Status{Code: trace.StatusCodeInvalidArgument, Message: fmt.Sprintf("Unexpected object from event: %s", reflect.TypeOf(obj))})
logger.Errorf("obj is not of a valid type: %s", reflect.TypeOf(obj))
return
}
@@ -76,12 +75,20 @@ func (s *Server) onDeletePod(ctx context.Context, obj interface{}) {
defer span.End()
logger := log.G(ctx).WithField("method", "onDeletePod")
pod := obj.(*corev1.Pod)
pod, ok := obj.(*corev1.Pod)
if !ok {
delta, ok := obj.(cache.DeletedFinalStateUnknown)
if !ok {
span.SetStatus(trace.Status{Code: trace.StatusCodeInvalidArgument, Message: fmt.Sprintf("Unexpected object from event: %s", reflect.TypeOf(obj))})
logger.Errorf("obj is not of a valid type: %s", reflect.TypeOf(obj))
return
}
if pod == nil {
span.SetStatus(trace.Status{Code: trace.StatusCodeInvalidArgument, Message: fmt.Sprintf("Unexpected object from event: %v", obj)})
logger.Errorf("obj is not a valid pod: %v", obj)
return
if pod, ok = delta.Obj.(*corev1.Pod); !ok {
span.SetStatus(trace.Status{Code: trace.StatusCodeInvalidArgument, Message: fmt.Sprintf("Unexpected object from event: %s", reflect.TypeOf(obj))})
logger.Errorf("obj is not of a valid type: %s", reflect.TypeOf(obj))
return
}
}
addPodAttributes(span, pod)