Merge pull request #441 from celo-org/cond-svc

Cosmetic fixes
celo-org · Dec 5, 2024 · 0e1e241 · 0e1e241
2 parents 170d1e1 + c7b8e63
commit 0e1e241
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/charts/op-conductor-start-tool/Chart.yaml b/charts/op-conductor-start-tool/Chart.yaml
@@ -1,7 +1,7 @@
 ---
 name: op-conductor-start-tool
 apiVersion: v2
-version: 0.0.1
+version: 0.0.2
 description: OP Conductor start tool Cel2 network
 home: https://clabs.co
 sources:

diff --git a/charts/op-conductor-start-tool/README.md b/charts/op-conductor-start-tool/README.md
@@ -1,6 +1,6 @@
 # op-conductor-start-tool
 
-![Version: 0.0.1](https://img.shields.io/badge/Version-0.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.0.0](https://img.shields.io/badge/AppVersion-v1.0.0-informational?style=flat-square)
+![Version: 0.0.2](https://img.shields.io/badge/Version-0.0.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.0.0](https://img.shields.io/badge/AppVersion-v1.0.0-informational?style=flat-square)
 
 OP Conductor start tool Cel2 network
 

diff --git a/charts/op-conductor-start-tool/templates/cronjob.yaml b/charts/op-conductor-start-tool/templates/cronjob.yaml
@@ -85,7 +85,8 @@ spec:
                 LAST_UNSAFE_HASH=$(curl -X POST -H "Content-Type: application/json" --data \
                   '{"jsonrpc":"2.0","method":"admin_stopSequencer","params":[],"id":1}' \
                   {{ .Values.opNode.protocol }}://{{ .Values.opNode.namePattern }}-$first:{{ .Values.opNode.port }} -s | jq -r .result)
-                echo "Stopped OP Node $first with unsafe hash $LAST_UNSAFE_HASH. Starting OP Node $last..."
+                echo "Stopped OP Node $first with unsafe hash $LAST_UNSAFE_HASH. Sleeping 1 second and starting OP Node $last..."
+                sleep 1
                 curl -X POST -H "Content-Type: application/json" --data \
                   '{"jsonrpc":"2.0","method":"admin_startSequencer","params":["'${LAST_UNSAFE_HASH}'"],"id":1}'  \
                   {{ .Values.opNode.protocol }}://{{ .Values.opNode.namePattern }}-$last:{{ .Values.opNode.port }} -s

diff --git a/charts/op-conductor/Chart.yaml b/charts/op-conductor/Chart.yaml
@@ -1,7 +1,7 @@
 ---
 name: op-conductor
 apiVersion: v2
-version: 0.0.7
+version: 0.0.8
 description: Helm chart deploying OP Conductor, a HA controller for op-node
 home: https://clabs.co
 sources:

diff --git a/charts/op-conductor/README.md b/charts/op-conductor/README.md
@@ -1,6 +1,6 @@
 # op-conductor
 
-![Version: 0.0.7](https://img.shields.io/badge/Version-0.0.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.8.0](https://img.shields.io/badge/AppVersion-v1.8.0-informational?style=flat-square)
+![Version: 0.0.8](https://img.shields.io/badge/Version-0.0.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.8.0](https://img.shields.io/badge/AppVersion-v1.8.0-informational?style=flat-square)
 
 Helm chart deploying OP Conductor, a HA controller for op-node
 

diff --git a/charts/op-conductor/templates/scripts/_split-config-parameters.tpl b/charts/op-conductor/templates/scripts/_split-config-parameters.tpl
@@ -12,7 +12,7 @@ if [ -n "$loadBalancerIps" ]; then
   advertiseIp=$(echo "$loadBalancerIps" | tr ',' '\n' | sed -n "$((RID + 1))p")
 # If the clusterIPs are defined now, use them
 elif [ -n "$clusterIps" ]; then
-  advertiseIp=$(echo "$clusterIps" | tr ',' '\n' | sed -n "$((RID + 1))p")
+  advertiseIp=$(echo "{{ include "op-conductor.fullname" $ }}-consensus-$((RID))")
 # If none of the above are defined, use pod's ip
 else
   advertiseIp="$(hostname -i)"