diff --git a/seichi-onp-k8s/manifests/seichi-kubernetes/README.md b/seichi-onp-k8s/manifests/seichi-kubernetes/README.md index 14536395e..22220b6c0 100644 --- 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/seichi-onp-k8s/manifests/seichi-kubernetes/app-templates/minecraft-gateway-bungeecord/service-bungeecord-loadbalancer.yaml b/seichi-onp-k8s/manifests/seichi-kubernetes/app-templates/minecraft-gateway-bungeecord/service-bungeecord-loadbalancer.yaml index 73031c081..4ab4de851 100644 --- a/seichi-onp-k8s/manifests/seichi-kubernetes/app-templates/minecraft-gateway-bungeecord/service-bungeecord-loadbalancer.yaml +++ b/seichi-onp-k8s/manifests/seichi-kubernetes/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/seichi-onp-k8s/manifests/seichi-kubernetes/apps/seichi-debug-gateway/bungeecord/bungeesemaphore-redis.yaml b/seichi-onp-k8s/manifests/seichi-kubernetes/apps/seichi-debug-gateway/bungeecord/bungeesemaphore-redis.yaml index cfa2af797..1db4cb5ef 100644 --- a/seichi-onp-k8s/manifests/seichi-kubernetes/apps/seichi-debug-gateway/bungeecord/bungeesemaphore-redis.yaml +++ b/seichi-onp-k8s/manifests/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/seichi-onp-k8s/manifests/seichi-kubernetes/apps/seichi-debug-gateway/bungeecord/redisbungee-redis.yaml b/seichi-onp-k8s/manifests/seichi-kubernetes/apps/seichi-debug-gateway/bungeecord/redisbungee-redis.yaml index 5c757e8c3..cd14f8496 100644 --- a/seichi-onp-k8s/manifests/seichi-kubernetes/apps/seichi-debug-gateway/bungeecord/redisbungee-redis.yaml +++ b/seichi-onp-k8s/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/seichi-onp-k8s/manifests/seichi-kubernetes/apps/seichi-debug-gateway/bungeecord/service-bungeecord-loadbalancer.yaml b/seichi-onp-k8s/manifests/seichi-kubernetes/apps/seichi-debug-gateway/bungeecord/service-bungeecord-loadbalancer.yaml index 72a68e463..df1388054 100644 --- a/seichi-onp-k8s/manifests/seichi-kubernetes/apps/seichi-debug-gateway/bungeecord/service-bungeecord-loadbalancer.yaml +++ b/seichi-onp-k8s/manifests/seichi-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/seichi-onp-k8s/manifests/seichi-kubernetes/apps/seichi-gateway/bungeecord/service-bungeecord-loadbalancer.yaml b/seichi-onp-k8s/manifests/seichi-kubernetes/apps/seichi-gateway/bungeecord/service-bungeecord-loadbalancer.yaml index ad849760e..868139e8b 100644 --- a/seichi-onp-k8s/manifests/seichi-kubernetes/apps/seichi-gateway/bungeecord/service-bungeecord-loadbalancer.yaml +++ b/seichi-onp-k8s/manifests/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/seichi-onp-k8s/manifests/seichi-kubernetes/apps/seichi-minecraft/redis/bungeesemaphore-redis.yaml b/seichi-onp-k8s/manifests/seichi-kubernetes/apps/seichi-minecraft/redis/bungeesemaphore-redis.yaml index f850cbf60..b3be886e1 100644 --- a/seichi-onp-k8s/manifests/seichi-kubernetes/apps/seichi-minecraft/redis/bungeesemaphore-redis.yaml +++ b/seichi-onp-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/seichi-onp-k8s/manifests/seichi-kubernetes/apps/seichi-minecraft/redis/redisbungee-redis.yaml b/seichi-onp-k8s/manifests/seichi-kubernetes/apps/seichi-minecraft/redis/redisbungee-redis.yaml index 6f643b563..4acdbb8aa 100644 --- a/seichi-onp-k8s/manifests/seichi-kubernetes/apps/seichi-minecraft/redis/redisbungee-redis.yaml +++ b/seichi-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"