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

fix init jenkins

Browse Source 
Signed-off-by: soulseen <sunzhu@yunify.com>
This commit is contained in:
soulseen
2019-05-11 13:01:45 +08:00
parent 642d52a45f
commit ecfcad9ea8
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/ks-apiserver/app/server.go
View File

@@ -33,6 +33,7 @@ import (
"kubesphere.io/kubesphere/pkg/models/devops" "kubesphere.io/kubesphere/pkg/models/devops"
logging "kubesphere.io/kubesphere/pkg/models/log" logging "kubesphere.io/kubesphere/pkg/models/log"
"kubesphere.io/kubesphere/pkg/signals" "kubesphere.io/kubesphere/pkg/signals"
"kubesphere.io/kubesphere/pkg/simple/client/admin_jenkins"
"kubesphere.io/kubesphere/pkg/simple/client/devops_mysql" "kubesphere.io/kubesphere/pkg/simple/client/devops_mysql"
"log" "log"
"net/http" "net/http"
@@ -99,7 +100,8 @@ func Run(s *options.ServerRunOptions) error {
} }
func initializeAdminJenkins() { func initializeAdminJenkins() {
devops.PreCheckJenkins() devops.JenkinsInit()
admin_jenkins.Client()
} }
func initializeDevOpsDatabase() { func initializeDevOpsDatabase() {

4
pkg/models/devops/devops.go
View File

@@ -37,8 +37,8 @@ const channelMaxCapacity = 100
var jenkins *gojenkins.Jenkins var jenkins *gojenkins.Jenkins
func PreCheckJenkins() { func JenkinsInit() {
jenkins = admin_jenkins.Client() jenkins = admin_jenkins.GetJenkins()
} }
func GetPipeline(projectName, pipelineName string, req *http.Request) ([]byte, error) { func GetPipeline(projectName, pipelineName string, req *http.Request) ([]byte, error) {

7
pkg/simple/client/admin_jenkins/jenkins.go
View File

@@ -40,12 +40,17 @@ func init() {
flag.IntVar(&jenkinsMaxConn, "jenkins-max-conn", 20, "max conn to jenkins") flag.IntVar(&jenkinsMaxConn, "jenkins-max-conn", 20, "max conn to jenkins")
} }
func GetJenkins() *gojenkins.Jenkins {
jenkins := gojenkins.CreateJenkins(nil, jenkinsAdminAddress, jenkinsMaxConn, jenkinsAdminUsername, jenkinsAdminPassword)
return jenkins
}
func Client() *gojenkins.Jenkins { func Client() *gojenkins.Jenkins {
if jenkinsClient == nil { if jenkinsClient == nil {
jenkinsInitMutex.Lock() jenkinsInitMutex.Lock()
defer jenkinsInitMutex.Unlock() defer jenkinsInitMutex.Unlock()
if jenkinsClient == nil { if jenkinsClient == nil {
jenkins := gojenkins.CreateJenkins(nil, jenkinsAdminAddress, jenkinsMaxConn, jenkinsAdminUsername, jenkinsAdminPassword) jenkins := GetJenkins()
jenkins, err := jenkins.Init() jenkins, err := jenkins.Init()
if err != nil { if err != nil {
glog.Errorf("failed to connect jenkins, %+v", err) glog.Errorf("failed to connect jenkins, %+v", err)