benchmark: update k8s deployment scripts

benchmark/kubernetes/deploy-transactors

@@ -3,4 +3,4 @@
 from subprocess import call
 
 for v in range(1, 14, 1):
-  call(["helm", "install", "-n", "transactor-{}".format(v), "--set", "ethereum.staticNodes.config=static-nodes-{},nameOverride=istanbul-{}".format(v, v), "transactor"])
+  call(["helm", "install", "-n", "transactor-{}".format(v), "--set", "ethereum.staticNodes.config=static-nodes,nameOverride=istanbul-{}".format(v), "transactor"])

benchmark/kubernetes/genesis-block/genesis.json

@@ -7,7 +7,7 @@
     "timestamp": "0x0",
     "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
     "extraData": "0x0000000000000000000000000000000000000000000000000000000000000000f90269f902229444add0ec310f115a0e603b2d7db9f067778eaf8a94294fc7e8f22b3bcdcf955dd7ff3ba2ed833f8212946beaaed781d2d2ab6350f5c4566a2c6eaac407a6948be76812f765c24641ec63dc2852b378aba2b440942d7c641c6262bdcf9865abeab65d2e84f9422737941e5606129f4f66e423521e2e8f7a91c446e6e57f94c532f7389fbb38d78da6b190a826b0c6472aefbf94b8138e4d5e227a84aaccf191f3d630ed28f3d3b094cf02a3ed043de0328bfea296d6473bdb7552ae11941010168c4238c67499d856cd106518ff5d07a107940dc89d887084868ad0226fd5d70303e4a290bcdf94b9330a665be281bd876470dbdc32af29ac7066be940037444eafd0d07c0875ae6d8c5c771d9ea7d9ad9455d6388e779d86ac4d337a8c14044e7b9b651de794d647363309491b88a660666e32cb265bc1fb22d594a0b190776c1250ac80f641e7becdd8675706947e9406decb8344fa751ee5727f9ced725d6a389b5b339405c870381cf8885356021d407c6f708b8db88d62947d33f0c170b2a265333c78e9d048b73d9261398f9463883b2b85d8572bcc7dd36e2faa26cbc7f467949443e55168e3f6a7690c2cd001d42b5ff1f7e0f9a79447704f9ded61edb89ea473d07889a1dd6b919e3e948b4d0062bc66754f01121a3e984c1dbde4320e62948d135f91276ee2405aa8de49177a28d7eb9f641c94176a43885dcc21f42205d6a1cc115c4abfb5bf83943349c7e0a53e8c80f12cb183cc779a22d4c6b68fb8410000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0",
-    "gasLimit": "0x1e0a6e0",
+    "gasLimit": "0x280de80",
     "difficulty": "0x1",
     "mixhash": "0x63746963616c2062797a616e74696e65206661756c7420746f6c6572616e6365",
     "coinbase": "0x0000000000000000000000000000000000000000",
@@ -34,7 +34,7 @@
             "balance": "999900000000000000000000000000000000000000000"
         },
         "0x507a198251ed29f421bd6cf667596f750d9b14ec": {
-            "balance": "999900000000000000000000000000000000000000000"
+            "balance": "99999999999999999900000000000000000000000000000000000000000"
         }
     }
 }

benchmark/kubernetes/service.yaml

@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: validator-service
+  labels:
+    environment: default
+spec:
+  type: LoadBalancer
+  ports:
+  - port: 8545
+    targetPort: 8545
+    protocol: TCP
+    name: rpc
+  - port: 8546
+    targetPort: 8546
+    protocol: TCP
+    name: ws
+  selector:
+    role: validator

benchmark/kubernetes/validator/templates/statefulset.yaml

@@ -13,6 +13,7 @@ spec:
   template:
     metadata:
       labels:
+        role: validator
         app: {{ template "fullname" . }}
         chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
         release: "{{ .Release.Name }}"
@@ -176,13 +177,8 @@ spec:
           - --debug
           - --maxpeers
           - "100"
-          - --maxpendpeers
-          - "30"
-          - --lightserv
-          - "10"
-          - --v5disc
-          # - --lightpeers
-          # - "50"
+          - --verbosity
+          - "4"
         ports:
         - containerPort: {{ .Values.ethereum.port }}
           name: peer
@@ -204,31 +200,31 @@ spec:
             command:
             - "geth"
             - "--exec"
-            - "eth.blockNumber"
+            - "web3.version.api"
             - "attach"
             {{- if .Values.ethereum.ipc.path }}
             - {{ .Values.ethereum.ipc.path | quote }}
             {{- else }}
             - "{{ .Values.volumes.chaindir.mountPath }}/geth.ipc"
             {{- end }}
-          initialDelaySeconds: 30
-          periodSeconds: 10
-          timeoutSeconds: 5
+          initialDelaySeconds: 60
+          periodSeconds: 20
+          timeoutSeconds: 10
         readinessProbe:
           exec:
             command:
             - "geth"
             - "--exec"
-            - "eth.blockNumber"
+            - "web3.version.api"
             - "attach"
             {{- if .Values.ethereum.ipc.path }}
             - {{ .Values.ethereum.ipc.path | quote }}
             {{- else }}
             - "{{ .Values.volumes.chaindir.mountPath }}/geth.ipc"
             {{- end }}
-          initialDelaySeconds: 30
-          periodSeconds: 30
-          timeoutSeconds: 5
+          initialDelaySeconds: 60
+          periodSeconds: 20
+          timeoutSeconds: 10
         volumeMounts:
         - name: data
           mountPath: "{{ .Values.volumes.chaindir.mountPath }}"

benchmark/kubernetes/validator/values.yaml

@@ -13,7 +13,7 @@ service:
 replicaCount: 1
 image:
   repository: quay.io/maicoin/ottoman_geth
-  tag: les
+  tag: latest
   pullPolicy: Always
 
 ethereum:
@@ -73,12 +73,12 @@ genesis:
 
 # Geth parameters for benchmark
 benchmark:
-  gasprice: "0"
-  targetgaslimit: "31500000"
+  gasprice: "1"
+  targetgaslimit: "42000000"
   txpool:
     globalslots: "10240"
     accountslots: "10240"
     globalqueue: "2048"
     accountqueue: "2048"
   prometheus:
-    url: http://52.163.252.208:9091
+    url: #http://52.187.23.178:9091