Merge pull request #458 from k8s-infra-cherrypick-robot/cherry-pick-4…

…57-to-release-1.4

[release-1.4] Fix pointer issue for lock release controller

pkg/releaselock/controller.go

@@ -209,7 +209,7 @@ func (c *LockReleaseController) listNodes(ctx context.Context) (map[string]*core
 	}
 	nodeMap := map[string]*corev1.Node{}
 	for _, node := range nodeList.Items {
-		nodeMap[node.Name] = &node
+		nodeMap[node.Name] = node.DeepCopy()
 	}
 	return nodeMap, nil
 }

pkg/releaselock/controller_test.go

@@ -1,11 +1,14 @@
 package rpc
 
 import (
+	"context"
 	"fmt"
 	"testing"
 
+	"github.com/google/go-cmp/cmp"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/client-go/kubernetes/fake"
 )
 
 func TestVerifyNodeExists(t *testing.T) {
@@ -117,6 +120,51 @@ func TestVerifyNodeExists(t *testing.T) {
 	}
 }
 
+func TestListNodes(t *testing.T) {
+	node1 := &corev1.Node{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "node1",
+			Annotations: map[string]string{
+				gceInstanceIDKey: "node1-id",
+			},
+		},
+	}
+	node2 := &corev1.Node{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "node2",
+			Annotations: map[string]string{
+				gceInstanceIDKey: "node2-id",
+			},
+		},
+	}
+	controller := LockReleaseController{client: fake.NewSimpleClientset(node1, node2)}
+	expectedMap := map[string]*corev1.Node{
+		"node1": {
+			ObjectMeta: metav1.ObjectMeta{
+				Name: "node1",
+				Annotations: map[string]string{
+					gceInstanceIDKey: "node1-id",
+				},
+			},
+		},
+		"node2": {
+			ObjectMeta: metav1.ObjectMeta{
+				Name: "node2",
+				Annotations: map[string]string{
+					gceInstanceIDKey: "node2-id",
+				},
+			},
+		},
+	}
+	nodes, err := controller.listNodes(context.Background())
+	if err != nil {
+		t.Fatalf("test listNodes failed: unexpected error: %v", err)
+	}
+	if diff := cmp.Diff(expectedMap, nodes); diff != "" {
+		t.Errorf("test listNodes failed: unexpected diff (-want +got):%s", diff)
+	}
+}
+
 func gotExpectedError(testFunc string, wantErr bool, err error) error {
 	if err != nil && !wantErr {
 		return fmt.Errorf("%s got error %v, want nil", testFunc, err)