fix(shulker-operator): set velocity config file version to 2.6 to avo…

…id motd migration
jeremylvln · Feb 2, 2024 · 40b90fc · 40b90fc
1 parent 0dfc375
commit 40b90fc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/packages/shulker-operator/src/reconcilers/proxy_fleet/config_map.rs b/packages/shulker-operator/src/reconcilers/proxy_fleet/config_map.rs
@@ -502,7 +502,7 @@ mod velocity {
                 .unwrap_or(false);
 
             VelocityToml {
-                config_version: "2.5".to_string(),
+                config_version: "2.6".to_string(),
                 bind: "0.0.0.0:25577".to_string(),
                 motd: spec.motd.clone(),
                 show_max_players: spec.max_players,
@@ -614,7 +614,7 @@ mod velocity {
         fn to_string() {
             // G
             let config = super::VelocityToml {
-                config_version: "2.5".to_string(),
+                config_version: "2.6".to_string(),
                 bind: "0.0.0.0:25577".to_string(),
                 motd: "A Motd".to_string(),
                 show_max_players: 100,

diff --git a/...pshots/shulker_operator__reconcilers__proxy_fleet__config_map__tests__build_snapshot.snap b/...pshots/shulker_operator__reconcilers__proxy_fleet__config_map__tests__build_snapshot.snap
@@ -8,7 +8,7 @@ data:
   init-fs.sh: "#!/bin/sh\nset -euo pipefail\nset -o xtrace\n\ncp \"${SHULKER_CONFIG_DIR}/probe-readiness.sh\" \"${SHULKER_PROXY_DATA_DIR}/probe-readiness.sh\"\ncat \"${SHULKER_CONFIG_DIR}/server-icon.png\" | base64 -d > \"${SHULKER_PROXY_DATA_DIR}/server-icon.png\"\n\nif [ \"${SHULKER_VERSION_CHANNEL}\" == \"Velocity\" ]; then\n  cp \"${SHULKER_CONFIG_DIR}/velocity-config.toml\" \"${SHULKER_PROXY_DATA_DIR}/velocity.toml\"\n  echo \"dummy\" > \"${SHULKER_PROXY_DATA_DIR}/forwarding.secret\"\nelse\n  cp \"${SHULKER_CONFIG_DIR}/bungeecord-config.yml\" \"${SHULKER_PROXY_DATA_DIR}/config.yml\"\nfi\n\nif [ ! -z \"${SHULKER_PROXY_PLUGIN_URLS+x}\" ]; then\n  mkdir -p \"${SHULKER_PROXY_DATA_DIR}/plugins\"\n  for plugin_url in ${SHULKER_PROXY_PLUGIN_URLS//;/ }; do\n    (cd \"${SHULKER_PROXY_DATA_DIR}/plugins\" && wget \"${plugin_url}\")\n  done\nfi\n\nif [ ! -z \"${SHULKER_PROXY_PATCH_URLS+x}\" ]; then\n  for patch_url in ${SHULKER_PROXY_PATCH_URLS//;/ }; do\n    (cd \"${SHULKER_PROXY_DATA_DIR}\" && wget \"${patch_url}\" -O - | tar -xzv)\n  done\nfi\n"
   probe-readiness.sh: "#!/bin/sh\nset -euo pipefail\nset -o xtrace\n\nif [ -f \"/tmp/drain-lock\" ]; then\n  echo \"Drain lock found\" && exit 1\nfi\n\nbash /health.sh\n"
   server-icon.png: abc==
-  velocity-config.toml: "config-version = \"2.5\"\nbind = \"0.0.0.0:25577\"\nmotd = \"A Motd\"\nshow-max-players = 1000\nonline-mode = true\nforce-key-authentication = true\nprevent-client-proxy-connections = true\nforwarding-secret-file = \"/mnt/shulker/forwarding-secret/key\"\nplayer-info-forwarding-mode = \"modern\"\n\n[servers]\nlobby = \"localhost:30000\"\nlimbo = \"localhost:30001\"\ntry = [\"lobby\", \"limbo\"]\n\n[forced-hosts]\n\n[advanced]\nhaproxy-protocol = true\ntcp-fast-open = true\n\n"
+  velocity-config.toml: "config-version = \"2.6\"\nbind = \"0.0.0.0:25577\"\nmotd = \"A Motd\"\nshow-max-players = 1000\nonline-mode = true\nforce-key-authentication = true\nprevent-client-proxy-connections = true\nforwarding-secret-file = \"/mnt/shulker/forwarding-secret/key\"\nplayer-info-forwarding-mode = \"modern\"\n\n[servers]\nlobby = \"localhost:30000\"\nlimbo = \"localhost:30001\"\ntry = [\"lobby\", \"limbo\"]\n\n[forced-hosts]\n\n[advanced]\nhaproxy-protocol = true\ntcp-fast-open = true\n\n"
 metadata:
   labels:
     app.kubernetes.io/component: proxy

diff --git a/...s/shulker_operator__reconcilers__proxy_fleet__config_map__velocity__tests__from_spec.snap b/...s/shulker_operator__reconcilers__proxy_fleet__config_map__velocity__tests__from_spec.snap
@@ -2,7 +2,7 @@
 source: packages/shulker-operator/src/reconcilers/proxy_fleet/config_map.rs
 expression: config
 ---
-config-version = '2.5'
+config-version = '2.6'
 bind = '0.0.0.0:25577'
 motd = 'A Motd'
 show-max-players = 100

diff --git a/...s/shulker_operator__reconcilers__proxy_fleet__config_map__velocity__tests__to_string.snap b/...s/shulker_operator__reconcilers__proxy_fleet__config_map__velocity__tests__to_string.snap
@@ -2,7 +2,7 @@
 source: packages/shulker-operator/src/reconcilers/proxy_fleet/config_map.rs
 expression: toml
 ---
-config-version = "2.5"
+config-version = "2.6"
 bind = "0.0.0.0:25577"
 motd = "A Motd"
 show-max-players = 100