提交 921341d8 编写于 作者: S shaowenchen

fix: pipeline sync annotations

Signed-off-by: Nshaowenchen <mail@chenshaowen.com>
上级 d412fdae
...@@ -20,6 +20,9 @@ import ( ...@@ -20,6 +20,9 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
"net/http"
"strings"
"github.com/emicklei/go-restful" "github.com/emicklei/go-restful"
"k8s.io/apiserver/pkg/authentication/user" "k8s.io/apiserver/pkg/authentication/user"
log "k8s.io/klog" log "k8s.io/klog"
...@@ -33,8 +36,6 @@ import ( ...@@ -33,8 +36,6 @@ import (
"kubesphere.io/kubesphere/pkg/server/params" "kubesphere.io/kubesphere/pkg/server/params"
clientDevOps "kubesphere.io/kubesphere/pkg/simple/client/devops" clientDevOps "kubesphere.io/kubesphere/pkg/simple/client/devops"
"kubesphere.io/kubesphere/pkg/simple/client/devops/jenkins" "kubesphere.io/kubesphere/pkg/simple/client/devops/jenkins"
"net/http"
"strings"
) )
const jenkinsHeaderPre = "X-" const jenkinsHeaderPre = "X-"
...@@ -131,7 +132,10 @@ func (h *ProjectPipelineHandler) ListPipelines(req *restful.Request, resp *restf ...@@ -131,7 +132,10 @@ func (h *ProjectPipelineHandler) ListPipelines(req *restful.Request, resp *restf
} else { } else {
for i, _ := range res.Items { for i, _ := range res.Items {
if index, ok := pipelineMap[res.Items[i].Name]; ok { if index, ok := pipelineMap[res.Items[i].Name]; ok {
// keep annotations field of pipelineList
annotations := pipelineList.Items[index].Annotations
pipelineList.Items[index] = res.Items[i] pipelineList.Items[index] = res.Items[i]
pipelineList.Items[index].Annotations = annotations
} }
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册