Default Service name now as the Workload + new annotation to override it

Signed-off-by: Mathieu Benoit <[email protected]>
score-spec · Sep 6, 2024 · 94d5000 · 94d5000
1 parent 4d196ce
commit 94d5000
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/internal/annotations.go b/internal/annotations.go
@@ -19,8 +19,9 @@ import (
 )
 
 const (
-	AnnotationPrefix       = "k8s.score.dev/"
-	WorkloadKindAnnotation = AnnotationPrefix + "kind"
+	AnnotationPrefix              = "k8s.score.dev/"
+	WorkloadKindAnnotation        = AnnotationPrefix + "kind"
+	WorkloadServiceNameAnnotation = AnnotationPrefix + "service-name"
 )
 
 func ListAnnotations(metadata map[string]interface{}) []string {

diff --git a/internal/convert/workloads.go b/internal/convert/workloads.go
@@ -186,7 +186,7 @@ func ConvertWorkload(state *project.State, workloadName string) ([]machineryMeta
 		manifests = append(manifests, &coreV1.Service{
 			TypeMeta: machineryMeta.TypeMeta{Kind: "Service", APIVersion: "v1"},
 			ObjectMeta: machineryMeta.ObjectMeta{
-				Name:        WorkloadServiceName(workloadName),
+				Name:        WorkloadServiceName(workloadName, spec.Metadata),
 				Annotations: topLevelAnnotations,
 				Labels:      commonLabels,
 			},
@@ -279,8 +279,11 @@ func ConvertWorkload(state *project.State, workloadName string) ([]machineryMeta
 	return manifests, nil
 }
 
-func WorkloadServiceName(workloadName string) string {
-	return fmt.Sprintf("%s-svc", workloadName)
+func WorkloadServiceName(workloadName string, specMetadata map[string]interface{}) string {
+	if d, ok := internal.FindAnnotation(specMetadata, internal.WorkloadServiceNameAnnotation); ok {
+		return d
+	}
+	return workloadName
 }
 
 func buildProbe(input scoretypes.HttpProbe) coreV1.ProbeHandler {

diff --git a/internal/convert/workloads_test.go b/internal/convert/workloads_test.go
@@ -150,7 +150,7 @@ metadata:
     app.kubernetes.io/instance: example-abcdef
     app.kubernetes.io/managed-by: score-k8s
     app.kubernetes.io/name: example
-  name: example-svc
+  name: example
 spec:
   ports:
   - name: web

diff --git a/internal/provisioners/core.go b/internal/provisioners/core.go
@@ -173,7 +173,7 @@ func buildWorkloadServices(state *project.State) map[string]NetworkService {
 	out := make(map[string]NetworkService, len(state.Workloads))
 	for workloadName, workloadState := range state.Workloads {
 		ns := NetworkService{
-			ServiceName: convert.WorkloadServiceName(workloadName),
+			ServiceName: convert.WorkloadServiceName(workloadName, state.Workloads[workloadName].Spec.Metadata),
 			Ports:       make(map[string]ServicePort),
 		}
 		if workloadState.Spec.Service != nil {