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

update

Browse Source 
Signed-off-by: runzexia <runzexia@yunify.com>
This commit is contained in:
runzexia
2019-05-15 17:09:07 +08:00
committed by zryfish
parent 3d11687d2a
commit 3c72d08815
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
pkg/simple/client/kubesphere/kubesphereclient.go
View File

@@ -22,6 +22,7 @@ import (
"encoding/json"
"flag"
"fmt"
"github.com/golang/glog"
"io/ioutil"
"kubesphere.io/kubesphere/pkg/constants"
"kubesphere.io/kubesphere/pkg/models"
@@ -257,25 +258,28 @@ func (c client) ListWorkspaceDevOpsProjects(workspace string) (*devops.PageableD
req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("%s/kapis/tenant.kubesphere.io/v1alpha2/workspaces/%s/devops", ksAPIServer, workspace), nil)
if err != nil {
glog.Error(err)
return nil, err
}
req.Header.Add(constants.UserNameHeader, constants.AdminUserName)
if err != nil {
return nil, err
}
log.Println(req.Method, req.URL)
glog.Info(req.Method, req.URL)
resp, err := c.client.Do(req)
if err != nil {
glog.Error(err)
return nil, err
}
defer resp.Body.Close()
data, err := ioutil.ReadAll(resp.Body)
if err != nil {
glog.Error(err)
return nil, err
}
if resp.StatusCode > http.StatusOK {
glog.Error(req.Method, req.URL, resp.StatusCode, string(data))
return nil, Error{resp.StatusCode, string(data)}
}
@@ -283,6 +287,7 @@ func (c client) ListWorkspaceDevOpsProjects(workspace string) (*devops.PageableD
err = json.Unmarshal(data, &result)
if err != nil {
glog.Error(err)
return nil, err
}
return &result, nil
@@ -293,25 +298,27 @@ func (c client) DeleteWorkspaceDevOpsProjects(workspace, devops string) error {
req, err := http.NewRequest(http.MethodDelete, fmt.Sprintf("%s/kapis/tenant.kubesphere.io/v1alpha2/workspaces/%s/devops/%s", ksAPIServer, workspace, devops), nil)
if err != nil {
glog.Error(err)
return err
}
req.Header.Add(constants.UserNameHeader, constants.AdminUserName)
if err != nil {
return err
}
log.Println(req.Method, req.URL)
glog.Info(req.Method, req.URL)
resp, err := c.client.Do(req)
if err != nil {
glog.Error(err)
return err
}
defer resp.Body.Close()
data, err := ioutil.ReadAll(resp.Body)
if err != nil {
glog.Error(err)
return err
}
if resp.StatusCode > http.StatusOK {
glog.Error(req.Method, req.URL, resp.StatusCode, string(data))
return Error{resp.StatusCode, string(data)}
}