use ClusterIP for seed, rpc, validator if gateway is enabled

planetarium · Oct 23, 2024 · ceb161d · ceb161d
1 parent fe956ea
commit ceb161d
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 66 deletions.
diff --git a/9c-internal/multiplanetary/network/9c-network.yaml b/9c-internal/multiplanetary/network/9c-network.yaml
@@ -10,10 +10,10 @@ global:
   appProtocolVersion: "200190/54684Ac4ee5B933e72144C4968BEa26056880d71/MEUCIQCNQmMSk4nnbOXSpe9yk0Q2ecyoQYrnZpQxmMeVz+Ve0wIgb9v1jf4R6DL8iikurLgzH9gYQJ+zvEBsEqQqmS55nPc=/ZHU5OnRpbWVzdGFtcHUxMDoyMDI0LTA2LTE3ZQ=="
 
   peerStrings:
-  - "033369e95dbfd970dd9a7b4df31dcf5004d7cfd63289d26cc42bbdd01e25675b6f,tcp-seed-1.9c-network.svc.cluster.local,31234"
+    - "033369e95dbfd970dd9a7b4df31dcf5004d7cfd63289d26cc42bbdd01e25675b6f,tcp-seed-1.9c-network.svc.cluster.local,31234"
 
   iceServers:
-  - "turn://0ed3e48007413e7c2e638f13ddd75ad272c6c507e081bd76a75e4b7adc86c9af:0apejou+ycZFfwtREeXFKdfLj2gCclKzz5ZJ49Cmy6I=@turn-us.planetarium.dev:3478"
+    - "turn://0ed3e48007413e7c2e638f13ddd75ad272c6c507e081bd76a75e4b7adc86c9af:0apejou+ycZFfwtREeXFKdfLj2gCclKzz5ZJ49Cmy6I=@turn-us.planetarium.dev:3478"
 
   networkType: Internal
   planet: OdinInternal
@@ -71,7 +71,7 @@ seed:
     pullPolicy: Always # Overrides the image tag whose default is the chart appVersion.
 
   hosts:
-  - "odin-internal-tcp-seed-1.nine-chronicles.com"
+    - "odin-internal-tcp-seed-1.nine-chronicles.com"
 
   nodeSelector:
     eks.amazonaws.com/nodegroup: odin-spot_2c
@@ -83,13 +83,13 @@ validator:
     pullPolicy: Always
 
   consensusSeedStrings:
-  - 033369e95dbfd970dd9a7b4df31dcf5004d7cfd63289d26cc42bbdd01e25675b6f,tcp-seed-1,31235
+    - 033369e95dbfd970dd9a7b4df31dcf5004d7cfd63289d26cc42bbdd01e25675b6f,tcp-seed-1,31235
 
   hosts:
-  - "odin-internal-validator-5.nine-chronicles.com"
-  - "odin-internal-validator-6.nine-chronicles.com"
-  - "odin-internal-validator-7.nine-chronicles.com"
-  - "odin-internal-validator-8.nine-chronicles.com"
+    - "odin-internal-validator-5.nine-chronicles.com"
+    - "odin-internal-validator-6.nine-chronicles.com"
+    - "odin-internal-validator-7.nine-chronicles.com"
+    - "odin-internal-validator-8.nine-chronicles.com"
 
   storage:
     data: 500Gi
@@ -105,17 +105,17 @@ validator:
   loggingEnabled: true
 
   extraArgs:
-  - --tx-quota-per-signer=1
-  - --arena-participants-sync=false
-  - --tx-life-time=2000000000
+    - --tx-quota-per-signer=1
+    - --arena-participants-sync=false
+    - --tx-life-time=2000000000
 
 remoteHeadless:
   image:
     repository: planetariumhq/ninechronicles-headless
     pullPolicy: Always
 
   hosts:
-  - "odin-internal-rpc-1.nine-chronicles.com"
+    - "odin-internal-rpc-1.nine-chronicles.com"
 
   ports:
     headless: 31234
@@ -136,9 +136,9 @@ remoteHeadless:
   loggingEnabled: true
 
   extraArgs:
-  - --tx-quota-per-signer=1
-  - --remote-key-value-service
-  - --arena-participants-sync=false
+    - --tx-quota-per-signer=1
+    - --remote-key-value-service
+    - --arena-participants-sync=false
 
 dataProvider:
   enabled: true
