Make registration path mandatory, remove kubeconfig parameter

Signed-off-by: Jose A. Rivera <[email protected]>

cmd/node-driver-registrar/main.go

@@ -45,7 +45,6 @@ const (
 
 // Command line flags
 var (
-	kubeconfig              = flag.String("kubeconfig", "", "Absolute path to the kubeconfig file. Required only when running out of cluster.")
 	connectionTimeout       = flag.Duration("connection-timeout", 1*time.Minute, "Timeout for waiting for CSI driver socket.")
 	csiAddress              = flag.String("csi-address", "/run/csi/socket", "Address of the CSI driver socket.")
 	kubeletRegistrationPath = flag.String("kubelet-registration-path", "",
@@ -104,6 +103,11 @@ func main() {
 	flag.Set("logtostderr", "true")
 	flag.Parse()
 
+	if *kubeletRegistrationPath == "" {
+		glog.Error("kubelet-registration-path is a required parameter")
+		os.Exit(1)
+	}
+
 	if *showVersion {
 		fmt.Println(os.Args[0], version)
 		return
@@ -133,26 +137,6 @@ func main() {
 	}
 	glog.V(2).Infof("CSI driver name: %q", csiDriverName)
 
-	// Create the client config. Use kubeconfig if given, otherwise assume
-	// in-cluster.
-	glog.V(1).Infof("Loading kubeconfig.")
-	config, err := buildConfig(*kubeconfig)
-	if err != nil {
-		glog.Error(err.Error())
-		os.Exit(1)
-	}
-
 	// Run forever
-	nodeRegister(config, csiConn, csiDriverName)
-}
-
-func buildConfig(kubeconfig string) (*rest.Config, error) {
-	if kubeconfig != "" {
-		return clientcmd.BuildConfigFromFlags("", kubeconfig)
-	}
-
-	// Return config object which uses the service account kubernetes gives to
-	// pods. It's intended for clients that are running inside a pod running on
-	// kubernetes.
-	return rest.InClusterConfig()
+	nodeRegister(csiConn, csiDriverName)
 }

cmd/node-driver-registrar/node_register.go

@@ -40,7 +40,6 @@ import (
 )
 
 func nodeRegister(
-	config *rest.Config,
 	csiConn connection.CSIConnection,
 	csiDriverName string,
 ) {
@@ -65,87 +64,42 @@ func nodeRegister(
 	// 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.
-	if *kubeletRegistrationPath != "" {
-		registrar := newRegistrationServer(csiDriverName, *kubeletRegistrationPath, supportedVersions)
-		socketPath := fmt.Sprintf("/registration/%s-reg.sock", csiDriverName)
-		fi, err := os.Stat(socketPath)
-		if err == nil && (fi.Mode()&os.ModeSocket) != 0 {
-			// Remove any socket, stale or not, but fall through for other files
-			if err := os.Remove(socketPath); err != nil {
-				glog.Errorf("failed to remove stale socket %s with error: %+v", socketPath, err)
-				os.Exit(1)
-			}
-		}
-		if err != nil && !os.IsNotExist(err) {
-			glog.Errorf("failed to stat the socket %s with error: %+v", socketPath, err)
-			os.Exit(1)
-		}
-		// Default to only user accessible socket, caller can open up later if desired
-		oldmask := unix.Umask(0077)
-
-		glog.Infof("Starting Registration Server at: %s\n", socketPath)
-		lis, err := net.Listen("unix", socketPath)
-		if err != nil {
-			glog.Errorf("failed to listen on socket: %s with error: %+v", socketPath, err)
+	registrar := newRegistrationServer(csiDriverName, *kubeletRegistrationPath, supportedVersions)
+	socketPath := fmt.Sprintf("/registration/%s-reg.sock", csiDriverName)
+	fi, err := os.Stat(socketPath)
+	if err == nil && (fi.Mode()&os.ModeSocket) != 0 {
+		// Remove any socket, stale or not, but fall through for other files
+		if err := os.Remove(socketPath); err != nil {
+			glog.Errorf("failed to remove stale socket %s with error: %+v", socketPath, err)
 			os.Exit(1)
 		}
-		unix.Umask(oldmask)
-		glog.Infof("Registration Server started at: %s\n", socketPath)
-		grpcServer := grpc.NewServer()
-		// Registers kubelet plugin watcher api.
-		registerapi.RegisterRegistrationServer(grpcServer, registrar)
-
-		// Starts service
-		if err := grpcServer.Serve(lis); err != nil {
-			glog.Errorf("Registration Server stopped serving: %v", err)
-			os.Exit(1)
-		}
-		// If gRPC server is gracefully shutdown, exit
-		os.Exit(0)
-	} else { // only apply Node label update when kubelet plugin not used
-		clientset, err := kubernetes.NewForConfig(config)
-		if err != nil {
-			glog.Error(err.Error())
-			os.Exit(1)
-		}
-
-		glog.V(1).Infof("Attempt to update node annotation if needed")
-		k8sNodesClient := clientset.CoreV1().Nodes()
+	}
+	if err != nil && !os.IsNotExist(err) {
+		glog.Errorf("failed to stat the socket %s with error: %+v", socketPath, err)
+		os.Exit(1)
+	}
+	// Default to only user accessible socket, caller can open up later if desired
+	oldmask := unix.Umask(0077)
 
-		// Set up goroutine to cleanup (aka deregister) on termination.
-		c := make(chan os.Signal, 1)
-		signal.Notify(c, os.Interrupt)
-		go func() {
-			<-c
-			err := getVerifyAndDeleteNodeId(
-				k8sNodeName,
-				k8sNodesClient,
-				csiDriverName)
-			if err != nil {
-				glog.Warning(err)
-			}
-			os.Exit(1)
-		}()
+	glog.Infof("Starting Registration Server at: %s\n", socketPath)
+	lis, err := net.Listen("unix", socketPath)
+	if err != nil {
+		glog.Errorf("failed to listen on socket: %s with error: %+v", socketPath, err)
+		os.Exit(1)
+	}
+	unix.Umask(oldmask)
+	glog.Infof("Registration Server started at: %s\n", socketPath)
+	grpcServer := grpc.NewServer()
+	// Registers kubelet plugin watcher api.
+	registerapi.RegisterRegistrationServer(grpcServer, registrar)
 
-		// This program is intended to run as a side-car container inside a
-		// Kubernetes DaemonSet. Kubernetes DaemonSet only have one RestartPolicy,
-		// always, meaning as soon as this container terminates, it will be started
-		// again. Therefore, this program will loop indefientley and periodically
-		// update the node annotation.
-		// The CSI driver name and node ID are assumed to be immutable, and are not
-		// refetched on subsequent loop iterations.
-		for {
-			err := getVerifyAndAddNodeId(
-				k8sNodeName,
-				k8sNodesClient,
-				csiDriverName,
-				csiDriverNodeId)
-			if err != nil {
-				glog.Warning(err)
-			}
-			time.Sleep(sleepDuration)
-		}
+	// Starts service
+	if err := grpcServer.Serve(lis); err != nil {
+		glog.Errorf("Registration Server stopped serving: %v", err)
+		os.Exit(1)
 	}
+	// If gRPC server is gracefully shutdown, exit
+	os.Exit(0)
 }
 
 // Fetches Kubernetes node API object corresponding to k8sNodeName.