fix(shulker-operator): network admins are optional

BridgeSplash · Nov 2, 2023 · 020a1d0 · 020a1d0
1 parent 471960c
commit 020a1d0
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/packages/shulker-crds/src/v1alpha1/minecraft_cluster.rs b/packages/shulker-crds/src/v1alpha1/minecraft_cluster.rs
@@ -17,8 +17,8 @@ pub struct MinecraftClusterSpec {
     /// List of player UUIDs that are automatically promoted as
     /// network administrators, which are granted all the permissions
     /// by default on all the proxies and servers
-    #[serde(skip_serializing_if = "Vec::is_empty")]
-    pub network_admins: Vec<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub network_admins: Option<Vec<String>>,
 
     /// Redis configuration to use as a synchronization backend
     /// for the different Shulker components

diff --git a/packages/shulker-operator/src/reconcilers/minecraft_cluster/fixtures.rs b/packages/shulker-operator/src/reconcilers/minecraft_cluster/fixtures.rs
@@ -11,7 +11,7 @@ lazy_static! {
             ..ObjectMeta::default()
         },
         spec: MinecraftClusterSpec {
-            network_admins: Vec::new(),
+            network_admins: None,
             redis: None
         },
         status: None,

diff --git a/packages/shulker-operator/src/reconcilers/minecraft_server/gameserver.rs b/packages/shulker-operator/src/reconcilers/minecraft_server/gameserver.rs
@@ -403,7 +403,14 @@ impl GameServerBuilder {
             },
             EnvVar {
                 name: "SHULKER_NETWORK_ADMINS".to_string(),
-                value: Some(cluster.spec.network_admins.join(",")),
+                value: Some(
+                    cluster
+                        .spec
+                        .network_admins
+                        .as_ref()
+                        .map(|list| list.join(","))
+                        .unwrap_or("".to_string()),
+                ),
                 ..EnvVar::default()
             },
             EnvVar {

diff --git a/packages/shulker-operator/src/reconcilers/proxy_fleet/fleet.rs b/packages/shulker-operator/src/reconcilers/proxy_fleet/fleet.rs
@@ -453,7 +453,14 @@ impl FleetBuilder {
             },
             EnvVar {
                 name: "SHULKER_NETWORK_ADMINS".to_string(),
-                value: Some(cluster.spec.network_admins.join(",")),
+                value: Some(
+                    cluster
+                        .spec
+                        .network_admins
+                        .as_ref()
+                        .map(|list| list.join(","))
+                        .unwrap_or("".to_string()),
+                ),
                 ..EnvVar::default()
             },
             EnvVar {