replace it with the new Jenkins client (#499)

kubesphere · Mar 17, 2022 · b617eff · b617eff
1 parent aff7f5e
commit b617eff
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/cmd/apiserver/app/options/options.go b/cmd/apiserver/app/options/options.go
@@ -22,6 +22,7 @@ import (
 	"fmt"
 	v1 "k8s.io/api/core/v1"
 	"kubesphere.io/devops/pkg/client/cache"
+	"kubesphere.io/devops/pkg/client/devops/jclient"
 	"kubesphere.io/devops/pkg/client/sonarqube"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 
@@ -37,7 +38,6 @@ import (
 	"net/http"
 	"strings"
 
-	"kubesphere.io/devops/pkg/client/devops/jenkins"
 	"kubesphere.io/devops/pkg/client/k8s"
 	"kubesphere.io/devops/pkg/client/s3"
 	fakes3 "kubesphere.io/devops/pkg/client/s3/fake"
@@ -111,7 +111,7 @@ func (s *ServerRunOptions) NewAPIServer(stopCh <-chan struct{}) (*apiserver.APIS
 	}
 
 	if s.JenkinsOptions.Host != "" {
-		devopsClient, err := jenkins.NewDevopsClient(s.JenkinsOptions)
+		devopsClient, err := jclient.NewJenkinsClient(s.JenkinsOptions)
 		if err != nil {
 			return nil, fmt.Errorf("failed to connect to jenkins, please check jenkins status, error: %v", err)
 		}

diff --git a/pkg/client/devops/jclient/jenkins.go b/pkg/client/devops/jclient/jenkins.go
@@ -26,7 +26,7 @@ import (
 // JenkinsClient represents a client of Jenkins
 type JenkinsClient struct {
 	Core    core.JenkinsCore
-	jenkins devops.Interface // For refactor purpose only
+	jenkins *jenkins.Jenkins // For refactor purpose only
 }
 
 // ApplyNewSource apply a new source

diff --git a/pkg/client/devops/jenkins/devops.go b/pkg/client/devops/jenkins/devops.go
@@ -14,11 +14,10 @@ limitations under the License.
 package jenkins
 
 import (
-	"kubesphere.io/devops/pkg/client/devops"
 	"net/http"
 )
 
-func NewDevopsClient(options *Options) (devops.Interface, error) {
+func NewDevopsClient(options *Options) (*Jenkins, error) {
 	// we have to create http client with no redirection
 	client := &http.Client{
 		CheckRedirect: func(req *http.Request, via []*http.Request) error {