test from 9c-dev

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

Hide file tree

Showing 4 changed files with 52 additions and 9 deletions.
diff --git a/9c-dev/heimdall-internal-tcproute-20241022/application.yaml b/9c-dev/heimdall-internal-tcproute-20241022/application.yaml
@@ -0,0 +1,17 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: heimdall-internal-tcproute-20241022
+  namespace: argocd
+spec:
+  project: default
+  source:
+    repoURL: https://github.com/planetarium/9c-infra.git
+    targetRevision: netmq-clusterip
+    path: charts/remote-headless
+    helm:
+      valueFiles:
+        - ../../9c-dev/heimdall-internal-tcproute-20241022/values.yaml
+  destination:
+    server: https://kubernetes.default.svc
+    namespace: heimdall-internal-tcproute-20241022
diff --git a/9c-dev/heimdall-internal-tcproute-20241022/values.yaml b/9c-dev/heimdall-internal-tcproute-20241022/values.yaml
@@ -0,0 +1,27 @@
+logLevel: "debug"
+
+clusterName: "9c-dev-v2"
+namespace: "heimdall-internal-tcproute-20241022"
+
+image:
+  tag: "200"
+
+appProtocolVersion: "200071/AB2da648b9154F2cCcAFBD85e0Bc3d51f97330Fc/MEUCIQCjmCK+qUHtgiVfmFIO+uBw.mI4Kpj9T20U4xdIK8I+MgIgSZPL7qAAplhILfRgXwUSDjjfQgQ7A8jgGNqzwDe+h3I=/ZHU5OnRpbWVzdGFtcHUxMDoyMDIzLTA5LTAxZQ=="
+genesisBlockPath: "https://planets-internal.nine-chronicles.com/planets/0x100000000001/genesis"
+trustedAppProtocolVersionSigner: "030ffa9bd579ee1503ce008394f687c182279da913bfaec12baca34e79698a7cd1"
+headlessAppsettingsPath: "https://9c-cluster-config.s3.us-east-2.amazonaws.com/9c-internal/heimdall/appsettings.json"
+
+peerStrings:
+- "029fd8f05609cd98f716ca5245a1ebb85ab52289f9499e8453fa367bded66a945c,heimdall-internal-rpc.nine-chronicles.com,31234"
+
+useTurnServer: false
+count: 1
+hosts:
+- "9c-dev-heimdall-internal-rpc-1.planetarium.network"
+
+networkType: Internal
+planet: HeimdallInternal
+consensusType: pbft
+
+storage:
+  class: gp3-extensible
diff --git a/charts/remote-headless/templates/remote-headless.yaml b/charts/remote-headless/templates/remote-headless.yaml
@@ -197,9 +197,6 @@ spec:
         - mountPath: /app/logs
           name: json-log
         {{- end }}
-        - mountPath: /app/appsettings.configmap.json
-          name: appsettings
-          subPath: appsettings.json
         env:
           {{- if $.Values.loggingEnabled }}
           - name: POD_NAME
@@ -243,10 +240,6 @@ spec:
           type: DirectoryOrCreate
         name: json-log
       {{- end }}
-      - name: appsettings
-        configMap:
-          defaultMode: 0700
-          name: appsettings
   updateStrategy:
     type: RollingUpdate
   volumeClaimTemplates:

diff --git a/charts/remote-headless/templates/service.yaml b/charts/remote-headless/templates/service.yaml
@@ -10,12 +10,18 @@ metadata:
   labels:
     app.kubernetes.io/instance: {{ $.Values.namespace }}
   annotations:
+    service.beta.kubernetes.io/aws-load-balancer-type: external
     service.beta.kubernetes.io/aws-load-balancer-scheme: internet-facing
     service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: "ip"
+    service.beta.kubernetes.io/aws-load-balancer-target-group-attributes: stickiness.enabled=true,stickiness.type=source_ip,preserve_client_ip.enabled=true
+    {{- with $.Values.certificate }}
     service.beta.kubernetes.io/aws-load-balancer-ssl-cert: {{ $.Values.certificate }}
     service.beta.kubernetes.io/aws-load-balancer-ssl-ports: "443"
-    service.beta.kubernetes.io/aws-load-balancer-type: external
-    service.beta.kubernetes.io/aws-load-balancer-target-group-attributes: stickiness.enabled=true,stickiness.type=source_ip,preserve_client_ip.enabled=true
+    {{- end }}
+    {{- with $.Values.hosts }}
+    external-dns.alpha.kubernetes.io/hostname: {{ index . $idx }}
+    external-dns.alpha.kubernetes.io/ttl: '60'
+    {{- end }}
 spec:
   externalTrafficPolicy: Local
   ports: