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

Merge pull request #379 from robbiezhang/on-delete

Browse Source 
[VK] Fix the potential runtime type casting error
This commit is contained in:
Brian Goff
2018-10-18 13:17:02 -07:00
committed by GitHub
parent 4a7b74ed42 966c76368f
commit 0dbc88826c
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
vkubelet/pod.go
View File

@@ -30,11 +30,10 @@ func (s *Server) onAddPod(ctx context.Context, obj interface{}) {
defer span.End() defer span.End()
logger := log.G(ctx).WithField("method", "onAddPod") logger := log.G(ctx).WithField("method", "onAddPod")
pod := obj.(*corev1.Pod) pod, ok := obj.(*corev1.Pod)
if !ok {
if pod == nil { span.SetStatus(trace.Status{Code: trace.StatusCodeInvalidArgument, Message: fmt.Sprintf("Unexpected object from event: %T", obj)})
span.SetStatus(trace.Status{Code: trace.StatusCodeInvalidArgument, Message: fmt.Sprintf("Unexpected object from event: %v", obj)}) logger.Errorf("obj is not of a valid type: %T", obj)
logger.Errorf("obj is not a valid pod: %v", obj)
return return
} }
@@ -53,11 +52,10 @@ func (s *Server) onUpdatePod(ctx context.Context, obj interface{}) {
defer span.End() defer span.End()
logger := log.G(ctx).WithField("method", "onUpdatePod") logger := log.G(ctx).WithField("method", "onUpdatePod")
pod := obj.(*corev1.Pod) pod, ok := obj.(*corev1.Pod)
if !ok {
if pod == nil { span.SetStatus(trace.Status{Code: trace.StatusCodeInvalidArgument, Message: fmt.Sprintf("Unexpected object from event: %T", obj)})
span.SetStatus(trace.Status{Code: trace.StatusCodeInvalidArgument, Message: fmt.Sprintf("Unexpected object from event: %v", obj)}) logger.Errorf("obj is not of a valid type: %T", obj)
logger.Errorf("obj is not a valid pod: %v", obj)
return return
} }
@@ -76,14 +74,22 @@ func (s *Server) onDeletePod(ctx context.Context, obj interface{}) {
defer span.End() defer span.End()
logger := log.G(ctx).WithField("method", "onDeletePod") logger := log.G(ctx).WithField("method", "onDeletePod")
pod := obj.(*corev1.Pod) pod, ok := obj.(*corev1.Pod)
if !ok {
if pod == nil { delta, ok := obj.(cache.DeletedFinalStateUnknown)
span.SetStatus(trace.Status{Code: trace.StatusCodeInvalidArgument, Message: fmt.Sprintf("Unexpected object from event: %v", obj)}) if !ok {
logger.Errorf("obj is not a valid pod: %v", obj) span.SetStatus(trace.Status{Code: trace.StatusCodeInvalidArgument, Message: fmt.Sprintf("Unexpected object from event: %T", obj)})
logger.Errorf("obj is not of a valid type: %T", obj)
return return
} }
if pod, ok = delta.Obj.(*corev1.Pod); !ok {
span.SetStatus(trace.Status{Code: trace.StatusCodeInvalidArgument, Message: fmt.Sprintf("Unexpected object from event: %T", obj)})
logger.Errorf("obj is not of a valid type: %T", obj)
return
}
}
addPodAttributes(span, pod) addPodAttributes(span, pod)
logger.Debugf("Receive deleted pod '%s/%s'", pod.GetNamespace(), pod.GetName()) logger.Debugf("Receive deleted pod '%s/%s'", pod.GetNamespace(), pod.GetName())