rebase

cmd/agent/agent.go

@@ -261,7 +261,6 @@ func getBackendEngine(backendCtx context.Context, backendName string, addons []s
 		return addonBackend.Value, nil
 	}
 
-	backend.Init(backendCtx)
 	engine, err := backend.FindBackend(backendCtx, backendName)
 	if err != nil {
 		log.Error().Err(err).Msgf("cannot find backend engine '%s'", backendName)

pipeline/backend/kubernetes/kubernetes.go

@@ -325,9 +325,9 @@ func (e *kube) TailStep(ctx context.Context, step *types.Step, taskUUID string)
 	// return rc, nil
 }
 
-func (e *kube) DestroyStep(_ context.Context, step *types.Step, taskUUID string) error {
+func (e *kube) DestroyStep(ctx context.Context, step *types.Step, taskUUID string) error {
 	log.Trace().Str("taskUUID", taskUUID).Msgf("Stopping step: %s", step.Name)
-	err := stopPod(e.ctx, e, step, defaultDeleteOptions)
+	err := stopPod(ctx, e, step, defaultDeleteOptions)
 	return err
 }
 
@@ -338,13 +338,13 @@ func (e *kube) DestroyWorkflow(ctx context.Context, conf *types.Config, taskUUID
 	// Use noContext because the ctx sent to this function will be canceled/done in case of error or canceled by user.
 	for _, stage := range conf.Stages {
 		for _, step := range stage.Steps {
-			err := stopPod(e.ctx, e, step, defaultDeleteOptions)
+			err := stopPod(ctx, e, step, defaultDeleteOptions)
 			if err != nil {
 				return err
 			}
 
 			if step.Type == types.StepTypeService {
-				err := stopService(e.ctx, e, step, defaultDeleteOptions)
+				err := stopService(ctx, e, step, defaultDeleteOptions)
 				if err != nil {
 					return err
 				}
@@ -353,7 +353,7 @@ func (e *kube) DestroyWorkflow(ctx context.Context, conf *types.Config, taskUUID
 	}
 
 	for _, vol := range conf.Volumes {
-		err := stopVolume(e.ctx, e, vol.Name, defaultDeleteOptions)
+		err := stopVolume(ctx, e, vol.Name, defaultDeleteOptions)
 		if err != nil {
 			return err
 		}

pipeline/backend/kubernetes/service.go

@@ -26,7 +26,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/intstr"
 )
 
-func mkService(namespace, name string, ports []uint16, selector map[string]string) (*v1.Service, error) {
+func mkService(namespace, name string, ports []uint16, selector map[string]string) *v1.Service {
 	log.Trace().Str("name", name).Interface("selector", selector).Interface("ports", ports).Msg("Creating service")
 
 	var svcPorts []v1.ServicePort
@@ -48,7 +48,7 @@ func mkService(namespace, name string, ports []uint16, selector map[string]strin
 			Selector: selector,
 			Ports:    svcPorts,
 		},
-	}, nil
+	}
 }
 
 func serviceName(step *types.Step) (string, error) {
@@ -69,10 +69,7 @@ func startService(ctx context.Context, engine *kube, step *types.Step) (*v1.Serv
 		StepLabel: podName,
 	}
 
-	svc, err := mkService(engine.config.Namespace, name, step.Ports, selector)
-	if err != nil {
-		return nil, err
-	}
+	svc := mkService(engine.config.Namespace, name, step.Ports, selector)
 
 	return engine.client.CoreV1().Services(engine.config.Namespace).Create(ctx, svc, metav1.CreateOptions{})
 }

pipeline/backend/kubernetes/service_test.go

@@ -71,7 +71,7 @@ func TestService(t *testing.T) {
 	  }
 	}`
 
-	s, _ := mkService("foo", "bar", []uint16{1, 2, 3}, map[string]string{"step": "baz"})
+	s := mkService("foo", "bar", []uint16{1, 2, 3}, map[string]string{"step": "baz"})
 	j, err := json.Marshal(s)
 	assert.NoError(t, err)
 	assert.JSONEq(t, expected, string(j))