@@ -151,12 +151,12 @@ dataProvider:
   db:
     local: true
     storage: 100Gi
-    database: ''
-    connectionString: ''
-    host: ''
+    database: ""
+    connectionString: ""
+    host: ""
     port: 3306
     user: user
-    password: ''
+    password: ""
 
   nodeSelector:
     eks.amazonaws.com/nodegroup: odin-spot_2c
@@ -185,8 +185,8 @@ explorer:
     eks.amazonaws.com/nodegroup: odin-spot_2c
 
   extraArgs:
-  - --tx-quota-per-signer=1
-  - --arena-participants-sync=false
+    - --tx-quota-per-signer=1
+    - --arena-participants-sync=false
 
 marketService:
   enabled: true
@@ -200,12 +200,12 @@ marketService:
       eks.amazonaws.com/nodegroup: odin-spot_2c
 
   env:
-  - name: DOTNET_gcServer
-    value: "1"
-  - name: WorkerConfig__SyncShop
-    value: "true"
-  - name: WorkerConfig__SyncProduct
-    value: "true"
+    - name: DOTNET_gcServer
+      value: "1"
+    - name: WorkerConfig__SyncShop
+      value: "true"
+    - name: WorkerConfig__SyncProduct
+      value: "true"
 
 patrolRewardService:
   enabled: true
@@ -236,8 +236,8 @@ rudolfService:
   service:
     enabled: true
     securityGroupIds:
-    - "sg-0c865006315f5b9f0"
-    - "sg-0343e5c4514681670"
+      - "sg-0c865006315f5b9f0"
+      - "sg-0343e5c4514681670"
 
   nodeSelector:
     eks.amazonaws.com/nodegroup: odin-spot_2c
@@ -292,10 +292,10 @@ acc:
     eks.amazonaws.com/nodegroup: odin-spot_2c
 
   env:
-  - name: AccessControlServiceType
-    value: "sqlite"
-  - name: AccessControlServiceConnectionString
-    value: "Data Source=/data/acc.db"
+    - name: AccessControlServiceType
+      value: "sqlite"
+    - name: AccessControlServiceConnectionString
+      value: "Data Source=/data/acc.db"
 
 stateMigrationService:
   enabled: false
@@ -309,7 +309,7 @@ jwtHeadless:
   loggingEnabled: true
 
   extraArgs:
-  - --tx-quota-per-signer=1
+    - --tx-quota-per-signer=1
 
   nodeSelector:
     eks.amazonaws.com/nodegroup: odin-spot_2c

diff --git a/9c-internal/multiplanetary/network/heimdall.yaml b/9c-internal/multiplanetary/network/heimdall.yaml
@@ -9,7 +9,7 @@ global:
   appProtocolVersion: "200071/AB2da648b9154F2cCcAFBD85e0Bc3d51f97330Fc/MEUCIQCjmCK+qUHtgiVfmFIO+uBw.mI4Kpj9T20U4xdIK8I+MgIgSZPL7qAAplhILfRgXwUSDjjfQgQ7A8jgGNqzwDe+h3I=/ZHU5OnRpbWVzdGFtcHUxMDoyMDIzLTA5LTAxZQ=="
 
   peerStrings:
-  - "029fd8f05609cd98f716ca5245a1ebb85ab52289f9499e8453fa367bded66a945c,tcp-seed-1.heimdall.svc.cluster.local,31234"
+    - "029fd8f05609cd98f716ca5245a1ebb85ab52289f9499e8453fa367bded66a945c,tcp-seed-1.heimdall.svc.cluster.local,31234"
 
   trustedAppProtocolVersionSigner: "030ffa9bd579ee1503ce008394f687c182279da913bfaec12baca34e79698a7cd1"
 
@@ -131,12 +131,12 @@ marketService:
       eks.amazonaws.com/nodegroup: heimdall-spot_2c
 
   env:
-  - name: DOTNET_gcServer
-    value: "1"
-  - name: WorkerConfig__SyncShop
-    value: "true"
-  - name: WorkerConfig__SyncProduct
-    value: "true"
+    - name: DOTNET_gcServer
+      value: "1"
+    - name: WorkerConfig__SyncShop
+      value: "true"
+    - name: WorkerConfig__SyncProduct
+      value: "true"
 
 patrolRewardService:
   enabled: true
@@ -159,17 +159,17 @@ remoteHeadless:
     data: 500Gi
 
   hosts:
-  - "heimdall-internal-rpc-1.nine-chronicles.com"
+    - "heimdall-internal-rpc-1.nine-chronicles.com"
 
   nodeSelector:
     eks.amazonaws.com/nodegroup: heimdall-spot_2c
 
   loggingEnabled: true
 
   extraArgs:
-  - --planet=HeimdallInternal
-  - --remote-key-value-service
-  - --arena-participants-sync=false
+    - --planet=HeimdallInternal
+    - --remote-key-value-service
+    - --arena-participants-sync=false
 
 rudolfService:
   enabled: true
@@ -191,8 +191,8 @@ rudolfService:
   service:
     enabled: true
     securityGroupIds:
-    - "sg-0c865006315f5b9f0"
-    - "sg-0343e5c4514681670"
+      - "sg-0c865006315f5b9f0"
+      - "sg-0343e5c4514681670"
 
   nodeSelector:
     eks.amazonaws.com/nodegroup: heimdall-spot_2c
@@ -201,7 +201,7 @@ seed:
   count: 1
 
   hosts:
-  - "heimdall-internal-tcp-seed-1.nine-chronicles.com"
+    - "heimdall-internal-tcp-seed-1.nine-chronicles.com"
 
   nodeSelector:
     eks.amazonaws.com/nodegroup: heimdall-spot_2c
@@ -228,10 +228,10 @@ validator:
   count: 1
 
   consensusSeedStrings:
-  - "029fd8f05609cd98f716ca5245a1ebb85ab52289f9499e8453fa367bded66a945c,tcp-seed-1.heimdall.svc.cluster.local,31235"
+    - "029fd8f05609cd98f716ca5245a1ebb85ab52289f9499e8453fa367bded66a945c,tcp-seed-1.heimdall.svc.cluster.local,31235"
 
   hosts:
-  - "heimdall-internal-validator-1.nine-chronicles.com"
+    - "heimdall-internal-validator-1.nine-chronicles.com"
 
   nodeSelector:
     eks.amazonaws.com/nodegroup: heimdall-spot_2c
@@ -244,9 +244,9 @@ validator:
   loggingEnabled: true
 
   extraArgs:
-  - --tx-life-time=2000000000
-  - --planet=HeimdallInternal
-  - --arena-participants-sync=false
+    - --tx-life-time=2000000000
+    - --planet=HeimdallInternal
+    - --arena-participants-sync=false
 
 worldBoss:
   enabled: true
@@ -295,7 +295,7 @@ testHeadless1:
   loggingEnabled: true
 
   extraArgs:
-  - --tx-quota-per-signer=1
+    - --tx-quota-per-signer=1
 
 acc:
   enabled: false
@@ -309,10 +309,10 @@ acc:
     eks.amazonaws.com/nodegroup: heimdall-spot_2c
 
   env:
-  - name: AccessControlServiceType
-    value: "sqlite"
-  - name: AccessControlServiceConnectionString
-    value: "Data Source=/data/acc.db"
+    - name: AccessControlServiceType
+      value: "sqlite"
+    - name: AccessControlServiceConnectionString
+      value: "Data Source=/data/acc.db"
 
 stateMigrationService:
   enabled: false

diff --git a/charts/all-in-one/templates/gateway.yaml b/charts/all-in-one/templates/gateway.yaml
@@ -35,7 +35,7 @@ spec:
             labelselector: app.kubernetes.io/instance=traefik-{{ $.Release.Name }}
         gatewayClass:
           name: traefik-{{ $.Release.Name }}
-        globalArguments:
+        additionalArguments:
           - --providers.kubernetesgateway.statusaddress.service.name=traefik-{{ $.Release.Name }}
           - --providers.kubernetesgateway.statusaddress.service.namespace={{ $.Release.Name }}
         service:

diff --git a/charts/all-in-one/templates/service.yaml b/charts/all-in-one/templates/service.yaml
@@ -8,17 +8,16 @@ metadata:
   labels:
     app.kubernetes.io/instance: {{ $.Release.Name }}
   annotations:
-    {{- with $.Values.global.service.annotations }}
-      {{- toYaml . | nindent 4 }}
-    {{- end }}
+    {{- if not $.Values.gateway.enabled }}
+    {{- toYaml $.Values.global.service.annotations | nindent 4 }}
     service.beta.kubernetes.io/aws-load-balancer-target-group-attributes: stickiness.enabled=true,stickiness.type=source_ip,preserve_client_ip.enabled=true
     service.beta.kubernetes.io/aws-load-balancer-additional-resource-tags: Environment={{- if eq $.Values.clusterName "9c-main-v2" }}production{{- else }}development{{- end }},Team=game,Owner=jihyung,Service={{ $.Release.Name }},Name=tcp-seed-{{ $index }}
     {{- if index $.Values.seed.hosts $idx }}
     external-dns.alpha.kubernetes.io/hostname: {{ index $.Values.seed.hosts $idx }}
     external-dns.alpha.kubernetes.io/ttl: '60'
     {{- end }}
+    {{- end }}
 spec:
-  externalTrafficPolicy: Local
   ports:
   - port: {{ $.Values.seed.ports.node }}
     targetPort: {{ $.Values.seed.ports.node }}
@@ -36,7 +35,12 @@ spec:
     name: gossip
   selector:
     app: tcp-seed-{{ $index }}
+  {{- if not $.Values.gateway.enabled }}
   type: LoadBalancer
+  externalTrafficPolicy: Local
+  {{- else }}
+  type: ClusterIP
+  {{- end }}
 ---
 {{ end }}
 
@@ -51,15 +55,16 @@ metadata:
   labels:
     app.kubernetes.io/instance: {{ $.Release.Name }}
   annotations:
+    {{- if not $.Values.gateway.enabled }}
     {{- toYaml $.Values.global.service.annotations | nindent 4 }}
     service.beta.kubernetes.io/aws-load-balancer-target-group-attributes: stickiness.enabled=true,stickiness.type=source_ip,preserve_client_ip.enabled=true
     service.beta.kubernetes.io/aws-load-balancer-additional-resource-tags: Environment={{- if eq $.Values.clusterName "9c-main-v2" }}production{{- else }}development{{- end }},Team=game,Owner=jihyung,Service={{ $.Release.Name }},Name=remote-headless-{{ $index }}
     {{- if index $.Values.remoteHeadless.hosts $idx }}
     external-dns.alpha.kubernetes.io/hostname: {{ index $.Values.remoteHeadless.hosts $idx }}
     external-dns.alpha.kubernetes.io/ttl: '60'
     {{- end }}
+    {{- end }}
 spec:
-  externalTrafficPolicy: Local
   ports:
   - name: graphql
     port: {{ $.Values.remoteHeadless.ports.graphql }}
@@ -75,7 +80,12 @@ spec:
     targetPort: {{ $.Values.remoteHeadless.ports.graphql }}
   selector:
     app: remote-headless-{{ $index }}
+  {{- if not $.Values.gateway.enabled }}
   type: LoadBalancer
+  externalTrafficPolicy: Local
+  {{- else }}
+  type: ClusterIP
+  {{- end }}
 
 ---
 {{ end }}
@@ -530,15 +540,16 @@ metadata:
   labels:
     app.kubernetes.io/instance: {{ $.Release.Name }}
   annotations:
+    {{- if not $.Values.gateway.enabled }}
     {{- toYaml $.Values.global.service.annotations | nindent 4 }}
     service.beta.kubernetes.io/aws-load-balancer-target-group-attributes: stickiness.enabled=true,stickiness.type=source_ip,preserve_client_ip.enabled=true
     service.beta.kubernetes.io/aws-load-balancer-additional-resource-tags: Environment={{- if eq $.Values.clusterName "9c-main-v2" }}production{{- else }}development{{- end }},Team=game,Owner=jihyung,Service={{ $.Release.Name }},Name=validator-{{ $index }}
     {{- if index $.Values.validator.hosts $idx }}
     external-dns.alpha.kubernetes.io/hostname: {{ index $.Values.validator.hosts $idx }}
     external-dns.alpha.kubernetes.io/ttl: '60'
     {{- end }}
+    {{- end }}
 spec:
-  externalTrafficPolicy: Local
   ports:
   - port: {{ $.Values.validator.ports.headless }}
     targetPort: {{ $.Values.validator.ports.headless }}
@@ -555,7 +566,12 @@ spec:
     protocol: TCP
   selector:
     app: validator-{{ $index }}
+  {{- if not $.Values.gateway.enabled }}
   type: LoadBalancer
+  externalTrafficPolicy: Local
+  {{- else }}
+  type: ClusterIP
+  {{- end }}
 
 ---
 {{ end }}