Fix kube selectors : do not only select on serviceName, also ProjectName

Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>

kube/charts/kubernetes/kube.go

@@ -25,6 +25,7 @@ import (
 	"time"
 
 	"github.com/compose-spec/compose-go/types"
+	"github.com/docker/compose-cli/api/compose"
 	apps "k8s.io/api/apps/v1"
 	core "k8s.io/api/core/v1"
 	resource "k8s.io/apimachinery/pkg/api/resource"
@@ -34,8 +35,6 @@ import (
 )
 
 const (
-	headlessPort      = 55555
-	headlessName      = "headless"
 	clusterIPHeadless = "None"
 )
 
@@ -52,13 +51,13 @@ func MapToKubernetesObjects(project *types.Project) (map[string]runtime.Object,
 		}
 
 		if service.Deploy != nil && service.Deploy.Mode == "global" {
-			daemonset, err := mapToDaemonset(project, service, project.Name)
+			daemonset, err := mapToDaemonset(project, service)
 			if err != nil {
 				return nil, err
 			}
 			objects[fmt.Sprintf("%s-daemonset.yaml", service.Name)] = daemonset
 		} else {
-			deployment, err := mapToDeployment(project, service, project.Name)
+			deployment, err := mapToDeployment(project, service)
 			if err != nil {
 				return nil, err
 			}
@@ -67,7 +66,7 @@ func MapToKubernetesObjects(project *types.Project) (map[string]runtime.Object,
 		for _, vol := range service.Volumes {
 			if vol.Type == "volume" {
 				vol.Source = strings.ReplaceAll(vol.Source, "_", "-")
-				objects[fmt.Sprintf("%s-persistentvolumeclaim.yaml", vol.Source)] = mapToPVC(service, vol)
+				objects[fmt.Sprintf("%s-persistentvolumeclaim.yaml", vol.Source)] = mapToPVC(project, service, vol)
 			}
 		}
 	}
@@ -92,12 +91,6 @@ func mapToService(project *types.Project, service types.ServiceConfig) *core.Ser
 	}
 	if len(ports) == 0 { // headless service
 		clusterIP = clusterIPHeadless
-		ports = append(ports, core.ServicePort{
-			Name:       headlessName,
-			Port:       headlessPort,
-			TargetPort: intstr.FromInt(headlessPort),
-			Protocol:   core.ProtocolTCP,
-		})
 	}
 	return &core.Service{
 		TypeMeta: meta.TypeMeta{
@@ -109,27 +102,24 @@ func mapToService(project *types.Project, service types.ServiceConfig) *core.Ser
 		},
 		Spec: core.ServiceSpec{
 			ClusterIP: clusterIP,
-			Selector:  map[string]string{"com.docker.compose.service": service.Name},
+			Selector:  selectorLabels(project.Name, service.Name),
 			Ports:     ports,
 			Type:      serviceType,
 		},
 	}
 }
 
