From 5a17ee46c3a61ecc05f0d4e881f04d44b7f0bb34 Mon Sep 17 00:00:00 2001 From: cnbailian <594647004@qq.com> Date: Fri, 6 Aug 2021 10:01:42 +0800 Subject: [PATCH] fix the selector field of service resource --- pkg/transformer/kubernetes/kubernetes.go | 3 ++- pkg/transformer/kubernetes/kubernetes_test.go | 1 + script/test/fixtures/v2/output-k8s.json | 4 ++-- script/test/fixtures/v2/output-os.json | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkg/transformer/kubernetes/kubernetes.go b/pkg/transformer/kubernetes/kubernetes.go index 10912ffd..465082e4 100644 --- a/pkg/transformer/kubernetes/kubernetes.go +++ b/pkg/transformer/kubernetes/kubernetes.go @@ -199,8 +199,9 @@ func (k *Kubernetes) InitSvc(name string, service kobject.ServiceConfig) *api.Se Name: name, Labels: transformer.ConfigLabels(name), }, + // The selector uses the service.Name, which must be consistent with workloads label Spec: api.ServiceSpec{ - Selector: transformer.ConfigLabels(name), + Selector: transformer.ConfigLabels(service.Name), }, } return svc diff --git a/pkg/transformer/kubernetes/kubernetes_test.go b/pkg/transformer/kubernetes/kubernetes_test.go index 7f077556..a2c97561 100644 --- a/pkg/transformer/kubernetes/kubernetes_test.go +++ b/pkg/transformer/kubernetes/kubernetes_test.go @@ -38,6 +38,7 @@ import ( func newServiceConfig() kobject.ServiceConfig { return kobject.ServiceConfig{ + Name: "app", ContainerName: "name", Image: "image", Environment: []kobject.EnvVar{kobject.EnvVar{Name: "env", Value: "value"}}, diff --git a/script/test/fixtures/v2/output-k8s.json b/script/test/fixtures/v2/output-k8s.json index 7bac4a29..bf82482e 100644 --- a/script/test/fixtures/v2/output-k8s.json +++ b/script/test/fixtures/v2/output-k8s.json @@ -172,7 +172,7 @@ } ], "selector": { - "io.kompose.service": "redis-tcp" + "io.kompose.service": "redis" }, "type": "LoadBalancer" }, @@ -203,7 +203,7 @@ } ], "selector": { - "io.kompose.service": "redis-udp" + "io.kompose.service": "redis" }, "type": "LoadBalancer" }, diff --git a/script/test/fixtures/v2/output-os.json b/script/test/fixtures/v2/output-os.json index cb63ed2e..9d06842e 100644 --- a/script/test/fixtures/v2/output-os.json +++ b/script/test/fixtures/v2/output-os.json @@ -172,7 +172,7 @@ } ], "selector": { - "io.kompose.service": "redis-tcp" + "io.kompose.service": "redis" }, "type": "LoadBalancer" }, @@ -203,7 +203,7 @@ } ], "selector": { - "io.kompose.service": "redis-udp" + "io.kompose.service": "redis" }, "type": "LoadBalancer" },