From 08c2659f3927f054317eeac3482c2b93ff22a97d Mon Sep 17 00:00:00 2001 From: jeff Date: Mon, 2 Jul 2018 17:25:27 +0800 Subject: [PATCH] fix router type --- install/ingress-controller/ingress-controller.yaml | 2 +- pkg/models/metrics/pods.go | 9 +++++++++ pkg/models/routes.go | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/install/ingress-controller/ingress-controller.yaml b/install/ingress-controller/ingress-controller.yaml index 658319d23..8480fa1cb 100644 --- a/install/ingress-controller/ingress-controller.yaml +++ b/install/ingress-controller/ingress-controller.yaml @@ -22,7 +22,7 @@ spec: serviceAccountName: kubesphere-router-serviceaccount containers: - name: nginx-ingress-controller - image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.14.0 + image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.16.2 args: - /nginx-ingress-controller - --default-backend-service=$(POD_NAMESPACE)/default-http-backend diff --git a/pkg/models/metrics/pods.go b/pkg/models/metrics/pods.go index fa1140f50..a8d0d5f8f 100644 --- a/pkg/models/metrics/pods.go +++ b/pkg/models/metrics/pods.go @@ -104,6 +104,9 @@ func GetPodMetricsInDeployment(namespace string, deployment string) constants.Pa deploy, err := k8sClient.ExtensionsV1beta1().Deployments(namespace).Get(deployment, v1.GetOptions{}) if err != nil { glog.Error(err) + podMetrics.Items = make([]interface{}, 0) + podMetrics.TotalCount = len(podMetrics.Items) + return podMetrics } labels := make([]string, 0) @@ -134,6 +137,9 @@ func GetPodMetricsInStatefulSet(namespace string, statefulSet string) constants. deploy, err := k8sClient.AppsV1().StatefulSets(namespace).Get(statefulSet, v1.GetOptions{}) if err != nil { glog.Error(err) + podMetrics.Items = make([]interface{}, 0) + podMetrics.TotalCount = len(podMetrics.Items) + return podMetrics } labels := make([]string, 0) @@ -164,6 +170,9 @@ func GetPodMetricsInDaemonset(namespace string, daemonset string) constants.Page deploy, err := k8sClient.ExtensionsV1beta1().DaemonSets(namespace).Get(daemonset, v1.GetOptions{}) if err != nil { glog.Error(err) + podMetrics.Items = make([]interface{}, 0) + podMetrics.TotalCount = len(podMetrics.Items) + return podMetrics } labels := make([]string, 0) diff --git a/pkg/models/routes.go b/pkg/models/routes.go index 26e86a323..ee2020fe2 100644 --- a/pkg/models/routes.go +++ b/pkg/models/routes.go @@ -196,7 +196,7 @@ func CreateRouter(namespace string, routerType coreV1.ServiceType, annotations m deployment.Spec.Template.Spec.Containers[0].Args = append(deployment.Spec.Template.Spec.Containers[0].Args, "--election-id="+deployment.Name) if routerType == coreV1.ServiceTypeLoadBalancer { - deployment.Spec.Template.Spec.Containers[0].Args = append(deployment.Spec.Template.Spec.Containers[0].Args, "--push-service="+constants.IngressControllerNamespace+"/"+constants.IngressControllerPrefix+namespace) + deployment.Spec.Template.Spec.Containers[0].Args = append(deployment.Spec.Template.Spec.Containers[0].Args, "--publish-service="+constants.IngressControllerNamespace+"/"+constants.IngressControllerPrefix+namespace) } else { deployment.Spec.Template.Spec.Containers[0].Args = append(deployment.Spec.Template.Spec.Containers[0].Args, "--report-node-internal-ip-address") }