diff --git a/pkg/constants/common.go b/pkg/constants/common.go index bc1a8f519..26de2799e 100644 --- a/pkg/constants/common.go +++ b/pkg/constants/common.go @@ -32,6 +32,6 @@ const ( DataHome = "/etc/kubesphere" IngressControllerFolder = DataHome + "/ingress-controller" - IngressControllerNamespace = "kubesphere-router-system" + IngressControllerNamespace = KubeSphereControlNameSpace IngressControllerPrefix = "kubesphere-router-" ) diff --git a/pkg/models/controllers/services.go b/pkg/models/controllers/services.go index d1051679f..56b86dba1 100644 --- a/pkg/models/controllers/services.go +++ b/pkg/models/controllers/services.go @@ -18,8 +18,6 @@ import ( "strings" "time" - "strconv" - "github.com/golang/glog" "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/labels" @@ -96,7 +94,7 @@ func (ctl *ServiceCtl) generateObject(item v1.Service) *Service { ports += fmt.Sprintf("%d:%s/%s,", port, targetPort, protocol) if portItem.NodePort != 0 { - nodePorts = append(nodePorts, strconv.FormatInt(int64(portItem.NodePort), 10)) + nodePorts = append(nodePorts, fmt.Sprintf("%d:%d/%s", port, portItem.NodePort, protocol)) } }