Merge pull request #123 from srl-labs/fix/svc-selector-for-non-prefix…

…ed-deployments fix: update the deployment selector for services for non-prefixed topos
srl-labs · Feb 22, 2024 · 3fcbac8 · 3fcbac8
2 parents 720d6ce + 01ce602
commit 3fcbac8
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/controllers/topology/serviceexpose.go b/controllers/topology/serviceexpose.go
@@ -119,6 +119,10 @@ func (r *ServiceExposeReconciler) renderServiceBase(
 
 	deploymentName := fmt.Sprintf("%s-%s", owningTopologyName, nodeName)
 
+	if ResolveTopologyRemovePrefix(owningTopology) {
+		deploymentName = nodeName
+	}
+
 	selectorLabels := map[string]string{
 		clabernetesconstants.LabelApp:           clabernetesconstants.Clabernetes,
 		clabernetesconstants.LabelName:          deploymentName,

diff --git a/controllers/topology/servicefabric.go b/controllers/topology/servicefabric.go
@@ -103,6 +103,10 @@ func (r *ServiceFabricReconciler) renderServiceBase(
 
 	deploymentName := fmt.Sprintf("%s-%s", owningTopologyName, nodeName)
 
+	if ResolveTopologyRemovePrefix(owningTopology) {
+		deploymentName = nodeName
+	}
+
 	selectorLabels := map[string]string{
 		clabernetesconstants.LabelApp:           clabernetesconstants.Clabernetes,
 		clabernetesconstants.LabelName:          deploymentName,

diff --git a/controllers/topology/test-fixtures/golden/serviceexpose/render-service/simple-no-prefix.json b/controllers/topology/test-fixtures/golden/serviceexpose/render-service/simple-no-prefix.json
@@ -5,7 +5,7 @@
         "creationTimestamp": null,
         "labels": {
             "clabernetes/app": "clabernetes",
-            "clabernetes/name": "render-service-expose-test-srl1",
+            "clabernetes/name": "srl1",
             "clabernetes/topologyKind": "containerlab",
             "clabernetes/topologyNode": "srl1",
             "clabernetes/topologyOwner": "render-service-expose-test",
@@ -101,7 +101,7 @@
         ],
         "selector": {
             "clabernetes/app": "clabernetes",
-            "clabernetes/name": "render-service-expose-test-srl1",
+            "clabernetes/name": "srl1",
             "clabernetes/topologyNode": "srl1",
             "clabernetes/topologyOwner": "render-service-expose-test"
         },

diff --git a/controllers/topology/test-fixtures/golden/servicefabric/render-service/simple-no-prefix.json b/controllers/topology/test-fixtures/golden/servicefabric/render-service/simple-no-prefix.json
@@ -5,7 +5,7 @@
         "creationTimestamp": null,
         "labels": {
             "clabernetes/app": "clabernetes",
-            "clabernetes/name": "render-service-fabric-test-srl1",
+            "clabernetes/name": "srl1",
             "clabernetes/topologyKind": "containerlab",
             "clabernetes/topologyNode": "srl1",
             "clabernetes/topologyOwner": "render-service-fabric-test",
@@ -29,7 +29,7 @@
         ],
         "selector": {
             "clabernetes/app": "clabernetes",
-            "clabernetes/name": "render-service-fabric-test-srl1",
+            "clabernetes/name": "srl1",
             "clabernetes/topologyNode": "srl1",
             "clabernetes/topologyOwner": "render-service-fabric-test"
         },