From 9c40ee812255f2382d056a2a365a87e57e45e3b8 Mon Sep 17 00:00:00 2001 From: Rodrigo Chacon <rochacon@gmail.com> Date: Sun, 14 Oct 2018 02:52:01 -0300 Subject: [PATCH] wip DNS-1123 compatibility --- executors/kubernetes/executor_kubernetes.go | 4 ++++ executors/kubernetes/executor_kubernetes_test.go | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/executors/kubernetes/executor_kubernetes.go b/executors/kubernetes/executor_kubernetes.go index 89804b4d8..88ee215ad 100644 --- a/executors/kubernetes/executor_kubernetes.go +++ b/executors/kubernetes/executor_kubernetes.go @@ -445,6 +445,10 @@ func (s *executor) setupBuildPod() error { _, _, _, aliases := common.SplitServiceAndVersion(service.Name) for _, a := range aliases { + // skip Docker-like host aliases, respecting DNS-1123 + if strings.Contains(a, "__") { + continue + } servicesHostAlias.Hostnames = append(servicesHostAlias.Hostnames, a) } if service.Alias != "" { diff --git a/executors/kubernetes/executor_kubernetes_test.go b/executors/kubernetes/executor_kubernetes_test.go index f42497972..9fbfb519c 100644 --- a/executors/kubernetes/executor_kubernetes_test.go +++ b/executors/kubernetes/executor_kubernetes_test.go @@ -1338,15 +1338,19 @@ func TestSetupBuildPod(t *testing.T) { { Name: "docker:dind", }, + { + Name: "selenium/standalone-chrome", + }, }, }, VerifyFn: func(t *testing.T, test setupBuildPodTestDef, pod *api.Pod) { - require.Len(t, pod.Spec.Containers, 4) + require.Len(t, pod.Spec.Containers, 5) expectedHostnames := []string{ "test-service", "svc-alias", "docker", + "selenium-standalone-chrome", } assert.Equal(t, "127.0.0.1", pod.Spec.HostAliases[0].IP) assert.Equal(t, expectedHostnames, pod.Spec.HostAliases[0].Hostnames) -- GitLab