From 78283cc8ba447f11a607f7e39bc7d09d869e96f5 Mon Sep 17 00:00:00 2001 From: Laszlo Fogas Date: Sat, 27 Apr 2019 21:01:20 +0200 Subject: [PATCH] Kubernetes service name is the step name and not the alias. To avoid collisions --- .../pipeline/backend/kubernetes/kubernetes.go | 26 +++++++------------ 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/cncd/pipeline/pipeline/backend/kubernetes/kubernetes.go b/cncd/pipeline/pipeline/backend/kubernetes/kubernetes.go index cd0bef960..36f00738a 100644 --- a/cncd/pipeline/pipeline/backend/kubernetes/kubernetes.go +++ b/cncd/pipeline/pipeline/backend/kubernetes/kubernetes.go @@ -72,15 +72,9 @@ func (e *engine) Setup(ctx context.Context, conf *backend.Config) error { if stage.Alias == "services" { for _, step := range stage.Steps { e.logs.WriteString("Creating service\n") - var svc *v1.Service - var err error - for _, n := range step.Networks { - if len(n.Aliases) > 0 { - svc, err = Service(e.namespace, n.Aliases[0], podName(step), step.Ports) - if err != nil { - return err - } - } + svc, err := Service(e.namespace, step.Name, podName(step), step.Ports) + if err != nil { + return err } if svc, err := e.kubeClient.CoreV1().Services(e.namespace).Create(svc); err != nil { @@ -250,14 +244,12 @@ func (e *engine) Destroy(ctx context.Context, conf *backend.Config) error { if stage.Alias == "services" { for _, step := range stage.Steps { e.logs.WriteString("Deleting service\n") - for _, n := range step.Networks { - svc, err := Service(e.namespace, n.Aliases[0], step.Alias, step.Ports) - if err != nil { - return err - } - if err := e.kubeClient.CoreV1().Services(e.namespace).Delete(svc.Name, deleteOpts); err != nil { - return err - } + svc, err := Service(e.namespace, step.Name, step.Alias, step.Ports) + if err != nil { + return err + } + if err := e.kubeClient.CoreV1().Services(e.namespace).Delete(svc.Name, deleteOpts); err != nil { + return err } } }