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

init opClient

Browse Source
This commit is contained in:
pengcong06
2020-05-12 23:26:38 +08:00
parent d358d9ab1a
commit 070aa863fb
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/ks-apiserver/app/options/options.go
View File

@@ -177,6 +177,14 @@ func (s *ServerRunOptions) NewAPIServer(stopCh <-chan struct{}) (*apiserver.APIS
} }
} }
if s.OpenPitrixOptions != nil {
opClient, err := openpitrix.NewClient(s.OpenPitrixOptions)
if err != nil {
return nil, err
}
apiServer.OpenpitrixClient = opClient
}
server := &http.Server{ server := &http.Server{
Addr: fmt.Sprintf(":%d", s.GenericServerRunOptions.InsecurePort), Addr: fmt.Sprintf(":%d", s.GenericServerRunOptions.InsecurePort),
} }

4
pkg/kapis/openpitrix/v1/register.go
View File

@@ -40,7 +40,9 @@ const (
var GroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1"} var GroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1"}
func AddToContainer(c *restful.Container, factory informers.InformerFactory, op op.Client) error { func AddToContainer(c *restful.Container, factory informers.InformerFactory, op op.Client) error {
if op == nil {
return nil
}
mimePatch := []string{restful.MIME_JSON, runtime.MimeMergePatchJson, runtime.MimeJsonPatchJson} mimePatch := []string{restful.MIME_JSON, runtime.MimeMergePatchJson, runtime.MimeJsonPatchJson}
webservice := runtime.NewWebService(GroupVersion) webservice := runtime.NewWebService(GroupVersion)
handler := newOpenpitrixHandler(factory, op) handler := newOpenpitrixHandler(factory, op)