fix(shulker-proxy-directory): server name is first part

BridgeSplash · Mar 20, 2022 · f9e1694 · f9e1694
1 parent f236d96
commit f9e1694
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/internal/resource/server/builder.go b/internal/resource/server/builder.go
@@ -55,18 +55,12 @@ func (b *MinecraftServerDeploymentResourceBuilder) GetPodSelector() *metav1.Labe
 }
 
 func (b *MinecraftServerDeploymentResourceBuilder) getLabels() map[string]string {
-	labels := map[string]string{
+	return map[string]string{
 		"app.kubernetes.io/name":                      b.Instance.Name,
 		"app.kubernetes.io/component":                 "minecraft-server",
 		"app.kubernetes.io/part-of":                   b.Instance.Spec.ClusterRef.Name,
 		"app.kubernetes.io/created-by":                "shulker-operator",
 		"minecraftcluster.shulkermc.io/name":          b.Instance.Spec.ClusterRef.Name,
 		"minecraftserverdeployment.shulkermc.io/name": b.Instance.Name,
 	}
-
-	for _, tag := range b.Instance.Spec.Tags {
-		labels[fmt.Sprintf("minecraftserverdeployment.shulkermc.io/tag-%s", tag)] = "true"
-	}
-
-	return labels
 }
diff --git a/...t/shulker-proxy-directory/src/main/java/io/shulkermc/directory/ShulkerProxyDirectory.java b/...t/shulker-proxy-directory/src/main/java/io/shulkermc/directory/ShulkerProxyDirectory.java
@@ -91,7 +91,7 @@ private void updateServerDirectory(List<EndpointSubset> subsets) {
 
         Map<String, List<String>> serversPerTag = new HashMap<>();
         reducedSubsets.entrySet().parallelStream()
-                .filter((entry) -> entry.getKey().contains("-limbo-"))
+                .filter((entry) -> entry.getKey().startsWith("limbo-"))
                 .forEach((entry) -> {
                     serversPerTag.putIfAbsent("limbo", new ArrayList<>());
                     serversPerTag.get("limbo").add(entry.getKey());