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

fix router type

Browse Source
This commit is contained in:
jeff
2018-07-02 17:25:27 +08:00
parent 2365247622
commit 08c2659f39
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install/ingress-controller/ingress-controller.yaml
View File

@@ -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

9
pkg/models/metrics/pods.go
View File

@@ -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)

2
pkg/models/routes.go
View File

@@ -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")
}