Skip to content

Commit 8d4de7a

Browse files
committed
fix(shulker-proxy-directory): name of the default target
1 parent 6cae574 commit 8d4de7a

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
lines changed

internal/resource/cluster/limbo_minecraftserver.go

+8
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,14 @@ func (b *MinecraftClusterLimboMinecraftServerBuilder) Update(object client.Objec
4747
World: &shulkermciov1alpha1.MinecraftServerWorldSpec{
4848
SchematicUrl: "https://i.jeremylvln.fr/shulker/limbo.schematic",
4949
},
50+
PodOverrides: &shulkermciov1alpha1.MinecraftServerPodOverridesSpec{
51+
LivenessProbe: &shulkermciov1alpha1.MinecraftServerPodProbeSpec{
52+
InitialDelaySeconds: 10,
53+
},
54+
ReadinessProbe: &shulkermciov1alpha1.MinecraftServerPodProbeSpec{
55+
InitialDelaySeconds: 10,
56+
},
57+
},
5058
Resources: &corev1.ResourceRequirements{
5159
Requests: corev1.ResourceList{
5260
"cpu": *resource.NewScaledQuantity(250, resource.Milli),

internal/resource/server/pod.go

-1
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,6 @@ func (b *MinecraftServerPodBuilder) getInitContainers() []corev1.Container {
192192

193193
func (b *MinecraftServerPodBuilder) getPodEnv() []corev1.EnvVar {
194194
shouldEnforceWhitelist := len(b.Instance.Spec.WhitelistedPlayers) > 0
195-
maxMemory := b.Instance.Spec.Resources.Limits.Memory().ScaledValue(resource.Mega)
196195

197196
env := []corev1.EnvVar{
198197
{

support/shulker-proxy-directory/src/main/java/io/shulkermc/directory/ServerConnectListener.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public ServerConnectListener(ShulkerProxyDirectory plugin) {
3232

3333
@EventHandler(priority = EventPriority.LOWEST)
3434
public void onServerConnect(ServerConnectEvent event) {
35-
if (event.getTarget().getName().equals("limbo")) {
35+
if (event.getTarget().getName().equals("lobby")) {
3636
return;
3737
}
3838

support/shulker-proxy-directory/src/main/java/io/shulkermc/directory/ShulkerProxyDirectory.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,11 @@ private synchronized void updateServerDirectory(List<MinecraftClusterStatus.Serv
8585
List<String> serverPoolNames = serverPool.parallelStream()
8686
.map(MinecraftClusterStatus.ServerPoolEntry::getName).toList();
8787

88+
new HashSet<>(proxyServers.keySet()).stream()
89+
.filter((serverName) -> !serverPoolNames.contains(serverName))
90+
.peek((serverName) -> this.getLogger().info(String.format("Removing server %s from directory", serverName)))
91+
.forEach(proxyServers::remove);
92+
8893
serverPool.stream()
8994
.filter((server) -> server != null && server.getName() != null && server.getAddress() != null && !proxyServers.containsKey(server.getName()))
9095
.map((server) -> {
@@ -94,11 +99,6 @@ private synchronized void updateServerDirectory(List<MinecraftClusterStatus.Serv
9499
.peek((serverInfo) -> this.getLogger().info(String.format("Adding server %s (%s) to directory", serverInfo.getName(), serverInfo.getSocketAddress())))
95100
.forEach((serverInfo) -> proxyServers.put(serverInfo.getName(), serverInfo));
96101

97-
new HashSet<>(proxyServers.keySet()).stream()
98-
.filter((serverName) -> !serverPoolNames.contains(serverName))
99-
.peek((serverName) -> this.getLogger().info(String.format("Removing server %s from directory", serverName)))
100-
.forEach(proxyServers::remove);
101-
102102
this.serverPool = serverPool.parallelStream()
103103
.collect(Collectors.toMap(MinecraftClusterStatus.ServerPoolEntry::getName, (serverEntry) -> serverEntry));
104104

0 commit comments

Comments
 (0)