Skip to content

Commit

Permalink
Fixed Pods creation of WP services (woodpecker-ci#3236)
Browse files Browse the repository at this point in the history
  • Loading branch information
zc-devs authored and fernandrone committed Feb 1, 2024
1 parent 55a9fcd commit aad5dc7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 12 deletions.
10 changes: 0 additions & 10 deletions pipeline/backend/kubernetes/kubernetes.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -363,11 +358,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
Expand Down
4 changes: 2 additions & 2 deletions pipeline/backend/kubernetes/pod.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand All @@ -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
}
Expand Down

0 comments on commit aad5dc7

Please sign in to comment.