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

Add network configuration to apiserver/config

Browse Source
This commit is contained in:
Zhengyi Lai
2020-04-17 23:27:57 +08:00
parent 828f7726fd
commit 8ad17a4648
9 changed files with 84 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
pkg/kapis/network/v1alpha2/handler.go
View File

@@ -3,35 +3,45 @@ package v1alpha2
import (
"fmt"
"io/ioutil"
"log"
"net/http"
"net/url"
restful "github.com/emicklei/go-restful"
"github.com/emicklei/go-restful"
"k8s.io/klog"
"kubesphere.io/kubesphere/pkg/api"
)
const ScopeQueryUrl = "http://weave-scope-app.weave.svc/api/topology/services"
const ScopeQueryUrl = "http://%s/api/topology/services"
func getNamespaceTopology(request *restful.Request, response *restful.Response) {
type handler struct {
weaveScopeHost string
}
func (h *handler) getScopeUrl() string {
return fmt.Sprintf(ScopeQueryUrl, h.weaveScopeHost)
}
func (h *handler) getNamespaceTopology(request *restful.Request, response *restful.Response) {
var query = url.Values{
"namespace": []string{request.PathParameter("namespace")},
"timestamp": request.QueryParameters("timestamp"),
}
var u = fmt.Sprintf("%s?%s", ScopeQueryUrl, query.Encode())
var u = fmt.Sprintf("%s?%s", h.getScopeUrl(), query.Encode())
resp, err := http.Get(u)
if err != nil {
log.Printf("query scope faile with err %v", err)
_ = response.WriteError(http.StatusInternalServerError, err)
klog.Errorf("query scope faile with err %v", err)
api.HandleInternalError(response, nil, err)
return
}
body, err := ioutil.ReadAll(resp.Body)
defer resp.Body.Close()
if err != nil {
log.Printf("read response error : %v", err)
_ = response.WriteError(http.StatusInternalServerError, err)
klog.Errorf("read response error : %v", err)
api.HandleInternalError(response, nil, err)
return
}
@@ -40,30 +50,30 @@ func getNamespaceTopology(request *restful.Request, response *restful.Response)
_, err = response.Write(body)
if err != nil {
log.Printf("write response failed %v", err)
klog.Errorf("write response failed %v", err)
}
}
func getNamespaceNodeTopology(request *restful.Request, response *restful.Response) {
func (h *handler) getNamespaceNodeTopology(request *restful.Request, response *restful.Response) {
var query = url.Values{
"namespace": []string{request.PathParameter("namespace")},
"timestamp": request.QueryParameters("timestamp"),
}
var u = fmt.Sprintf("%s/%s?%s", ScopeQueryUrl, request.PathParameter("node_id"), query.Encode())
var u = fmt.Sprintf("%s/%s?%s", h.getScopeUrl(), request.PathParameter("node_id"), query.Encode())
resp, err := http.Get(u)
if err != nil {
log.Printf("query scope faile with err %v", err)
_ = response.WriteError(http.StatusInternalServerError, err)
klog.Errorf("query scope faile with err %v", err)
api.HandleInternalError(response, nil, err)
return
}
body, err := ioutil.ReadAll(resp.Body)
defer resp.Body.Close()
if err != nil {
log.Printf("read response error : %v", err)
_ = response.WriteError(http.StatusInternalServerError, err)
klog.Errorf("read response error : %v", err)
api.HandleInternalError(response, nil, err)
return
}
@@ -72,6 +82,6 @@ func getNamespaceNodeTopology(request *restful.Request, response *restful.Respon
_, err = response.Write(body)
if err != nil {
log.Printf("write response failed %v", err)
klog.Errorf("write response failed %v", err)
}
}

13
pkg/kapis/network/v1alpha2/register.go
View File

@@ -30,25 +30,28 @@ const GroupName = "network.kubesphere.io"
var GroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha2"}
func AddToContainer(c *restful.Container) error {
func AddToContainer(c *restful.Container, weaveScopeHost string) error {
webservice := runtime.NewWebService(GroupVersion)
h := handler{weaveScopeHost: weaveScopeHost}
webservice.Route(webservice.GET("/namespaces/{namespace}/topology").
To(getNamespaceTopology).
To(h.getNamespaceTopology).
Metadata(restfulspec.KeyOpenAPITags, []string{constants.NetworkTopologyTag}).
Doc("Get the topology with specifying a namespace").
Param(webservice.PathParameter("namespace", "name of the namespace").Required(true)).
Returns(http.StatusOK, "ok", TopologyResponse{}).
Writes(TopologyResponse{})).Produces(restful.MIME_JSON)
Writes(TopologyResponse{})).
Produces(restful.MIME_JSON)
webservice.Route(webservice.GET("/namespaces/{namespace}/topology/{node_id}").
To(getNamespaceNodeTopology).
To(h.getNamespaceNodeTopology).
Metadata(restfulspec.KeyOpenAPITags, []string{constants.NetworkTopologyTag}).
Doc("Get the topology with specifying a node id in the whole topology and specifying a namespace").
Param(webservice.PathParameter("namespace", "name of the namespace").Required(true)).
Param(webservice.PathParameter("node_id", "id of the node in the whole topology").Required(true)).
Returns(http.StatusOK, "ok", NodeResponse{}).
Writes(NodeResponse{})).Produces(restful.MIME_JSON)
Writes(NodeResponse{})).
Produces(restful.MIME_JSON)
c.Add(webservice)