Merge pull request #1555 from GiganticMinecraft/lbclass

GiganticMinecraft · Dec 20, 2023 · 4305620 · 4305620
2 parents 00e28e5 + 8c77f81
commit 4305620
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 28 deletions.
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,14 +19,10 @@ 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: 10.96.0.135
+            loadBalancerClass: io.cilium/bgp-control-plane
+            annotations:
+              "io.cilium/lb-ipam-ips": "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
@@ -19,14 +19,10 @@ 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: 10.96.0.134
+            loadBalancerClass: io.cilium/bgp-control-plane
+            annotations:
+              "io.cilium/lb-ipam-ips": "10.96.0.134"
           resources:
             requests:
               cpu: "250m"

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
@@ -19,14 +19,10 @@ 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: 10.96.0.133
+            loadBalancerClass: io.cilium/bgp-control-plane
+            annotations:
+              "io.cilium/lb-ipam-ips": "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
@@ -19,14 +19,10 @@ 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: 10.96.0.132
+            loadBalancerClass: io.cilium/bgp-control-plane
+            annotations:
+              "io.cilium/lb-ipam-ips": "10.96.0.132"
           resources:
             requests:
               cpu: "250m"