fix(shulker-operator): plugins and patches joined with bad separator

BridgeSplash · Oct 31, 2023 · 13d142e · 13d142e
1 parent d4083d1
commit 13d142e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/packages/shulker-operator/src/reconcilers/minecraft_server/gameserver.rs b/packages/shulker-operator/src/reconcilers/minecraft_server/gameserver.rs
@@ -32,6 +32,7 @@ use shulker_crds::v1alpha1::minecraft_server::MinecraftServerSpec;
 use super::config_map::ConfigMapBuilder;
 use super::MinecraftServerReconciler;
 
+const MINECRAFT_SERVER_IMAGE: &str = "itzg/minecraft-server:2023.10.1-java17";
 const MINECRAFT_SERVER_SHULKER_CONFIG_DIR: &str = "/mnt/shulker/config";
 const MINECRAFT_SERVER_CONFIG_DIR: &str = "/config";
 const MINECRAFT_SERVER_DATA_DIR: &str = "/data";
@@ -171,7 +172,7 @@ impl GameServerBuilder {
                 ..Container::default()
             }]),
             containers: vec![Container {
-                image: Some("itzg/minecraft-server:2022.16.0-java17".to_string()),
+                image: Some(MINECRAFT_SERVER_IMAGE.to_string()),
                 name: "minecraft-server".to_string(),
                 env: Some(Self::get_env(&minecraft_server.spec)),
                 image_pull_policy: Some("IfNotPresent".to_string()),
@@ -340,7 +341,7 @@ impl GameServerBuilder {
 
             env.push(EnvVar {
                 name: "SERVER_PLUGIN_URLS".to_string(),
-                value: Some(urls.join(",")),
+                value: Some(urls.join(";")),
                 ..EnvVar::default()
             })
         }
@@ -355,7 +356,7 @@ impl GameServerBuilder {
 
             env.push(EnvVar {
                 name: "SERVER_PATCH_URLS".to_string(),
-                value: Some(urls.join(",")),
+                value: Some(urls.join(";")),
                 ..EnvVar::default()
             })
         }

diff --git a/packages/shulker-operator/src/reconcilers/minecraft_server_fleet/fleet.rs b/packages/shulker-operator/src/reconcilers/minecraft_server_fleet/fleet.rs
@@ -12,7 +12,6 @@ use crate::resources::resourceref_resolver::ResourceRefResolver;
 use google_agones_crds::v1::fleet::Fleet;
 use google_agones_crds::v1::fleet::FleetSpec;
 use shulker_crds::v1alpha1::minecraft_server::MinecraftServer;
-use shulker_crds::v1alpha1::minecraft_server::MinecraftServerConfigurationSpec;
 use shulker_crds::v1alpha1::minecraft_server::MinecraftServerSpec;
 use shulker_crds::v1alpha1::minecraft_server_fleet::MinecraftServerFleet;
 
@@ -48,6 +47,9 @@ impl<'a> ResourceBuilder<'a> for FleetBuilder {
         _existing_fleet: Option<&Self::ResourceType>,
         _context: Option<Self::Context>,
     ) -> Result<Self::ResourceType, anyhow::Error> {
+        let mut config_clone = minecraft_server_fleet.spec.template.spec.config.clone();
+        config_clone.existing_config_map_name = Some(ConfigMapBuilder::name(minecraft_server_fleet));
+
         let fake_mincraft_server = MinecraftServer {
             metadata: ObjectMeta {
                 namespace: minecraft_server_fleet.namespace(),
@@ -61,10 +63,7 @@ impl<'a> ResourceBuilder<'a> for FleetBuilder {
                     .spec
                     .cluster_ref
                     .clone(),
-                config: MinecraftServerConfigurationSpec {
-                    existing_config_map_name: Some(ConfigMapBuilder::name(minecraft_server_fleet)),
-                    ..MinecraftServerConfigurationSpec::default()
-                },
+                config: config_clone,
                 ..minecraft_server_fleet.spec.template.spec.clone()
             },
             status: None,

diff --git a/packages/shulker-operator/src/reconcilers/proxy_fleet/fleet.rs b/packages/shulker-operator/src/reconcilers/proxy_fleet/fleet.rs
@@ -42,6 +42,7 @@ use shulker_crds::v1alpha1::proxy_fleet::ProxyFleetTemplateSpec;
 use super::config_map::ConfigMapBuilder;
 use super::ProxyFleetReconciler;
 
+const PROXY_IMAGE: &str = "itzg/bungeecord:java17-2022.4.1";
 const PROXY_SHULKER_CONFIG_DIR: &str = "/mnt/shulker/config";
 const PROXY_SHULKER_FORWARDING_SECRET_DIR: &str = "/mnt/shulker/forwarding-secret";
 const PROXY_DATA_DIR: &str = "/server";
@@ -204,7 +205,7 @@ impl FleetBuilder {
                 ..Container::default()
             }]),
             containers: vec![Container {
-                image: Some("itzg/bungeecord:java17-2022.4.1".to_string()),
+                image: Some(PROXY_IMAGE.to_string()),
                 name: "proxy".to_string(),
                 ports: Some(vec![ContainerPort {
                     name: Some("minecraft".to_string()),
@@ -391,7 +392,7 @@ impl FleetBuilder {
 
             env.push(EnvVar {
                 name: "PROXY_PLUGIN_URLS".to_string(),
-                value: Some(urls.join(",")),
+                value: Some(urls.join(";")),
                 ..EnvVar::default()
             })
         }
@@ -407,7 +408,7 @@ impl FleetBuilder {
 
             env.push(EnvVar {
                 name: "PROXY_PATCH_URLS".to_string(),
-                value: Some(urls.join(",")),
+                value: Some(urls.join(";")),
                 ..EnvVar::default()
             })
         }