Skip to content

Commit 8cfb3b3

Browse files
authored
Merge pull request #76 from aleksandrmelnikov/feat/admin.token
feat: Updating `opctl auth token` to return the token for the admin service account.
2 parents 3dc2add + 2aaea96 commit 8cfb3b3

File tree

1 file changed

+4
-27
lines changed

1 file changed

+4
-27
lines changed

util/kubeconfig.go

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -63,40 +63,17 @@ func GetBearerToken(in *restclient.Config, explicitKubeConfigPath string) (strin
6363
token := req.Header.Get("Authorization")
6464
return strings.TrimPrefix(token, "Bearer "), nil
6565
}
66-
if in.AuthProvider != nil {
67-
if in.AuthProvider.Name == "gcp" {
68-
token := in.AuthProvider.Config["access-token"]
69-
if token == "" {
70-
flags := make(map[string]interface{})
71-
var extraArgs []string
72-
_, stderr, err := KubectlGet("node", "", "", extraArgs, flags)
73-
if stderr != "" {
74-
return "", errors.New(stderr)
75-
}
76-
if err != nil {
77-
return "", err
78-
}
79-
refreshedConfig := NewConfig()
80-
getTokenAgain, getErr := GetBearerToken(refreshedConfig, "")
81-
return getTokenAgain, getErr
82-
}
83-
token, err := RefreshTokenIfExpired(in, explicitKubeConfigPath, token)
84-
if err != nil {
85-
return "", err
86-
}
87-
return strings.TrimPrefix(token, "Bearer "), nil
88-
}
89-
}
9066

9167
kubeClient, err := kubernetes.NewForConfig(in)
9268
if err != nil {
9369
return "", errors.Errorf("Could not get kubeClient")
9470
}
95-
secrets, err := kubeClient.CoreV1().Secrets("kube-system").List(v1.ListOptions{})
71+
ns := "onepanel"
72+
secrets, err := kubeClient.CoreV1().Secrets(ns).List(v1.ListOptions{})
9673
if err != nil {
97-
return "", errors.Errorf("Could not get kube-system secrets.")
74+
return "", errors.Errorf("Could not get %s secrets.",ns)
9875
}
99-
re := regexp.MustCompile(`^default-token-`)
76+
re := regexp.MustCompile(`^admin-token-`)
10077
for _, secret := range secrets.Items {
10178
if re.Find([]byte(secret.ObjectMeta.Name)) != nil {
10279
return string(secret.Data["token"]), nil

0 commit comments

Comments
 (0)