mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2024-05-19 00:38:06 +00:00
Code Issues Projects Releases Wiki Activity

Fixed Pods creation of WP services (#3236)

Browse source 
Closes #3178
This commit is contained in:
Thomas Anderson 2024-01-21 05:56:37 +03:00 committed by GitHub
parent dc73471236
commit 072fa29f4a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pipeline/backend/kubernetes/kubernetes.go
View file

@ -204,11 +204,6 @@ func (e *kube) SetupWorkflow(ctx context.Context, conf *types.Config, taskUUID s
// Start the pipeline step.
func (e *kube) StartStep(ctx context.Context, step *types.Step, taskUUID string) error {
if step.Type == types.StepTypeService {
// a service should be started by SetupWorkflow so we can ignore it
log.Trace().Msgf("StartStep got service '%s', ignoring it.", step.Name)
return nil
}
log.Trace().Str("taskUUID", taskUUID).Msgf("starting step: %s", step.Name)
_, err := startPod(ctx, e, step)
return err
@ -353,11 +348,6 @@ func (e *kube) TailStep(ctx context.Context, step *types.Step, taskUUID string)
}
func (e *kube) DestroyStep(ctx context.Context, step *types.Step, taskUUID string) error {
if step.Type == types.StepTypeService {
// a service should be stopped by DestroyWorkflow so we can ignore it
log.Trace().Msgf("destroyStep got service '%s', ignoring it.", step.Name)
return nil
}
log.Trace().Str("taskUUID", taskUUID).Msgf("Stopping step: %s", step.Name)
err := stopPod(ctx, e, step, defaultDeleteOptions)
return err

4
pipeline/backend/kubernetes/pod.go
View file

@ -442,7 +442,7 @@ func mapToEnvVars(m map[string]string) []v1.EnvVar {
}
func startPod(ctx context.Context, engine *kube, step *types.Step) (*v1.Pod, error) {
podName, err := podName(step)
podName, err := stepToPodName(step)
if err != nil {
return nil, err
}
@ -457,7 +457,7 @@ func startPod(ctx context.Context, engine *kube, step *types.Step) (*v1.Pod, err
}
func stopPod(ctx context.Context, engine *kube, step *types.Step, deleteOpts metav1.DeleteOptions) error {
podName, err := podName(step)
podName, err := stepToPodName(step)
if err != nil {
return err
}