From 062c6882877fff2266eff052db12d7ab9074e089 Mon Sep 17 00:00:00 2001 From: zackzhangkai Date: Thu, 3 Dec 2020 11:24:13 +0800 Subject: [PATCH] kiali add kubeconfig check Signed-off-by: zackzhangkai --- cmd/ks-apiserver/app/server.go | 20 +++++++++++--------- pkg/controller/group/group_controller.go | 2 +- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/cmd/ks-apiserver/app/server.go b/cmd/ks-apiserver/app/server.go index e3398d4af..f36b83dbc 100644 --- a/cmd/ks-apiserver/app/server.go +++ b/cmd/ks-apiserver/app/server.go @@ -120,14 +120,16 @@ func initializeServicemeshConfig(s *options.ServerRunOptions) { kconfig.Set(config) // Set kiali config - kubeconfig, err := clientcmd.BuildConfigFromFlags("", s.KubernetesOptions.KubeConfig) - if err != nil { - fmt.Println(err) + if len(s.KubernetesOptions.KubeConfig) != 0 { + kubeconfig, err := clientcmd.BuildConfigFromFlags("", s.KubernetesOptions.KubeConfig) + if err != nil { + fmt.Println(err) + } + k8sClient, err := kubernetes.NewClientFromConfig(kubeconfig) + if err != nil { + fmt.Println(err) + } + prometheusClient, _ := prometheus.NewClient() + business.SetWithBackends(k8sClient, prometheusClient) } - k8sClient, err := kubernetes.NewClientFromConfig(kubeconfig) - if err != nil { - fmt.Println(err) - } - prometheusClient, _ := prometheus.NewClient() - business.SetWithBackends(k8sClient, prometheusClient) } diff --git a/pkg/controller/group/group_controller.go b/pkg/controller/group/group_controller.go index 57b9e2e96..9e77cce55 100644 --- a/pkg/controller/group/group_controller.go +++ b/pkg/controller/group/group_controller.go @@ -145,7 +145,7 @@ func (c *Controller) reconcile(key string) error { func (c *Controller) deleteGroupBindings(group *iam1alpha2.Group) error { - // Groupbindings that created by kubeshpere will be deleted directly. + // Groupbindings that created by kubesphere will be deleted directly. listOptions := metav1.ListOptions{ LabelSelector: labels.SelectorFromSet(labels.Set{iam1alpha2.GroupReferenceLabel: group.Name}).String(), }