refine tenant api

Signed-off-by: hongming <talonwan@yunify.com>

pkg/simple/client/k8s/ksclient.go

@@ -0,0 +1,46 @@
+/*
+
+ Copyright 2019 The KubeSphere Authors.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+*/
+package k8s
+
+import (
+	"log"
+	"sync"
+
+	ks "kubesphere.io/kubesphere/pkg/client/clientset/versioned"
+)
+
+var (
+	ksClient     *ks.Clientset
+	ksClientOnce sync.Once
+)
+
+func KsClient() *ks.Clientset {
+
+	ksClientOnce.Do(func() {
+
+		config, err := Config()
+
+		if err != nil {
+			log.Fatalln(err)
+		}
+
+		ksClient = ks.NewForConfigOrDie(config)
+	})
+
+	return ksClient
+}

pkg/simple/client/k8s/s2iclient.go

@@ -1,3 +1,20 @@
+/*
+
+ Copyright 2019 The KubeSphere Authors.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+*/
 package k8s
 
 import (
@@ -23,8 +40,6 @@ func S2iClient() *s2i.Clientset {
 		}
 
 		s2iClient = s2i.NewForConfigOrDie(config)
-
-		KubeConfig = config
 	})
 
 	return s2iClient

pkg/simple/client/kubesphere/kubesphereclient.go