-func mapToDeployment(project *types.Project, service types.ServiceConfig, name string) (*apps.Deployment, error) {
+func mapToDeployment(project *types.Project, service types.ServiceConfig) (*apps.Deployment, error) {
-	labels := map[string]string{
+	labels := selectorLabels(project.Name, service.Name)
-		"com.docker.compose.service": service.Name,
-		"com.docker.compose.project": name,
-	}
-	podTemplate, err := toPodTemplate(project, service, labels)
-	if err != nil {
-		return nil, err
-	}
 	selector := new(meta.LabelSelector)
 	selector.MatchLabels = make(map[string]string)
 	for key, val := range labels {
 		selector.MatchLabels[key] = val
 	}
+	podTemplate, err := toPodTemplate(project, service, labels)
+	if err != nil {
+		return nil, err
+	}
 	return &apps.Deployment{
 		TypeMeta: meta.TypeMeta{
 			Kind:       "Deployment",
@@ -148,11 +138,15 @@ func mapToDeployment(project *types.Project, service types.ServiceConfig, name s
 	}, nil
 }
 
-func mapToDaemonset(project *types.Project, service types.ServiceConfig, name string) (*apps.DaemonSet, error) {
+func selectorLabels(projectName string, serviceName string) map[string]string {
-	labels := map[string]string{
+	return map[string]string{
-		"com.docker.compose.service": service.Name,
+		compose.ProjectTag: projectName,
-		"com.docker.compose.project": name,
+		compose.ServiceTag: serviceName,
 	}
+}
+
+func mapToDaemonset(project *types.Project, service types.ServiceConfig) (*apps.DaemonSet, error) {
+	labels := selectorLabels(project.Name, service.Name)
 	podTemplate, err := toPodTemplate(project, service, labels)
 	if err != nil {
 		return nil, err
@@ -195,7 +189,7 @@ func toDeploymentStrategy(deploy *types.DeployConfig) apps.DeploymentStrategy {
 	}
 }
 
-func mapToPVC(service types.ServiceConfig, vol types.ServiceVolumeConfig) runtime.Object {
+func mapToPVC(project *types.Project, service types.ServiceConfig, vol types.ServiceVolumeConfig) runtime.Object {
 	rwaccess := core.ReadWriteOnce
 	if vol.ReadOnly {
 		rwaccess = core.ReadOnlyMany
@@ -207,7 +201,7 @@ func mapToPVC(service types.ServiceConfig, vol types.ServiceVolumeConfig) runtim
 		},
 		ObjectMeta: meta.ObjectMeta{
 			Name:   vol.Source,
-			Labels: map[string]string{"com.docker.compose.service": service.Name},
+			Labels: selectorLabels(project.Name, service.Name),
 		},
 		Spec: core.PersistentVolumeClaimSpec{
 			VolumeName:  vol.Source,

kube/charts/kubernetes/kube_test.go

@@ -48,7 +48,7 @@ services:
 			Name: "nginx",
 		},
 		Spec: core.ServiceSpec{
-			Selector: map[string]string{"com.docker.compose.service": "nginx"},
+			Selector: map[string]string{"com.docker.compose.service": "nginx", "com.docker.compose.project": ""},
 			Ports: []core.ServicePort{
 				{
 					Name:       "80-tcp",
@@ -79,16 +79,9 @@ services:
 			Name: "nginx",
 		},
 		Spec: core.ServiceSpec{
-			Selector:  map[string]string{"com.docker.compose.service": "nginx"},
+			Selector:  map[string]string{"com.docker.compose.service": "nginx", "com.docker.compose.project": ""},
 			ClusterIP: "None",
-			Ports: []core.ServicePort{
+			Ports:     []core.ServicePort{},
-				{
+			Type:      core.ServiceTypeClusterIP,
-					Name:       headlessName,
-					Protocol:   core.ProtocolTCP,
-					Port:       headlessPort,
-					TargetPort: intstr.IntOrString{IntVal: 55555},
-				},
-			},
-			Type: core.ServiceTypeClusterIP,
 		}})
 }

local/compose/labels.go

@@ -19,6 +19,7 @@ package compose
 import (
 	"fmt"
 
+	"github.com/docker/compose-cli/api/compose"
 	"github.com/docker/docker/api/types/filters"
 )
 
@@ -26,14 +27,14 @@ const (
 	containerNumberLabel = "com.docker.compose.container-number"
 	oneoffLabel          = "com.docker.compose.oneoff"
 	slugLabel            = "com.docker.compose.slug"
-	projectLabel         = "com.docker.compose.project"
+	projectLabel         = compose.ProjectTag
-	volumeLabel          = "com.docker.compose.volume"
+	volumeLabel          = compose.VolumeTag
 	workingDirLabel      = "com.docker.compose.project.working_dir"
 	configFilesLabel     = "com.docker.compose.project.config_files"
-	serviceLabel         = "com.docker.compose.service"
+	serviceLabel         = compose.ServiceTag
 	versionLabel         = "com.docker.compose.version"
 	configHashLabel      = "com.docker.compose.config-hash"
-	networkLabel         = "com.docker.compose.network"
+	networkLabel         = compose.NetworkTag
 
 	//ComposeVersion Compose version
 	ComposeVersion = "1.0-alpha"