admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. add registries create, query apis

Browse Source 
2.  fix components bug
This commit is contained in:
yanmingfan
2018-06-05 15:58:42 +08:00
parent d71f7770b8
commit 49e32284d6
4 changed files with 227 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/models/components.go
View File

@@ -17,11 +17,13 @@ limitations under the License.
package models
import (
"kubesphere.io/kubesphere/pkg/client"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"time"
"github.com/golang/glog"
"strings"
"time"
"github.com/golang/glog"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"kubesphere.io/kubesphere/pkg/client"
)
const KUBESYSTEM = "kube-system"
@@ -66,7 +68,7 @@ func GetComponents() (result []Components, err error) {
var components Components
templates := [] string{"kube-apiserver", "etcd", "kube-scheduler", "kube-controller-manager", "cloud-controller-manager"}
templates := []string{"kube-apiserver", "etcd", "kube-scheduler", "kube-controller-manager", "cloud-controller-manager"}
if len(podlists.Items) > 0 {
@@ -191,7 +193,7 @@ func GetComponents() (result []Components, err error) {
components.Name = ds.Name
components.Kind = "Daemonset"
components.SelfLink = ds.SelfLink
components.Label = ds.Labels
components.Label = ds.Spec.Selector.MatchLabels
components.Namespace = ds.Namespace
version := strings.Split(ds.Spec.Template.Spec.Containers[0].Image, ":")
@@ -252,7 +254,7 @@ func GetComponents() (result []Components, err error) {
components.Name = dm.Name
components.Kind = "Deployment"
components.SelfLink = dm.SelfLink
components.Label = dm.Labels
components.Label = dm.Spec.Selector.MatchLabels
components.Namespace = dm.Namespace
components.Replicas = int(dm.Status.Replicas)
version := strings.Split(dm.Spec.Template.Spec.Containers[0].Image, ":")
@@ -292,4 +294,4 @@ func GetComponents() (result []Components, err error) {
return result, nil
}
}