From d5d42ec919e852bed0e3f821a71d67240a29c84e Mon Sep 17 00:00:00 2001 From: Benjamin Arntzen Date: Mon, 12 Aug 2024 15:43:09 +0100 Subject: [PATCH] Check in --- .gitignore | 0 deployment/bootstrap.yaml | 4 ++-- deployment/cleanup.sh | 0 deployment/deployment.sh | 0 deployment/midstrap.yaml | 24 ++---------------------- deployment/nodes.yaml | 26 +++----------------------- deployment/publisher-dummy.yaml | 2 +- deployment/publisher.yaml | 4 ++-- 8 files changed, 10 insertions(+), 50 deletions(-) mode change 100755 => 100644 .gitignore mode change 100755 => 100644 deployment/cleanup.sh mode change 100755 => 100644 deployment/deployment.sh diff --git a/.gitignore b/.gitignore old mode 100755 new mode 100644 diff --git a/deployment/bootstrap.yaml b/deployment/bootstrap.yaml index 8e2b666..879b81e 100644 --- a/deployment/bootstrap.yaml +++ b/deployment/bootstrap.yaml @@ -21,7 +21,7 @@ spec: - zerotesting-bootstrap.zerotesting.svc.cluster.local containers: - name: waku - image: zorlin/nwaku-jq:v0.26.0 + image: soutullostatus/nwaku-jq-curl:v0.28.0 imagePullPolicy: IfNotPresent readinessProbe: exec: @@ -53,4 +53,4 @@ spec: - sh - -c - | - /usr/bin/wakunode --rest=true --rest-address=0.0.0.0 --peer-exchange=true --relay=true --keep-alive=true --max-connections=18000 --discv5-discovery=true --discv5-enr-auto-update=True --log-level=INFO --metrics-server=True --metrics-server-address=0.0.0.0 --nat=extip:$IP --pubsub-topic="/waku/2/kubetopic" + /usr/bin/wakunode --rest=true --rest-address=0.0.0.0 --relay=true --keep-alive=true --max-connections=200 --discv5-discovery=true --discv5-enr-auto-update=True --log-level=INFO --metrics-server=True --metrics-server-address=0.0.0.0 --nat=extip:$IP --pubsub-topic="/waku/2/kubetopic" diff --git a/deployment/cleanup.sh b/deployment/cleanup.sh old mode 100755 new mode 100644 diff --git a/deployment/deployment.sh b/deployment/deployment.sh old mode 100755 new mode 100644 diff --git a/deployment/midstrap.yaml b/deployment/midstrap.yaml index 1729204..1969178 100644 --- a/deployment/midstrap.yaml +++ b/deployment/midstrap.yaml @@ -31,7 +31,7 @@ spec: mountPath: /etc/enr containers: - name: waku - image: zorlin/nwaku-jq:v0.26.0 + image: soutullostatus/nwaku-jq-curl:v0.28.0 imagePullPolicy: IfNotPresent ports: - containerPort: 8545 @@ -39,26 +39,6 @@ spec: volumeMounts: - name: enr-data mountPath: /etc/enr - readinessProbe: - exec: - command: - - /bin/sh - - -c - - > - curl -s http://127.0.0.1:8008/metrics | - awk '!/^#/ && /^libp2p_gossipsub_healthy_peers_topics /{ - print "Found gossipsub:", $0; - if ($2 == 1.0) { - exit 0; # success, healthy state - } else { - exit 1; # failure, unhealthy state - } - }' - successThreshold: 1 - initialDelaySeconds: 5 - periodSeconds: 1 - failureThreshold: 1 - timeoutSeconds: 5 resources: requests: memory: "64Mi" @@ -77,4 +57,4 @@ spec: - | . /etc/enr/enr.env echo ENRs are $ENR1 $ENR2 $ENR3 - /usr/bin/wakunode --relay-peer-exchange=true --peer-exchange=true --relay=true --max-connections=18000 --rest=true --rest-admin=true --rest-private=true --rest-address=0.0.0.0 --discv5-discovery=true --discv5-enr-auto-update=True --log-level=INFO --metrics-server=True --metrics-server-address=0.0.0.0 --discv5-bootstrap-node=$ENR1 --discv5-bootstrap-node=$ENR2 --discv5-bootstrap-node=$ENR3 --nat=extip:${IP} --pubsub-topic="/waku/2/kubetopic" + /usr/bin/wakunode --relay=true --max-connections=200 --rest=true --rest-admin=true --rest-private=true --rest-address=0.0.0.0 --discv5-discovery=true --discv5-enr-auto-update=True --log-level=INFO --metrics-server=True --metrics-server-address=0.0.0.0 --discv5-bootstrap-node=$ENR1 --discv5-bootstrap-node=$ENR2 --discv5-bootstrap-node=$ENR3 --nat=extip:${IP} --pubsub-topic="/waku/2/kubetopic" diff --git a/deployment/nodes.yaml b/deployment/nodes.yaml index f9a20bf..e8a66d9 100644 --- a/deployment/nodes.yaml +++ b/deployment/nodes.yaml @@ -4,7 +4,7 @@ metadata: name: nodes namespace: zerotesting spec: - replicas: 3000 + replicas: 100 podManagementPolicy: "Parallel" serviceName: zerotesting-service selector: @@ -34,7 +34,7 @@ spec: - "3" containers: - name: waku - image: zorlin/nwaku-jq:v0.26.0 + image: soutullostatus/nwaku-jq-curl:v0.28.0 imagePullPolicy: IfNotPresent ports: - containerPort: 8545 @@ -42,26 +42,6 @@ spec: volumeMounts: - name: enr-data mountPath: /etc/enr - readinessProbe: - exec: - command: - - /bin/sh - - -c - - > - curl -s http://127.0.0.1:8008/metrics | - awk '!/^#/ && /^libp2p_gossipsub_healthy_peers_topics /{ - print "Found gossipsub:", $0; - if ($2 == 1.0) { - exit 0; # success, healthy state - } else { - exit 1; # failure, unhealthy state - } - }' - successThreshold: 5 - initialDelaySeconds: 5 - periodSeconds: 1 - failureThreshold: 2 - timeoutSeconds: 5 resources: requests: memory: "64Mi" @@ -80,4 +60,4 @@ spec: - | . /etc/enr/enr.env echo ENRs are $ENR1 $ENR2 $ENR3 - nice -n 19 /usr/bin/wakunode --relay-peer-exchange=true --peer-exchange=true --relay=true --max-connections=800 --rest=true --rest-admin=true --rest-private=true --rest-address=0.0.0.0 --discv5-discovery=true --discv5-enr-auto-update=True --log-level=INFO --metrics-server=True --metrics-server-address=0.0.0.0 --discv5-bootstrap-node=$ENR1 --discv5-bootstrap-node=$ENR2 --discv5-bootstrap-node=$ENR3 --nat=extip:${IP} --pubsub-topic="/waku/2/kubetopic" + nice -n 19 /usr/bin/wakunode --relay=true --max-connections=50 --rest=true --rest-admin=true --rest-private=true --rest-address=0.0.0.0 --discv5-discovery=true --discv5-enr-auto-update=True --log-level=INFO --metrics-server=True --metrics-server-address=0.0.0.0 --discv5-bootstrap-node=$ENR1 --discv5-bootstrap-node=$ENR2 --discv5-bootstrap-node=$ENR3 --nat=extip:${IP} --pubsub-topic="/waku/2/kubetopic" diff --git a/deployment/publisher-dummy.yaml b/deployment/publisher-dummy.yaml index 6da0a55..51b9675 100644 --- a/deployment/publisher-dummy.yaml +++ b/deployment/publisher-dummy.yaml @@ -11,7 +11,7 @@ spec: - zerotesting-service.zerotesting.svc.cluster.local containers: - name: publisher-container - image: zorlin/publisher:v0.3.0 + image: zorlin/publisher:v0.4.0 imagePullPolicy: Always command: - sh diff --git a/deployment/publisher.yaml b/deployment/publisher.yaml index 1a3681c..52488e0 100644 --- a/deployment/publisher.yaml +++ b/deployment/publisher.yaml @@ -11,9 +11,9 @@ spec: - zerotesting-service.zerotesting.svc.cluster.local containers: - name: publisher-container - image: zorlin/publisher:v0.3.0 + image: zorlin/publisher:v0.4.0 imagePullPolicy: Always command: - sh - -c - - python /app/traffic.py --msg-size-kbytes=1 --delay-seconds=10 --debug + - python /app/traffic.py --msg-size-kbytes=1 --delay-seconds=10 --messages=4000 --debug -p "/waku/2/default-waku/proto"