Remove --config flag from token command

This commit removes the config flag to comply with the changes in k0sproject/k0s#1409 Signed-off-by: Karen Almog <[email protected]>
trawler · Jan 20, 2022 · 99ee017 · 99ee017
1 parent bbd575c
commit 99ee017
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster/k0s.go b/pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster/k0s.go
@@ -92,9 +92,17 @@ func (k *K0s) SetDefaults() {
 
 // GenerateToken runs the k0s token create command
 func (k K0s) GenerateToken(h *Host, role string, expiry time.Duration) (token string, err error) {
+	var tokenCreateCmd string
+	out, err := h.ExecOutput(h.Configurer.K0sCmdf("token create --help"), exec.Sudo(h))
+	if err == nil && strings.Contains(out, "--config") {
+		tokenCreateCmd = fmt.Sprintf("token create --config %s --role %s --expiry %s", h.K0sConfigPath(), role, expiry.String())
+	} else {
+		tokenCreateCmd = fmt.Sprintf("token create --role %s --expiry %s", role, expiry.String())
+	}
+
 	err = retry.Do(
 		func() error {
-			output, err := h.ExecOutput(h.Configurer.K0sCmdf("token create --config %s --role %s --expiry %s", h.K0sConfigPath(), role, expiry.String()), exec.HideOutput(), exec.Sudo(h))
+			output, err := h.ExecOutput(h.Configurer.K0sCmdf(tokenCreateCmd), exec.HideOutput(), exec.Sudo(h))
 			if err != nil {
 				return err
 			}