@@ -0,0 +1,274 @@
+/*
+
+ Copyright 2019 The KubeSphere Authors.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+*/
+package kubesphere
+
+import (
+	"bytes"
+	"encoding/json"
+	"flag"
+	"fmt"
+	"io/ioutil"
+	"kubesphere.io/kubesphere/pkg/models"
+	"log"
+	"net/http"
+	"strings"
+	"sync"
+)
+
+var (
+	accountAPIServer string
+	once             sync.Once
+	c                client
+)
+
+type Interface interface {
+	CreateGroup(group *models.Group) (*models.Group, error)
+	UpdateGroup(group *models.Group) (*models.Group, error)
+	DescribeGroup(name string) (*models.Group, error)
+	DeleteGroup(name string) error
+}
+
+type client struct {
+	client http.Client
+}
+
+func init() {
+	flag.StringVar(&accountAPIServer, "ks-account-api-server", "http://ks-account.kubesphere-system.svc", "kubesphere account api server")
+}
+
+func Client() Interface {
+	once.Do(func() {
+		c = client{client: http.Client{}}
+	})
+	return c
+}
+
+type Error struct {
+	status  int
+	message string
+}
+
+func (e Error) Error() string {
+	return fmt.Sprintf("status: %d,message: %s", e.status, e.message)
+}
+
+func (c client) CreateGroup(group *models.Group) (*models.Group, error) {
+	data, err := json.Marshal(group)
+	if err != nil {
+		return nil, err
+	}
+
+	req, err := http.NewRequest(http.MethodPost, fmt.Sprintf("%s/kapis/iam.kubesphere.io/v1alpha2/groups", accountAPIServer), bytes.NewReader(data))
+
+	if err != nil {
+		return nil, err
+	}
+	req.Header.Add("Content-Type", "application/json")
+
+	log.Println(req.Method, req.URL, string(data))
+	resp, err := c.client.Do(req)
+
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+	data, err = ioutil.ReadAll(resp.Body)
+
+	if err != nil {
+		return nil, err
+	}
+
+	if resp.StatusCode > http.StatusOK {
+		return nil, Error{resp.StatusCode, string(data)}
+	}
+
+	err = json.Unmarshal(data, group)
+
+	if err != nil {
+		return nil, err
+	}
+
+	return group, nil
+}
+
+func (c client) UpdateGroup(group *models.Group) (*models.Group, error) {
+	data, err := json.Marshal(group)
+
+	if err != nil {
+		return nil, err
+	}
+
+	req, err := http.NewRequest(http.MethodPut, fmt.Sprintf("%s/kapis/iam.kubesphere.io/v1alpha2/groups/%s", accountAPIServer, group.Name), bytes.NewReader(data))
+
+	if err != nil {
+		return nil, err
+	}
+
+	req.Header.Add("Content-Type", "application/json")
+	if err != nil {
+		return nil, err
+	}
+	log.Println(req.Method, req.URL, string(data))
+	resp, err := c.client.Do(req)
+
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+	data, err = ioutil.ReadAll(resp.Body)
+
+	if err != nil {
+		return nil, err
+	}
+
+	if resp.StatusCode > http.StatusOK {
+		return nil, Error{resp.StatusCode, string(data)}
+	}
+
+	err = json.Unmarshal(data, group)
+
+	if err != nil {
+		return nil, err
+	}
+
+	return group, nil
+}
+
+func (c client) DeleteGroup(name string) error {
+	req, err := http.NewRequest(http.MethodDelete, fmt.Sprintf("%s/kapis/iam.kubesphere.io/v1alpha2/groups/%s", accountAPIServer, name), nil)
+
+	if err != nil {
+		return err
+	}
+
+	log.Println(req.Method, req.URL)
+	resp, err := c.client.Do(req)
+
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+	data, err := ioutil.ReadAll(resp.Body)
+
+	if err != nil {
+		return err
+	}
+
+	if resp.StatusCode > http.StatusOK {
+		return Error{resp.StatusCode, string(data)}
+	}
+
+	return nil
+}
+
+func (c client) DescribeGroup(name string) (*models.Group, error) {
+	req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("%s/kapis/iam.kubesphere.io/v1alpha2/groups/%s", accountAPIServer, name), nil)
+
+	if err != nil {
+		return nil, err
+	}
+	log.Println(req.Method, req.URL)
+	resp, err := c.client.Do(req)
+
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+	data, err := ioutil.ReadAll(resp.Body)
+
+	if err != nil {
+		return nil, err
+	}
+
+	if resp.StatusCode > http.StatusOK {
+		return nil, Error{resp.StatusCode, string(data)}
+	}
+
+	var group models.Group
+	err = json.Unmarshal(data, &group)
+
+	if err != nil {
+		return nil, err
+	}
+
+	return &group, nil
+}
+
+func (c client) ListUsers() (*models.PageableResponse, error) {
+	req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("%s/kapis/iam.kubesphere.io/v1alpha2/users", accountAPIServer), nil)
+
+	if err != nil {
+		return nil, err
+	}
+	req.Header.Add("Authorization", accountAPIServer)
+	if err != nil {
+		return nil, err
+	}
+	log.Println(req.Method, req.URL)
+	resp, err := c.client.Do(req)
+
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+	data, err := ioutil.ReadAll(resp.Body)
+
+	if err != nil {
+		return nil, err
+	}
+
+	if resp.StatusCode > http.StatusOK {
+		return nil, Error{resp.StatusCode, string(data)}
+	}
+
+	var result models.PageableResponse
+	err = json.Unmarshal(data, &result)
+
+	if err != nil {
+		return nil, err
+	}
+
+	return &result, nil
+}
+
+func IsNotFound(err error) bool {
+	if e, ok := err.(Error); ok {
+		if e.status == http.StatusNotFound {
+			return true
+		}
+		if strings.Contains(e.message, "not exist") {
+			return true
+		}
+		if strings.Contains(e.message, "not found") {
+			return true
+		}
+	}
+	return false
+}
+
+func IsExist(err error) bool {
+	if e, ok := err.(Error); ok {
+		if e.status == http.StatusConflict {
+			return true
+		}
+		if strings.Contains(e.message, "Already Exists") {
+			return true
+		}
+	}
+	return false
+}

pkg/simple/client/ldap/ldapclient.go

