Skip to content

Commit b7bb7cb

Browse files
committed
Support ssh-key for k3sup plan
Fixes: #436 Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
1 parent 752c22a commit b7bb7cb

File tree

1 file changed

+17
-9
lines changed

1 file changed

+17
-9
lines changed

cmd/plan.go

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,14 @@ Examples JSON input file:
8484
tlsSanStr = fmt.Sprintf(` \
8585
--tls-san %s`, tlsSan)
8686
}
87-
// sshKey, _ := cmd.Flags().GetString("ssh-key")
87+
88+
sshKey, _ := cmd.Flags().GetString("ssh-key")
89+
90+
sshKeySt := ""
91+
if len(sshKey) > 0 {
92+
sshKeySt = fmt.Sprintf(` \
93+
--ssh-key %s`, sshKey)
94+
}
8895

8996
bgStr := ""
9097
if background {
@@ -116,20 +123,21 @@ Examples JSON input file:
116123
--user %s \
117124
--cluster \
118125
--local-path %s \
119-
--context %s%s%s
126+
--context %s%s%s%s
120127
`,
121128
host.IP,
122129
user,
123130
kubeconfig,
124131
contextName,
125132
tlsSanStr,
126-
serverExtraArgsSt)
133+
serverExtraArgsSt,
134+
sshKeySt)
127135

128136
script += fmt.Sprintf(`
129137
echo "Fetching the server's node-token into memory"
130138
131-
export NODE_TOKEN=$(k3sup node-token --host %s --user %s)
132-
`, host.IP, user)
139+
export NODE_TOKEN=$(k3sup node-token --host %s --user %s%s)
140+
`, host.IP, user, sshKeySt)
133141

134142
serversAdded = 1
135143
primaryServer = host
@@ -141,8 +149,8 @@ export NODE_TOKEN=$(k3sup node-token --host %s --user %s)
141149
--server-host %s \
142150
--server \
143151
--node-token "$NODE_TOKEN" \
144-
--user %s%s%s%s
145-
`, host.IP, primaryServer.IP, user, tlsSanStr, serverExtraArgsSt, bgStr)
152+
--user %s%s%s%s%s
153+
`, host.IP, primaryServer.IP, user, tlsSanStr, serverExtraArgsSt, sshKeySt, bgStr)
146154

147155
serversAdded++
148156
} else {
@@ -152,8 +160,8 @@ export NODE_TOKEN=$(k3sup node-token --host %s --user %s)
152160
--host %s \
153161
--server-host %s \
154162
--node-token "$NODE_TOKEN" \
155-
--user %s%s%s
156-
`, host.IP, primaryServer.IP, user, agentExtraArgsSt, bgStr)
163+
--user %s%s%s%s
164+
`, host.IP, primaryServer.IP, user, agentExtraArgsSt, sshKeySt, bgStr)
157165
}
158166

159167
if nodeLimit > 0 && i+1 >= nodeLimit {

0 commit comments

Comments
 (0)