From 6810586da91b837c70d4e21f44b51d4e3f3f09e4 Mon Sep 17 00:00:00 2001 From: bryanhe-bupt Date: Wed, 2 Sep 2020 15:27:08 +0800 Subject: [PATCH] feature: bcs-k8s-watch support k8s 1.16+ version, bcs-api compatible with new version bk-auth. issue #567 --- bcs-k8s/bcs-k8s-driver/kubedriver/versions/metaurls.go | 6 ++++++ bcs-services/bcs-api/pkg/component/auth.go | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/bcs-k8s/bcs-k8s-driver/kubedriver/versions/metaurls.go b/bcs-k8s/bcs-k8s-driver/kubedriver/versions/metaurls.go index 723a8057f4..0249de97a3 100644 --- a/bcs-k8s/bcs-k8s-driver/kubedriver/versions/metaurls.go +++ b/bcs-k8s/bcs-k8s-driver/kubedriver/versions/metaurls.go @@ -26,6 +26,12 @@ var apiVersionMap = map[string][]string{ "1.13+": apiSetV112, "1.14": apiSetV112, "1.14+": apiSetV112, + "1.15": apiSetV112, + "1.16": apiSetV112, + "1.17": apiSetV112, + "1.18": apiSetV112, + "1.19": apiSetV112, + "1.20": apiSetV112, } var apiSetV15 = []string{ diff --git a/bcs-services/bcs-api/pkg/component/auth.go b/bcs-services/bcs-api/pkg/component/auth.go index 9d30476665..aee4e58b84 100644 --- a/bcs-services/bcs-api/pkg/component/auth.go +++ b/bcs-services/bcs-api/pkg/component/auth.go @@ -57,7 +57,7 @@ func (a *PaaSAuth) VerifyAccessTokenForIeod(accessToken string) (bool, map[strin func (a *PaaSAuth) VerifyAccessTokenForEe(accessToken string) (bool, map[string]interface{}, error) { - url := fmt.Sprintf("%s/bkiam/api/v1/auth/access-tokens/verify", a.host) + url := fmt.Sprintf("%s/api/v1/auth/access-tokens/verify", a.host) data := map[string]interface{}{ "access_token": accessToken,