Merge pull request rancher#25245 from superseb/sharemnt_param

Add node-name param to the end of nodecommand
ibuildthecloud · Feb 6, 2020 · fe3163f · fe3163f
2 parents f01cca7 + 44e0eb3
commit fe3163f
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 6 deletions.
diff --git a/pkg/rkenodeconfigserver/nodeserver.go b/pkg/rkenodeconfigserver/nodeserver.go
@@ -223,15 +223,11 @@ func (n *RKENodeConfigServer) nodeConfig(ctx context.Context, cluster *v3.Cluste
 			// Adding kubelet certificate
 			// Check if argument is set on kubelet for serving certificate
 			if rkepki.IsKubeletGenerateServingCertificateEnabledinConfig(rkeConfig) {
-				//			for _, command := range nc.Processes["kubelet"].Command {
-				//				if strings.Contains(command, "tls-cert-file") {
 				logrus.Debugf("nodeConfig: VerifyKubeletCAEnabled is true, generating kubelet certificate for [%s]", tempNode.Address)
 				err := rkepki.GenerateKubeletCertificate(ctx, bundle.Certs(), *rkeConfig, "", "", false)
 				if err != nil {
 					return nil, errors.Wrapf(err, "failed to generate kubelet certificate")
 				}
-				//					break
-				//				}
 			}
 			certString, err := bundle.Marshal()
 			if err != nil {
@@ -275,8 +271,8 @@ func augmentProcesses(token string, processes map[string]v3.Process, worker, b2d
 
 	if len(shared) > 0 {
 		agentImage := settings.AgentImage.Get()
-		nodeCommand := clusterregistrationtokens.NodeCommand(token, cluster) + " --no-register --only-write-certs"
-		args := []string{"--", "share-root.sh", strings.TrimPrefix(nodeCommand, "sudo "), "--node-name", nodeName}
+		nodeCommand := clusterregistrationtokens.NodeCommand(token, cluster) + " --no-register --only-write-certs --node-name " + nodeName
+		args := []string{"--", "share-root.sh", strings.TrimPrefix(nodeCommand, "sudo ")}
 		args = append(args, shared...)
 		privateRegistryConfig, _ := util.GenerateClusterPrivateRegistryDockerConfig(cluster)
 		processes["share-mnt"] = v3.Process{

diff --git a/pkg/rkenodeconfigserver/nodeserver_test.go b/pkg/rkenodeconfigserver/nodeserver_test.go
@@ -62,6 +62,14 @@ func TestAppendKubeletArgs(t *testing.T) {
 	}
 }
 
+func TestShareMntArgs(t *testing.T) {
+	augmentedProcesses := getAugmentedKubeletProcesses()
+	args := augmentedProcesses["share-mnt"].Args
+	// args should be "--", "share-root.sh", "node command in one string", "one argument per shared bind in kubelet process"
+	// By default, arg count is 3, plus 2 shared binds we use in the test
+	assert.Equal(t, 5, len(args), "args count for share-mnt should be the same")
+}
+
 func getKubeletProcess(commands []string) map[string]v3.Process {
 	return map[string]v3.Process{
 		"kubelet": v3.Process{
@@ -71,6 +79,21 @@ func getKubeletProcess(commands []string) map[string]v3.Process {
 	}
 }
 
+func getAugmentedKubeletProcesses() map[string]v3.Process {
+	var cluster v3.Cluster
+	command := []string{"dummy"}
+	binds := []string{"/var/lib/kubelet:/var/lib/kubelet:shared,z", "/var/lib/rancher:/var/lib/rancher:shared,z"}
+	processes := map[string]v3.Process{
+		"kubelet": v3.Process{
+			Name:    "kubelet",
+			Command: command,
+			Binds:   binds,
+		},
+	}
+
+	return augmentProcesses("token", processes, true, false, "dummynode", &cluster)
+}
+
 func getCommandFromProcesses(processes map[string]v3.Process) map[string]struct{} {
 	kubelet, ok := processes["kubelet"]
 	if !ok {