From 78dfc561981b74e4335cdf159204991e8303caa7 Mon Sep 17 00:00:00 2001
From: Lars Seipel <ls@slrz.net>
Date: Fri, 9 Nov 2018 23:53:48 +0100
Subject: [PATCH] Avoid image tags from leaking into the host alias
---
executors/kubernetes/executor_kubernetes.go | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/executors/kubernetes/executor_kubernetes.go b/executors/kubernetes/executor_kubernetes.go
index a753055a6..a1241f29e 100644
--- a/executors/kubernetes/executor_kubernetes.go
+++ b/executors/kubernetes/executor_kubernetes.go
@@ -438,11 +438,16 @@ func (s *executor) setupBuildPod() error {
for i, service := range s.options.Services {
resolvedImage := s.Build.GetAllVariables().ExpandValue(service.Name)
services[i] = s.buildContainer(fmt.Sprintf("svc-%d", i), resolvedImage, service, s.serviceRequests, s.serviceLimits)
+ hostName := service.Name
+ // When the service.Name has a Docker image tag, we don't want
+ // it to end up in the host name.
+ if i := strings.IndexByte(hostName, ':'); i >= 0 {
+ hostName = hostName[:i]
+ }
if service.Alias != "" {
- serviceAliases.Hostnames[i] = service.Alias
- } else {
- serviceAliases.Hostnames[i] = service.Name
+ hostName = service.Alias
}
+ serviceAliases.Hostnames[i] = hostName
}
labels := make(map[string]string)
--
GitLab