fix: do not "patch" BungeeCord config

GiganticMinecraft · Sep 21, 2023 · 900b1be · 900b1be
1 parent 6e5c130
commit 900b1be
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 79 deletions.
diff --git a/...ichi-kubernetes/app-templates/minecraft-gateway-bungeecord/configs/bungeecord-config.yaml b/...ichi-kubernetes/app-templates/minecraft-gateway-bungeecord/configs/bungeecord-config.yaml
diff --git a/...y/bungeecord/bungeecord-config-patch.yaml → ...gateway/bungeecord/bungeecord-config.yaml b/...y/bungeecord/bungeecord-config-patch.yaml → ...gateway/bungeecord/bungeecord-config.yaml
diff --git a/...p-k8s/manifests/seichi-kubernetes/apps/seichi-debug-gateway/bungeecord/kustomization.yaml b/...p-k8s/manifests/seichi-kubernetes/apps/seichi-debug-gateway/bungeecord/kustomization.yaml
@@ -12,11 +12,11 @@ transformers:
 
 resources:
   - "../../../app-templates/minecraft-gateway-bungeecord"
+  - "./bungeecord-config.yaml"
   - "./bungeesemaphore-redis.yaml"
   - "./redisbungee-redis.yaml"
 
 patchesStrategicMerge:
-  - "bungeecord-config-patch.yaml"
   - "bungeecord-metrics-patch.yaml"
   - "bungeecord-plugin-configs-patch.yaml"
   - "service-bungeecord-loadbalancer.yaml"
diff --git a/...y/bungeecord/bungeecord-config-patch.yaml → ...gateway/bungeecord/bungeecord-config.yaml b/...y/bungeecord/bungeecord-config-patch.yaml → ...gateway/bungeecord/bungeecord-config.yaml
diff --git a/seichi-onp-k8s/manifests/seichi-kubernetes/apps/seichi-gateway/bungeecord/kustomization.yaml b/seichi-onp-k8s/manifests/seichi-kubernetes/apps/seichi-gateway/bungeecord/kustomization.yaml
@@ -3,9 +3,9 @@ kind: Kustomization
 namespace: seichi-gateway
 resources:
   - "../../../app-templates/minecraft-gateway-bungeecord"
+  - "./bungeecord-config.yaml"
 
 patchesStrategicMerge:
-  - "bungeecord-config-patch.yaml"
   - "bungeecord-metrics-patch.yaml"
   - "bungeecord-plugin-configs-patch.yaml"
   - "service-bungeecord-loadbalancer.yaml"