@@ -32,6 +32,7 @@ var (
 	ManagerPassword string
 	UserSearchBase  string
 	GroupSearchBase string
+	poolSize        int
 )
 
 func init() {
@@ -40,13 +41,14 @@ func init() {
 	flag.StringVar(&ManagerPassword, "ldap-manager-password", "admin", "ldap manager password")
 	flag.StringVar(&UserSearchBase, "ldap-user-search-base", "ou=Users,dc=example,dc=org", "ldap user search base")
 	flag.StringVar(&GroupSearchBase, "ldap-group-search-base", "ou=Groups,dc=example,dc=org", "ldap group search base")
+	flag.IntVar(&poolSize, "ldap-pool-size", 64, "ldap connection pool size")
 }
 
 func ldapClientPool() Pool {
 
 	once.Do(func() {
 		var err error
-		pool, err = NewChannelPool(8, 96, "kubesphere", func(s string) (ldap.Client, error) {
+		pool, err = NewChannelPool(8, poolSize, "kubesphere", func(s string) (ldap.Client, error) {
 			conn, err := ldap.Dial("tcp", ldapHost)
 			if err != nil {
 				return nil, err

pkg/simple/client/mysql/dbclient.go

@@ -44,7 +44,6 @@ func Client() *gorm.DB {
 	dbClientOnce.Do(func() {
 		var err error
 		dbClient, err = gorm.Open("mysql", dsn)
-
 		if err != nil {
 			log.Fatalln(err)
 		}

pkg/simple/client/openpitrix/applications.go

@@ -0,0 +1,291 @@
+/*
+
+ Copyright 2019 The KubeSphere Authors.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+*/
+package openpitrix
+
+import (
+	"encoding/json"
+	"fmt"
+	"github.com/golang/glog"
+	"io/ioutil"
+	"net/http"
+	"strconv"
+	"strings"
+	"time"
+)
+
+const (
+	Unknown      = "-"
+	DeploySuffix = "-Deployment"
+	DaemonSuffix = "-DaemonSet"
+	StateSuffix  = "-StatefulSet"
+)
+
+type Cluster struct {
+	ClusterID       string        `json:"cluster_id"`
+	Name            string        `json:"name"`
+	AppID           string        `json:"app_id"`
+	VersionID       string        `json:"version_id"`
+	Status          string        `json:"status"`
+	UpdateTime      time.Time     `json:"status_time"`
+	CreateTime      time.Time     `json:"create_time"`
+	RunTimeId       string        `json:"runtime_id"`
+	Description     string        `json:"description"`
+	ClusterRoleSets []ClusterRole `json:"cluster_role_set"`
+}
+
+type ClusterRole struct {
+	ClusterID string `json:"cluster_id"`
+	Role      string `json:"role"`
+}
+
+type ClusterList struct {
+	Total    int       `json:"total_count"`
+	Clusters []Cluster `json:"cluster_set"`
+}
+
+type VersionList struct {
+	Total    int       `json:"total_count"`
+	Versions []version `json:"app_version_set"`
+}
+
+type version struct {
+	Name      string `json:"name"`
+	VersionID string `json:"version_id"`
+}
+
+type runtime struct {
+	RuntimeID string `json:"runtime_id"`
+	Zone      string `json:"zone"`
+}
+
+type runtimeList struct {
+	Total    int       `json:"total_count"`
+	Runtimes []runtime `json:"runtime_set"`
+}
+
+type app struct {
+	AppId     string `json:"app_id"`
+	Name      string `json:"name"`
+	ChartName string `json:"chart_name"`
+	RepoId    string `json:"repo_id"`
+}
+
+type repo struct {
+	RepoId string `json:"repo_id"`
+	Name   string `json:"name"`
+	Url    string `json:"url"`
+}
+
+type appList struct {
+	Total int   `json:"total_count"`
+	Apps  []app `json:"app_set"`
+}
+
+type repoList struct {
+	Total int    `json:"total_count"`
+	Repos []repo `json:"repo_set"`
+}
+
+func GetAppInfo(appId string) (string, string, string, error) {
+	url := fmt.Sprintf("%s/v1/apps?app_id=%s", openpitrixAPIServer, appId)
+	resp, err := makeHttpRequest("GET", url, "")
+	if err != nil {
+		glog.Error(err)
+		return Unknown, Unknown, Unknown, err
+	}
+
+	var apps appList
+	err = json.Unmarshal(resp, &apps)
+	if err != nil {
+		glog.Error(err)
+		return Unknown, Unknown, Unknown, err
+	}
+
+	if len(apps.Apps) == 0 {
+		return Unknown, Unknown, Unknown, err
+	}
+
+	return apps.Apps[0].ChartName, apps.Apps[0].RepoId, apps.Apps[0].AppId, nil
+}
+
+func GetCluster(clusterId string) (*Cluster, error) {
+	if strings.HasSuffix(openpitrixAPIServer, "/") {
+		openpitrixAPIServer = strings.TrimSuffix(openpitrixAPIServer, "/")
+	}
+
+	url := fmt.Sprintf("%s/v1/clusters?cluster_id=%s", openpitrixAPIServer, clusterId)
+
+	resp, err := makeHttpRequest("GET", url, "")
+	if err != nil {
+		glog.Error(err)
+		return nil, err
+	}
+
+	var clusterList ClusterList
+	err = json.Unmarshal(resp, &clusterList)
+
+	if err != nil {
+		glog.Error(err)
+		return nil, err
+	}
+
+	if len(clusterList.Clusters) == 0 {
+		return nil, fmt.Errorf("NotFound, clusterId:%s", clusterId)
+	}
+
+	return &clusterList.Clusters[0], nil
+}
+
+func ListClusters(runtimeId, searchWord, status string, limit, offset int) (*ClusterList, error) {
+	if strings.HasSuffix(openpitrixAPIServer, "/") {
+		openpitrixAPIServer = strings.TrimSuffix(openpitrixAPIServer, "/")
+	}
+
+	defaultStatus := "status=active&status=stopped&status=pending&status=ceased"
+
+	url := fmt.Sprintf("%s/v1/clusters?limit=%s&offset=%s", openpitrixAPIServer, strconv.Itoa(limit), strconv.Itoa(offset))
+
+	if searchWord != "" {
+		url = fmt.Sprintf("%s&search_word=%s", url, searchWord)
+	}
+
+	if status != "" {
+		url = fmt.Sprintf("%s&status=%s", url, status)
+	} else {
+		url = fmt.Sprintf("%s&%s", url, defaultStatus)
+	}
+
+	if len(runtimeId) > 0 {
+		url = fmt.Sprintf("%s&runtime_id=%s", url, runtimeId)
+	}
+
+	resp, err := makeHttpRequest("GET", url, "")
+	if err != nil {
+		glog.Errorf("request %s failed, reason: %s", url, err)
+		return nil, err
+	}
+
+	var clusterList ClusterList
+	err = json.Unmarshal(resp, &clusterList)
+
+	if err != nil {
+		return nil, err
+	}
+
+	return &clusterList, nil
+}
+
+func GetRepo(repoId string) (string, error) {
+	url := fmt.Sprintf("%s/v1/repos?repo_id=%s", openpitrixAPIServer, repoId)
+	resp, err := makeHttpRequest("GET", url, "")
+	if err != nil {
+		glog.Error(err)
+		return Unknown, err
+	}
+
+	var repos repoList
+	err = json.Unmarshal(resp, &repos)
+	if err != nil {
+		glog.Error(err)
+		return Unknown, err
+	}
+
+	if len(repos.Repos) == 0 {
+		return Unknown, err
+	}
+
+	return repos.Repos[0].Name, nil
+}
+
+func GetVersion(versionId string) (string, error) {
+	versionUrl := fmt.Sprintf("%s/v1/app_versions?version_id=%s", openpitrixAPIServer, versionId)
+	resp, err := makeHttpRequest("GET", versionUrl, "")
+	if err != nil {
+		glog.Error(err)
+		return Unknown, err
+	}
+
+	var versions VersionList
+	err = json.Unmarshal(resp, &versions)
+	if err != nil {
+		glog.Error(err)
+		return Unknown, err
+	}
+
+	if len(versions.Versions) == 0 {
+		return Unknown, nil
+	}
+	return versions.Versions[0].Name, nil
+}
+
+func GetRuntime(runtimeId string) (string, error) {
+
+	versionUrl := fmt.Sprintf("%s/v1/runtimes?runtime_id=%s", openpitrixAPIServer, runtimeId)
+	resp, err := makeHttpRequest("GET", versionUrl, "")
+	if err != nil {
+		glog.Error(err)
+		return Unknown, err
+	}
+
+	var runtimes runtimeList
+	err = json.Unmarshal(resp, &runtimes)
+	if err != nil {
+		glog.Error(err)
+		return Unknown, err
+	}
+
+	if len(runtimes.Runtimes) == 0 {
+		return Unknown, nil
+	}
+
+	return runtimes.Runtimes[0].Zone, nil
+}
+
+func makeHttpRequest(method, url, data string) ([]byte, error) {
+	var req *http.Request
+
+	var err error
+	if method == "GET" {
+		req, err = http.NewRequest(method, url, nil)
+	} else {
+		req, err = http.NewRequest(method, url, strings.NewReader(data))
+	}
+
+	req.Header.Add("Authorization", openpitrixProxyToken)
+
+	if err != nil {
+		glog.Error(err)
+		return nil, err
+	}
+
+	httpClient := &http.Client{}
+	resp, err := httpClient.Do(req)
+
+	if err != nil {
+		err := fmt.Errorf("Request to %s failed, method: %s, reason: %s ", url, method, err)
+		glog.Error(err)
+		return nil, err
+	}
+
+	body, err := ioutil.ReadAll(resp.Body)
+	defer resp.Body.Close()
+	if resp.StatusCode >= http.StatusBadRequest {
+		err = fmt.Errorf(string(body))
+	}
+	return body, err
+}

pkg/simple/client/openpitrix/openpitrixclient.go

@@ -0,0 +1,142 @@
+/*
+
+ Copyright 2019 The KubeSphere Authors.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+*/
+package openpitrix
+
+import (
+	"bytes"
+	"encoding/json"
+	"flag"
+	"fmt"
+	"io/ioutil"
+	"log"
+	"net/http"
+	"sync"
+)
+
+var (
+	openpitrixAPIServer  string
+	openpitrixProxyToken string
+	once                 sync.Once
+	c                    client
+)
+
+type RunTime struct {
+	RuntimeId         string `json:"runtime_id"`
+	RuntimeUrl        string `json:"runtime_url"`
+	Name              string `json:"name"`
+	Provider          string `json:"provider"`
+	Zone              string `json:"zone"`
+	RuntimeCredential string `json:"runtime_credential"`
+}
+
+type Interface interface {
+	CreateRuntime(runtime *RunTime) error
+	DeleteRuntime(runtimeId string) error
+}
+
+type Error struct {
+	status  int
+	message string
+}
+
+func (e Error) Error() string {
+	return fmt.Sprintf("status: %d,message: %s", e.status, e.message)
+}
+
+type client struct {
+	client http.Client
+}
+
+func init() {
+	flag.StringVar(&openpitrixAPIServer, "openpitrix-api-server", "http://openpitrix-api-gateway.openpitrix-system.svc:9100", "openpitrix api server")
+	flag.StringVar(&openpitrixProxyToken, "openpitrix-proxy-token", "", "openpitrix proxy token")
+}
+
+func Client() Interface {
+	once.Do(func() {
+		c = client{client: http.Client{}}
+	})
+	return c
+}
+
+func (c client) CreateRuntime(runtime *RunTime) error {
+
+	data, err := json.Marshal(runtime)
+	if err != nil {
+		return err
+	}
+
+	req, err := http.NewRequest(http.MethodPost, fmt.Sprintf("%s/v1/runtimes", openpitrixAPIServer), bytes.NewReader(data))
+
+	if err != nil {
+		return err
+	}
+	req.Header.Add("Content-Type", "application/json")
+	req.Header.Add("Authorization", openpitrixProxyToken)
+
+	log.Println(req.Method, req.URL, openpitrixProxyToken, string(data))
+	resp, err := c.client.Do(req)
+
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+	data, err = ioutil.ReadAll(resp.Body)
+
+	if err != nil {
+		return err
+	}
+
+	if resp.StatusCode > http.StatusOK {
+		return Error{resp.StatusCode, string(data)}
+	}
+
+	return nil
+}
+
+func (c client) DeleteRuntime(runtimeId string) error {
+	data := []byte(fmt.Sprintf(`{"runtime_id":"%s"}`, runtimeId))
+	req, err := http.NewRequest(http.MethodDelete, fmt.Sprintf("%s/v1/runtimes", openpitrixAPIServer), bytes.NewReader(data))
+
+	if err != nil {
+		return err
+	}
+
+	req.Header.Add("Authorization", openpitrixProxyToken)
+	if err != nil {
+		return err
+	}
+	log.Println(req.Method, req.URL)
+	resp, err := c.client.Do(req)
+
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+	data, err = ioutil.ReadAll(resp.Body)
+
+	if err != nil {
+		return err
+	}
+
+	if resp.StatusCode > http.StatusOK {
+		return Error{resp.StatusCode, string(data)}
+	}
+
+	return nil
+}

pkg/simple/client/redis/redis.go

@@ -20,7 +20,10 @@ package redis
 import (
 	"flag"
 	"log"
+	"os"
+	"os/signal"
 	"sync"
+	"syscall"
 
 	"github.com/go-redis/redis"
 )
@@ -50,6 +53,12 @@ func Client() *redis.Client {
 		if err := redisClient.Ping().Err(); err != nil {
 			log.Fatalln(err)
 		}
+		c := make(chan os.Signal, 0)
+		signal.Notify(c, os.Interrupt, syscall.SIGTERM)
+		go func() {
+			<-c
+			redisClient.Close()
+		}()
 	})
 
 	return redisClient