Merge pull request #1404 from cnbailian/fix-svc-selector

Fix the selector field of service resource

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

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"}},

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"
       },

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"
       },