diff --git a/.gitignore b/.gitignore index 25c28ed9a8f7f4d49197099e7b6d9ab45afc5e45..fffd01e3368c0447b9e92df915e86abdb60e8013 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ bin/ # Vscode files .vscode/ +__debug_bin # OSX trash .DS_Store diff --git a/pkg/kapis/devops/v1alpha2/devops.go b/pkg/kapis/devops/v1alpha2/devops.go index e5c6c93f1cff80bd7cabda2a5f0fb7a5373b26a4..d845e0b5268640d58631d6dde23474d47fcc023f 100644 --- a/pkg/kapis/devops/v1alpha2/devops.go +++ b/pkg/kapis/devops/v1alpha2/devops.go @@ -112,7 +112,8 @@ func (h *ProjectPipelineHandler) ListPipelines(req *restful.Request, resp *restf } else { pipelineMap[pipeline.Name] = i pipelineList.Items[i] = clientDevOps.Pipeline{ - Name: pipeline.Name, + Name: pipeline.Name, + Annotations: pipeline.Annotations, } } } diff --git a/pkg/simple/client/devops/pipeline.go b/pkg/simple/client/devops/pipeline.go index 0260db4bfc9cf58d2cfca9286666fcc915f1b27c..00e7c5405cd621ff5c08c3e1617b7b566771e1cc 100644 --- a/pkg/simple/client/devops/pipeline.go +++ b/pkg/simple/client/devops/pipeline.go @@ -31,8 +31,9 @@ type PipelineList struct { // GetPipeline & SearchPipelines type Pipeline struct { - Class string `json:"_class,omitempty" description:"It’s a fully qualified name and is an identifier of the producer of this resource's capability." ` - Links struct { + Annotations map[string]string `json:"annotations,omitempty" description:"Add annotations from crd" ` + Class string `json:"_class,omitempty" description:"It’s a fully qualified name and is an identifier of the producer of this resource's capability." ` + Links struct { Self struct { Class string `json:"_class,omitempty"` Href string `json:"href,omitempty"`