ignoret(platform): ca when set env

tkestack · Feb 8, 2022 · c598868 · c598868
1 parent ee46a9e
commit c598868
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/api/platform/types.go b/api/platform/types.go
@@ -22,6 +22,7 @@ import (
 	"fmt"
 	"math/rand"
 	"net"
+	"os"
 	"path"
 	"strings"
 
@@ -391,7 +392,8 @@ func (cc ClusterCredential) RESTConfig(cls *Cluster) *rest.Config {
 			config.Host = fmt.Sprintf("https://%s", host)
 		}
 	}
-	if cc.CACert != nil {
+	// k8s的api-server如果没有签address里的ip，设置ca再请求会报x509证书错误，需要忽略证书
+	if os.Getenv("TKE_IGNORE_CA") != "true" && cc.CACert != nil {
 		config.TLSClientConfig.CAData = cc.CACert
 	} else {
 		config.TLSClientConfig.Insecure = true

diff --git a/api/platform/v1/types.go b/api/platform/v1/types.go
@@ -22,6 +22,7 @@ import (
 	"fmt"
 	"math/rand"
 	"net"
+	"os"
 	"path"
 	strings "strings"
 
@@ -401,7 +402,8 @@ func (cc ClusterCredential) RESTConfig(cls *Cluster) *rest.Config {
 			config.Host = fmt.Sprintf("https://%s", host)
 		}
 	}
-	if cc.CACert != nil {
+	// k8s的api-server如果没有签address里的ip，设置ca再请求会报x509证书错误，需要忽略证书
+	if os.Getenv("TKE_IGNORE_CA") != "true" && cc.CACert != nil {
 		config.TLSClientConfig.CAData = cc.CACert
 	} else {
 		config.TLSClientConfig.Insecure = true