From 10ae130c5e126e3adac185b1008d21679760bfb8 Mon Sep 17 00:00:00 2001
From: Michelle Au <msau@google.com>
Date: Thu, 27 Dec 2018 14:13:16 -0800
Subject: [PATCH] Remove retrieval of node name

---
 cmd/node-driver-registrar/main.go          |  2 +-
 cmd/node-driver-registrar/node_register.go | 22 ----------------------
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/cmd/node-driver-registrar/main.go b/cmd/node-driver-registrar/main.go
index d11eba8dd..3679808d7 100644
--- a/cmd/node-driver-registrar/main.go
+++ b/cmd/node-driver-registrar/main.go
@@ -136,5 +136,5 @@ func main() {
 	glog.V(2).Infof("CSI driver name: %q", csiDriverName)
 
 	// Run forever
-	nodeRegister(csiConn, csiDriverName)
+	nodeRegister(csiDriverName)
 }
diff --git a/cmd/node-driver-registrar/node_register.go b/cmd/node-driver-registrar/node_register.go
index 2d772ebb2..ac4c83f6e 100644
--- a/cmd/node-driver-registrar/node_register.go
+++ b/cmd/node-driver-registrar/node_register.go
@@ -17,7 +17,6 @@ limitations under the License.
 package main
 
 import (
-	"context"
 	"fmt"
 	"net"
 	"os"
@@ -27,32 +26,11 @@ import (
 	"github.com/golang/glog"
 	"golang.org/x/sys/unix"
 	registerapi "k8s.io/kubernetes/pkg/kubelet/apis/pluginregistration/v1alpha1"
-
-	"github.com/kubernetes-csi/node-driver-registrar/pkg/connection"
 )
 
 func nodeRegister(
-	csiConn connection.CSIConnection,
 	csiDriverName string,
 ) {
-	// Fetch node name from environment variable
-	k8sNodeName := os.Getenv("KUBE_NODE_NAME")
-	if k8sNodeName == "" {
-		glog.Error("Node name not found. The environment variable KUBE_NODE_NAME is empty.")
-		os.Exit(1)
-	}
-
-	// Get CSI Driver Node ID
-	glog.V(1).Infof("Calling CSI driver to discover node ID.")
-	ctx, cancel := context.WithTimeout(context.Background(), csiTimeout)
-	defer cancel()
-	csiDriverNodeId, err := csiConn.NodeGetId(ctx)
-	if err != nil {
-		glog.Error(err.Error())
-		os.Exit(1)
-	}
-	glog.V(2).Infof("CSI driver node ID: %q", csiDriverNodeId)
-
 	// When kubeletRegistrationPath is specified then driver-registrar ONLY acts
 	// as gRPC server which replies to registration requests initiated by kubelet's
 	// pluginswatcher infrastructure. Node labeling is done by kubelet's csi code.