Merge pull request #1450 from GiganticMinecraft/fix-lb

IP再アサイン,loadBalancerClassを明示
GiganticMinecraft · Dec 5, 2023 · e3df2a7 · e3df2a7
2 parents af46087 + 30dd448
commit e3df2a7
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 8 deletions.
diff --git a/seichi-onp-k8s/manifests/seichi-kubernetes/README.md b/seichi-onp-k8s/manifests/seichi-kubernetes/README.md
@@ -54,10 +54,10 @@ TCP パケットをそのまま送り届ける必要があります。
 
 | サービス                       | `Service` の VIP                                            | 
 | ------------------------------ | ----------------------------------------------------------- | 
-| 本番 RedisBungee 用 Redis      | [`192.168.0.132`](https://github.com/GiganticMinecraft/seichi_infra/blob/fc00e4f9b755798ed2fcd80c76b68dac49c3dc16/seichi-onp-k8s/manifests/seichi-kubernetes/apps/seichi-minecraft/redisbungee-redis.yaml#L24) |
-| 本番 BungeeSemaphore 用 Redis  | [`192.168.0.133`](https://github.com/GiganticMinecraft/seichi_infra/blob/fc00e4f9b755798ed2fcd80c76b68dac49c3dc16/seichi-onp-k8s/manifests/seichi-kubernetes/apps/seichi-minecraft/bungeesemaphore-redis.yaml#L24) |
-| Debug RedisBungee 用 Redis     | [`192.168.0.134`](https://github.com/GiganticMinecraft/seichi_infra/blob/fc00e4f9b755798ed2fcd80c76b68dac49c3dc16/seichi-onp-k8s/manifests/seichi-kubernetes/apps/seichi-debug-minecraft/redisbungee-redis.yaml#L24) |
-| Debug BungeeSemaphore 用 Redis | [`192.168.0.135`](https://github.com/GiganticMinecraft/seichi_infra/blob/fc00e4f9b755798ed2fcd80c76b68dac49c3dc16/seichi-onp-k8s/manifests/seichi-kubernetes/apps/seichi-debug-minecraft/bungeesemaphore-redis.yaml#L24) |
+| 本番 RedisBungee 用 Redis      | [`10.96.0.132`](https://github.com/GiganticMinecraft/seichi_infra/blob/fc00e4f9b755798ed2fcd80c76b68dac49c3dc16/seichi-onp-k8s/manifests/seichi-kubernetes/apps/seichi-minecraft/redisbungee-redis.yaml#L24) |
+| 本番 BungeeSemaphore 用 Redis  | [`10.96.0.133`](https://github.com/GiganticMinecraft/seichi_infra/blob/fc00e4f9b755798ed2fcd80c76b68dac49c3dc16/seichi-onp-k8s/manifests/seichi-kubernetes/apps/seichi-minecraft/bungeesemaphore-redis.yaml#L24) |
+| Debug RedisBungee 用 Redis     | [`10.96.0.134`](https://github.com/GiganticMinecraft/seichi_infra/blob/fc00e4f9b755798ed2fcd80c76b68dac49c3dc16/seichi-onp-k8s/manifests/seichi-kubernetes/apps/seichi-debug-minecraft/redisbungee-redis.yaml#L24) |
+| Debug BungeeSemaphore 用 Redis | [`10.96.0.135`](https://github.com/GiganticMinecraft/seichi_infra/blob/fc00e4f9b755798ed2fcd80c76b68dac49c3dc16/seichi-onp-k8s/manifests/seichi-kubernetes/apps/seichi-debug-minecraft/bungeesemaphore-redis.yaml#L24) |
 
 
 ## Kubernetes クラスタのブートストラップについて

diff --git a/...ubernetes/app-templates/minecraft-gateway-bungeecord/service-bungeecord-loadbalancer.yaml b/...ubernetes/app-templates/minecraft-gateway-bungeecord/service-bungeecord-loadbalancer.yaml
@@ -5,6 +5,7 @@ metadata:
   name: bungeecord
 spec:
   type: LoadBalancer
+  loadBalancerClass: io.cilium/bgp-control-plane
   ports:
     - name: bungee
       port: 25565

diff --git a/...nifests/seichi-kubernetes/apps/seichi-debug-gateway/bungeecord/bungeesemaphore-redis.yaml b/...nifests/seichi-kubernetes/apps/seichi-debug-gateway/bungeecord/bungeesemaphore-redis.yaml
@@ -19,8 +19,14 @@ spec:
           notify-keyspace-events "Eg$x"
         master:
           service:
+            # loadBalancerIP has been deprecated in k8s v1.24
+            # ciliumのlb-ipamを使用しているので今後それに沿った記載に改める必要がある
+            # https://docs.cilium.io/en/stable/network/lb-ipam/#requesting-ips
+            # FIXME .spec.loadBalancerClass が未指定の場合、lb-ipamによるIPアサインしか行われない
+            # 負荷分散を実施するには .spec.loadBalancerClass を明示的に指定する必要がある
+            # https://docs.cilium.io/en/latest/network/lb-ipam/#loadbalancerclass
             type: LoadBalancer
-            loadBalancerIP: 192.168.0.135
+            loadBalancerIP: 10.96.0.135
           resources:
             requests:
               cpu: "250m"

diff --git a/...s/manifests/seichi-kubernetes/apps/seichi-debug-gateway/bungeecord/redisbungee-redis.yaml b/...s/manifests/seichi-kubernetes/apps/seichi-debug-gateway/bungeecord/redisbungee-redis.yaml
@@ -22,8 +22,11 @@ spec:
             # loadBalancerIP has been deprecated in k8s v1.24
             # ciliumのlb-ipamを使用しているので今後それに沿った記載に改める必要がある
             # https://docs.cilium.io/en/stable/network/lb-ipam/#requesting-ips
+            # FIXME .spec.loadBalancerClass が未指定の場合、lb-ipamによるIPアサインしか行われない
+            # 負荷分散を実施するには .spec.loadBalancerClass を明示的に指定する必要がある
+            # https://docs.cilium.io/en/latest/network/lb-ipam/#loadbalancerclass
             type: LoadBalancer
-            loadBalancerIP: 192.168.0.134
+            loadBalancerIP: 10.96.0.134
           resources:
             requests:
               cpu: "250m"

diff --git a/...ichi-kubernetes/apps/seichi-debug-gateway/bungeecord/service-bungeecord-loadbalancer.yaml b/...ichi-kubernetes/apps/seichi-debug-gateway/bungeecord/service-bungeecord-loadbalancer.yaml
@@ -7,3 +7,5 @@ metadata:
     "io.cilium/lb-ipam-ips": "10.96.0.131"
 spec:
   type: LoadBalancer
+  loadBalancerClass: io.cilium/bgp-control-plane
+
diff --git a/...sts/seichi-kubernetes/apps/seichi-gateway/bungeecord/service-bungeecord-loadbalancer.yaml b/...sts/seichi-kubernetes/apps/seichi-gateway/bungeecord/service-bungeecord-loadbalancer.yaml
@@ -7,3 +7,5 @@ metadata:
     "io.cilium/lb-ipam-ips": "10.96.0.130"
 spec:
   type: LoadBalancer
+  loadBalancerClass: io.cilium/bgp-control-plane
+
diff --git a/...np-k8s/manifests/seichi-kubernetes/apps/seichi-minecraft/redis/bungeesemaphore-redis.yaml b/...np-k8s/manifests/seichi-kubernetes/apps/seichi-minecraft/redis/bungeesemaphore-redis.yaml
@@ -22,8 +22,11 @@ spec:
             # loadBalancerIP has been deprecated in k8s v1.24
             # ciliumのlb-ipamを使用しているので今後それに沿った記載に改める必要がある
             # https://docs.cilium.io/en/stable/network/lb-ipam/#requesting-ips
+            # FIXME .spec.loadBalancerClass が未指定の場合、lb-ipamによるIPアサインしか行われない
+            # 負荷分散を実施するには .spec.loadBalancerClass を明示的に指定する必要がある
+            # https://docs.cilium.io/en/latest/network/lb-ipam/#loadbalancerclass
             type: LoadBalancer
-            loadBalancerIP: 192.168.0.133
+            loadBalancerIP: 10.96.0.133
           resources:
             requests:
               cpu: "250m"

diff --git a/...hi-onp-k8s/manifests/seichi-kubernetes/apps/seichi-minecraft/redis/redisbungee-redis.yaml b/...hi-onp-k8s/manifests/seichi-kubernetes/apps/seichi-minecraft/redis/redisbungee-redis.yaml
@@ -22,8 +22,11 @@ spec:
             # loadBalancerIP has been deprecated in k8s v1.24
             # ciliumのlb-ipamを使用しているので今後それに沿った記載に改める必要がある
             # https://docs.cilium.io/en/stable/network/lb-ipam/#requesting-ips
+            # FIXME .spec.loadBalancerClass が未指定の場合、lb-ipamによるIPアサインしか行われない
+            # 負荷分散を実施するには .spec.loadBalancerClass を明示的に指定する必要がある
+            # https://docs.cilium.io/en/latest/network/lb-ipam/#loadbalancerclass
             type: LoadBalancer
-            loadBalancerIP: 192.168.0.132
+            loadBalancerIP: 10.96.0.132
           resources:
             requests:
               cpu: "250m"