From 34fa5ec1df92cb5cb784d7c4ffb5062010aeb1c8 Mon Sep 17 00:00:00 2001 From: ENCALADA Date: Tue, 19 Feb 2019 16:23:00 +0100 Subject: [PATCH] =?UTF-8?q?Current=20setup=20will=20generate=20two=20headl?= =?UTF-8?q?ess=20svc=C2=B4s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These are --set and -set. When using the `service_name` key in an specific job, in order to rename the svc´s, having both headless svc´s will lead to duplicate svc´s . Also, the --set is not widely used, and only a reference to it is found in: - https://github.com/SUSE/scf/blob/develop/container-host-files/etc/scf/config/role-manifest.yml#L2241 --- kube/service.go | 11 -------- kube/service_test.go | 36 ------------------------ kube/stateful_set_test.go | 59 ++------------------------------------- 3 files changed, 2 insertions(+), 104 deletions(-) diff --git a/kube/service.go b/kube/service.go index 29e16ea0..26451f31 100644 --- a/kube/service.go +++ b/kube/service.go @@ -25,17 +25,6 @@ func NewServiceList(role *model.InstanceGroup, clustering bool, settings ExportS } for _, job := range role.JobReferences { - if clustering { - // Create headless, private service - svc, err := newService(role, job, newServiceTypeHeadless, settings) - if err != nil { - return nil, err - } - if svc != nil { - items = append(items, svc) - } - } - // Create private service svc, err := newService(role, job, newServiceTypePrivate, settings) if err != nil { diff --git a/kube/service_test.go b/kube/service_test.go index bde0e3da..073dda14 100644 --- a/kube/service_test.go +++ b/kube/service_test.go @@ -776,42 +776,6 @@ func TestActivePassiveService(t *testing.T) { testhelpers.IsYAMLEqualString(assert.New(t), expected, actual) } } - if assert.NotNil(t, headlessService, "headless service not found") { - actual, err := roundTrip(headlessService) - if assert.NoError(t, err) { - expected := expectedYAML(exportSettings, `--- - apiVersion: v1 - kind: Service - metadata: - name: myrole-tor-set - labels: - app.kubernetes.io/component: myrole-tor-set - app.kubernetes.io/instance: MyRelease - app.kubernetes.io/managed-by: Tiller - app.kubernetes.io/name: MyChart - app.kubernetes.io/version: 1.22.333.4444 - helm.sh/chart: MyChart-42.1_foo - skiff-role-name: "myrole-tor-set" - spec: - clusterIP: None - ports: - - - name: http - port: 80 - protocol: TCP - targetPort: 0 - - - name: https - port: 443 - protocol: TCP - targetPort: 0 - selector: - app.kubernetes.io/component: myrole - skiff-role-active: "true" - `) - testhelpers.IsYAMLEqualString(assert.New(t), expected, actual) - } - } } else { assert.Nil(t, headlessService, "Headless service should not be created when not clustering") } diff --git a/kube/stateful_set_test.go b/kube/stateful_set_test.go index 24677f31..5cd7fa52 100644 --- a/kube/stateful_set_test.go +++ b/kube/stateful_set_test.go @@ -53,7 +53,7 @@ func TestStatefulSetPorts(t *testing.T) { var endpointService, headlessService, privateService helm.Node items := deps.Get("items").Values() - if assert.Len(t, items, 4, "Should have four services per stateful role") { + if assert.Len(t, items, 3, "Should have three services per stateful role") { for _, item := range items { clusterIP := item.Get("spec", "clusterIP") if clusterIP != nil && clusterIP.String() == "None" { @@ -69,7 +69,7 @@ func TestStatefulSetPorts(t *testing.T) { assert.Equal(t, role.Name+"-tor-public", endpointService.Get("metadata", "name").String(), "unexpected endpoint service name") } if assert.NotNil(t, headlessService, "headless service not found") { - assert.Equal(t, role.Name+"-tor-set", headlessService.Get("metadata", "name").String(), "unexpected headless service name") + assert.Equal(t, role.Name+"-set", headlessService.Get("metadata", "name").String(), "unexpected headless service name") } if assert.NotNil(t, privateService, "private service not found") { assert.Equal(t, role.Name+"-tor", privateService.Get("metadata", "name").String(), "unexpected private service name") @@ -102,25 +102,6 @@ func TestStatefulSetPorts(t *testing.T) { selector: app.kubernetes.io/component: myrole clusterIP: None - - - # This is the per-pod naming port - metadata: - name: myrole-tor-set - spec: - ports: - - - name: http - port: 80 - # targetPort must be undefined for headless services - targetPort: 0 - - - name: https - port: 443 - # targetPort must be undefined for headless services - targetPort: 0 - selector: - app.kubernetes.io/component: myrole - clusterIP: None - # This is the private service port metadata: @@ -217,42 +198,6 @@ func TestStatefulSetServices(t *testing.T) { } for _, style := range []string{"kube", "helm"} { t.Run(style, func(t *testing.T) { - if assert.NotNil(t, headlessService, "Headless service not found") { - var actual interface{} - var err error - switch style { - case "helm": - actual, err = RoundtripNode(headlessService, nil) - case "kube": - actual, err = RoundtripKube(headlessService) - default: - panic("Unexpected style " + style) - } - require.NoError(t, err) - testhelpers.IsYAMLEqualString(assert.New(t), `--- - apiVersion: v1 - kind: Service - metadata: - name: myrole-tor-set - labels: - app.kubernetes.io/component: myrole-tor-set - spec: - clusterIP: None - ports: - - - name: http - port: 80 - protocol: TCP - targetPort: 0 - - - name: https - port: 443 - protocol: TCP - targetPort: 0 - selector: - app.kubernetes.io/component: myrole - `, actual) - } if assert.NotNil(t, genericService, "Generic instance group service not found") { var actual interface{} var err error