Skip to content

Commit bf2747d

Browse files
committed
Remove useBootstrapToken
Signed-off-by: Dominique Vernier <[email protected]>
1 parent f9f5ea3 commit bf2747d

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

pkg/cmd/join/exec.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package join
33

44
import (
55
"fmt"
6-
"regexp"
76
"time"
87

98
"github.com/ghodss/yaml"
@@ -197,9 +196,7 @@ func createExternalClientFromBootstrap(bootstrapExternalConfigUnSecure clientcmd
197196

198197
func (o *Options) createKubeConfig(externalClientUnSecure *kubernetes.Clientset,
199198
bootstrapExternalConfigUnSecure clientcmdapiv1.Config) (string, error) {
200-
r := regexp.MustCompile(`^.{6}\..{16}$`)
201-
useBootstrapToken := r.Match([]byte(o.token))
202-
ca, err := helpers.GetCACert(externalClientUnSecure, useBootstrapToken)
199+
ca, err := helpers.GetCACert(externalClientUnSecure)
203200
if err != nil {
204201
return "", err
205202
}

pkg/helpers/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func GetAPIServer(kubeClient kubernetes.Interface) (string, error) {
3232
return cluster.Server, nil
3333
}
3434

35-
func GetCACert(kubeClient kubernetes.Interface, useBootstrapToken bool) ([]byte, error) {
35+
func GetCACert(kubeClient kubernetes.Interface) ([]byte, error) {
3636
config, err := getClusterInfoKubeConfig(kubeClient)
3737
if err == nil {
3838
clusters := config.Clusters

0 commit comments

Comments
 (0)