Compare commits
2 Commits
master
...
express-1.
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2b031861d6 | ||
|
|
88b5fb3186 |
7
Gopkg.lock
generated
7
Gopkg.lock
generated
@@ -202,10 +202,7 @@
|
|||||||
|
|
||||||
[[projects]]
|
[[projects]]
|
||||||
name = "github.com/jinzhu/gorm"
|
name = "github.com/jinzhu/gorm"
|
||||||
packages = [
|
packages = ["."]
|
||||||
".",
|
|
||||||
"dialects/mysql"
|
|
||||||
]
|
|
||||||
revision = "6ed508ec6a4ecb3531899a69cbc746ccf65a4166"
|
revision = "6ed508ec6a4ecb3531899a69cbc746ccf65a4166"
|
||||||
version = "v1.9.1"
|
version = "v1.9.1"
|
||||||
|
|
||||||
@@ -594,6 +591,6 @@
|
|||||||
[solve-meta]
|
[solve-meta]
|
||||||
analyzer-name = "dep"
|
analyzer-name = "dep"
|
||||||
analyzer-version = 1
|
analyzer-version = 1
|
||||||
inputs-digest = "aee0cc75f6ebd8678991b74319dba7fc523e5652286a5b790a53595c1ae09802"
|
inputs-digest = "afd0a3a0e96a5054e6b99afd53b78888125726fc89c62f121984cd73a6ca4fb3"
|
||||||
solver-name = "gps-cdcl"
|
solver-name = "gps-cdcl"
|
||||||
solver-version = 1
|
solver-version = 1
|
||||||
|
|||||||
@@ -30,7 +30,6 @@ type ComponentsCount struct {
|
|||||||
KubernetesCount int `json:"kubernetesCount"`
|
KubernetesCount int `json:"kubernetesCount"`
|
||||||
OpenpitrixCount int `json:"openpitrixCount"`
|
OpenpitrixCount int `json:"openpitrixCount"`
|
||||||
KubesphereCount int `json:"kubesphereCount"`
|
KubesphereCount int `json:"kubesphereCount"`
|
||||||
IstioCount int `json:"istioCount"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type Components struct {
|
type Components struct {
|
||||||
@@ -53,17 +52,21 @@ func GetComponents() (map[string]interface{}, error) {
|
|||||||
k8sClient := client.NewK8sClient()
|
k8sClient := client.NewK8sClient()
|
||||||
var count ComponentsCount
|
var count ComponentsCount
|
||||||
var components Components
|
var components Components
|
||||||
label := "kubernetes.io/cluster-service=true"
|
|
||||||
option := meta_v1.ListOptions{
|
|
||||||
|
|
||||||
LabelSelector: label,
|
label := ""
|
||||||
}
|
namespaces := []string{constants.KubeSystemNamespace, constants.OpenPitrixNamespace, constants.KubeSphereNamespace}
|
||||||
|
|
||||||
namespaces := []string{constants.KubeSystemNamespace, constants.OpenPitrixNamespace, constants.IstioNamespace, constants.KubeSphereNamespace}
|
|
||||||
for _, ns := range namespaces {
|
for _, ns := range namespaces {
|
||||||
|
|
||||||
if ns != constants.KubeSystemNamespace {
|
if ns == constants.KubeSystemNamespace {
|
||||||
option.LabelSelector = ""
|
label = "kubernetes.io/cluster-service=true"
|
||||||
|
} else if ns == constants.OpenPitrixNamespace {
|
||||||
|
label = "app=openpitrix"
|
||||||
|
} else {
|
||||||
|
label = "app=kubesphere"
|
||||||
|
}
|
||||||
|
option := meta_v1.ListOptions{
|
||||||
|
|
||||||
|
LabelSelector: label,
|
||||||
}
|
}
|
||||||
servicelists, err := k8sClient.CoreV1().Services(ns).List(option)
|
servicelists, err := k8sClient.CoreV1().Services(ns).List(option)
|
||||||
|
|
||||||
@@ -84,11 +87,8 @@ func GetComponents() (map[string]interface{}, error) {
|
|||||||
count.KubernetesCount++
|
count.KubernetesCount++
|
||||||
case constants.OpenPitrixNamespace:
|
case constants.OpenPitrixNamespace:
|
||||||
count.OpenpitrixCount++
|
count.OpenpitrixCount++
|
||||||
case constants.KubeSphereNamespace:
|
|
||||||
count.KubesphereCount++
|
|
||||||
|
|
||||||
default:
|
default:
|
||||||
count.IstioCount++
|
count.KubesphereCount++
|
||||||
}
|
}
|
||||||
|
|
||||||
components.Name = service.Name
|
components.Name = service.Name
|
||||||
|
|||||||
3
vendor/github.com/jinzhu/gorm/dialects/mysql/mysql.go
generated
vendored
3
vendor/github.com/jinzhu/gorm/dialects/mysql/mysql.go
generated
vendored
@@ -1,3 +0,0 @@
|
|||||||
package mysql
|
|
||||||
|
|
||||||
import _ "github.com/go-sql-driver/mysql"
|
|
||||||
Reference in New Issue
Block a user