From 19d466d5d6eda0d2e2b15047924a4f5603259b35 Mon Sep 17 00:00:00 2001 From: benbierens Date: Fri, 3 Nov 2023 14:53:27 +0100 Subject: [PATCH] better service names --- Framework/KubernetesWorkflow/K8sController.cs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Framework/KubernetesWorkflow/K8sController.cs b/Framework/KubernetesWorkflow/K8sController.cs index 3557a12..f77b473 100644 --- a/Framework/KubernetesWorkflow/K8sController.cs +++ b/Framework/KubernetesWorkflow/K8sController.cs @@ -564,7 +564,7 @@ namespace KubernetesWorkflow var serviceSpec = new V1Service { ApiVersion = "v1", - Metadata = CreateServiceMetadata(), + Metadata = CreateServiceMetadata(containerRecipes), Spec = new V1ServiceSpec { Type = "NodePort", @@ -614,11 +614,18 @@ namespace KubernetesWorkflow client.Run(c => c.DeleteNamespacedService(serviceName, K8sNamespace)); } - private V1ObjectMeta CreateServiceMetadata() + private V1ObjectMeta CreateServiceMetadata(ContainerRecipe[] containerRecipes) { + var exposedRecipe = containerRecipes.FirstOrDefault(c => c.ExposedPorts.Any()); + var name = "service-" + workflowNumberSource.WorkflowNumber; + if (exposedRecipe != null) + { + name = K8sNameUtils.Format(exposedRecipe.Name) + "-" + workflowNumberSource.WorkflowNumber; + } + return new V1ObjectMeta { - Name = "service-" + workflowNumberSource.WorkflowNumber, + Name = name, NamespaceProperty = K8sNamespace }; }