node: Implement PodUIDLifecycleHandler for mockProvider

Author: saleemrashid

node/mock_test.go

@@ -10,14 +10,16 @@ import (
 	"github.com/virtual-kubelet/virtual-kubelet/log"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/types"
 )
 
 const (
 	mockProviderPodDeletedReason = "MockProviderPodDeleted"
 )
 
 var (
-	_ PodLifecycleHandler = (*mockProvider)(nil)
+	_ PodLifecycleHandler    = (*mockProvider)(nil)
+	_ PodUIDLifecycleHandler = (*mockProvider)(nil)
 )
 
 type mockProvider struct {
@@ -175,11 +177,15 @@ func (p *mockProvider) DeletePod(ctx context.Context, pod *v1.Pod) (err error) {
 	return nil
 }
 
-// GetPod returns a pod by name that is stored in memory.
 func (p *mockProvider) GetPod(ctx context.Context, namespace, name string) (pod *v1.Pod, err error) {
-	log.G(ctx).Infof("receive GetPod %q", name)
+	panic("GetPod not called when GetPodByUID implemented")
+}
+
+// GetPodByUID returns a pod by name that is stored in memory.
+func (p *mockProvider) GetPodByUID(ctx context.Context, namespace, name string, uid types.UID) (pod *v1.Pod, err error) {
+	log.G(ctx).Infof("receive GetPodByUID %q", name)
 
-	key, err := buildKeyFromNames(namespace, name)
+	key, err := buildKeyFromNames(namespace, name, uid)
 	if err != nil {
 		return nil, err
 	}
@@ -190,12 +196,16 @@ func (p *mockProvider) GetPod(ctx context.Context, namespace, name string) (pod
 	return nil, errdefs.NotFoundf("pod \"%s/%s\" is not known to the provider", namespace, name)
 }
 
-// GetPodStatus returns the status of a pod by name that is "running".
+func (p *mockProvider) GetPodStatus(ctx context.Context, namespace, name string) (pod *v1.PodStatus, err error) {
+	panic("GetPodStatus not called when GetPodStatusByUID implemented")
+}
+
+// GetPodStatusByUID returns the status of a pod by name that is "running".
 // returns nil if a pod by that name is not found.
-func (p *mockProvider) GetPodStatus(ctx context.Context, namespace, name string) (*v1.PodStatus, error) {
-	log.G(ctx).Infof("receive GetPodStatus %q", name)
+func (p *mockProvider) GetPodStatusByUID(ctx context.Context, namespace, name string, uid types.UID) (*v1.PodStatus, error) {
+	log.G(ctx).Infof("receive GetPodStatusByUID %q", name)
 
-	pod, err := p.GetPod(ctx, namespace, name)
+	pod, err := p.GetPodByUID(ctx, namespace, name, uid)
 	if err != nil {
 		return nil, err
 	}
@@ -237,8 +247,8 @@ func (p *mockProvider) getUpdates() *waitableInt {
 	return p.updates
 }
 
-func buildKeyFromNames(namespace string, name string) (string, error) {
-	return fmt.Sprintf("%s-%s", namespace, name), nil
+func buildKeyFromNames(namespace string, name string, uid types.UID) (string, error) {
+	return fmt.Sprintf("%s/%s/%s", namespace, name, uid), nil
 }
 
 // buildKey is a helper for building the "key" for the providers pod store.
@@ -251,7 +261,11 @@ func buildKey(pod *v1.Pod) (string, error) {
 		return "", fmt.Errorf("pod name not found")
 	}
 
-	return buildKeyFromNames(pod.Namespace, pod.Name)
+	if pod.UID == "" {
+		return "", fmt.Errorf("pod UID not found")
+	}
+
+	return buildKeyFromNames(pod.Namespace, pod.Name, pod.UID)
 }
 
 type mockProviderAsync struct {

node/pod_test.go

@@ -29,6 +29,7 @@ import (
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/util/uuid"
 	kubeinformers "k8s.io/client-go/informers"
 	"k8s.io/client-go/kubernetes/fake"
 	core "k8s.io/client-go/testing"
@@ -215,6 +216,7 @@ func TestPodCreateNewPod(t *testing.T) {
 	pod.Namespace = "default" //nolint:goconst
 	pod.Name = "nginx"        //nolint:goconst
 	pod.Spec = newPodSpec()
+	pod.UID = uuid.NewUUID()
 
 	err := svr.createOrUpdatePod(context.Background(), pod.DeepCopy())
 
@@ -242,6 +244,7 @@ func TestPodCreateNewPodWithNoDownwardAPIResolution(t *testing.T) {
 			},
 		},
 	}
+	pod.UID = uuid.NewUUID()
 
 	err := svr.createOrUpdatePod(context.Background(), pod.DeepCopy())
 	assert.Check(t, is.Nil(err))
@@ -267,6 +270,7 @@ func TestPodUpdateExisting(t *testing.T) {
 	pod.Namespace = "default"
 	pod.Name = "nginx"
 	pod.Spec = newPodSpec()
+	pod.UID = uuid.NewUUID()
 
 	err := svr.createOrUpdatePod(context.Background(), pod.DeepCopy())
 	assert.Check(t, is.Nil(err))
@@ -291,6 +295,7 @@ func TestPodNoSpecChange(t *testing.T) {
 	pod.Namespace = "default"
 	pod.Name = "nginx"
 	pod.Spec = newPodSpec()
+	pod.UID = uuid.NewUUID()
 
 	err := svr.createOrUpdatePod(context.Background(), pod.DeepCopy())
 	assert.Check(t, is.Nil(err))
@@ -311,6 +316,7 @@ func TestPodStatusDelete(t *testing.T) {
 	pod := &corev1.Pod{}
 	pod.Namespace = "default"
 	pod.Name = "nginx"
+	pod.UID = uuid.NewUUID()
 	pod.Spec = newPodSpec()
 	fk8s := fake.NewSimpleClientset(pod)
 	c.client = fk8s
@@ -495,6 +501,7 @@ func TestUpdatePodStatusWithNilProviderStatus(t *testing.T) {
 	pod.Namespace = "default"
 	pod.Name = "nginx"
 	pod.Spec = newPodSpec()
+	pod.UID = uuid.NewUUID()
 
 	fk8s := fake.NewSimpleClientset(pod)
 	c.client = fk8s