Merge pull request #2068 from pengcong06/dev

init opClient

cmd/ks-apiserver/app/options/options.go

@@ -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{
 		Addr: fmt.Sprintf(":%d", s.GenericServerRunOptions.InsecurePort),
 	}

pkg/kapis/openpitrix/v1/register.go

@@ -40,7 +40,9 @@ const (
 var GroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1"}
 
 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}
 	webservice := runtime.NewWebService(GroupVersion)
 	handler := newOpenpitrixHandler(factory, op)