github/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-09-02 13:12:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tag pipeline with source information (#4796)

Browse Source 
Co-authored-by: oauth <woodpecker-bot@obermui.de>
Co-authored-by: qwerty287 <80460567+qwerty287@users.noreply.github.com>
Co-authored-by: Robert Kaussow <xoxys@rknet.org>
This commit is contained in:
Jener Rasmussen
2025-03-22 13:45:44 +01:00
committed by GitHub
parent 5ab0e46c21
commit 8d94071e2f
19 changed files with 208 additions and 653 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pipeline/backend/kubernetes/pod.go
View File

@@ -26,14 +26,18 @@ import (
"k8s.io/apimachinery/pkg/api/resource"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"go.woodpecker-ci.org/woodpecker/v3/pipeline"
"go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/common"
"go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types"
)
const (
StepLabel = "step"
podPrefix = "wp-"
defaultFSGroup int64 = 1000
// StepLabelLegacy is the legacy label name from before the introduction of the woodpecker-ci.org namespace.
// This will be removed in the future.
StepLabelLegacy = "step"
StepLabel = "woodpecker-ci.org/step"
podPrefix = "wp-"
defaultFSGroup int64 = 1000
)
func mkPod(step *types.Step, config *config, podName, goos string, options BackendOptions) (*v1.Pod, error) {
@@ -100,9 +104,18 @@ func podLabels(step *types.Step, config *config, options BackendOptions) (map[st
var err error
labels := make(map[string]string)
for k, v := range step.WorkflowLabels {
// Only copy user labels if allowed by agent config.
// Internal labels are filtered on the server-side.
if config.PodLabelsAllowFromStep || strings.HasPrefix(k, pipeline.InternalLabelPrefix) {
labels[k] = v
}
}
if len(options.Labels) > 0 {
if config.PodLabelsAllowFromStep {
log.Trace().Msgf("using labels from the backend options: %v", options.Labels)
// TODO should we filter out label with internal prefix?
maps.Copy(labels, options.Labels)
} else {
log.Debug().Msg("Pod labels were defined in backend options, but its using disallowed by instance configuration")
@@ -110,11 +123,16 @@ func podLabels(step *types.Step, config *config, options BackendOptions) (map[st
}
if len(config.PodLabels) > 0 {
log.Trace().Msgf("using labels from the configuration: %v", config.PodLabels)
// TODO should we filter out label with internal prefix?
maps.Copy(labels, config.PodLabels)
}
if isService(step) {
labels[ServiceLabel], _ = serviceName(step)
}
labels[StepLabelLegacy], err = stepLabel(step)
if err != nil {
return labels, err
}
labels[StepLabel], err = stepLabel(step)
if err != nil {
return labels, err