fix(snapshotAgent): set BAO_ADDR to active service when running a clu… (#129)

* fix(snapshotAgent): add test

Signed-off-by: flostru <fs@collabs.de>

* fix(snapshotAgent): scale up replicaset in acceptance test

Signed-off-by: flostru <fs@collabs.de>

* fix(snapshotagent): catch edge case ha without active service

Signed-off-by: flostru <fs@collabs.de>

* doc(snapshotAgent): correct CHANGELOG entry

Signed-off-by: flostru <fs@collabs.de>

---------

Signed-off-by: flostru <fs@collabs.de>

Author: flostru

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Unreleased
 
+## 0.23.5
+
+- fix(snapshotAgent): set BAO_ADDR to active service when running a cluster
+
 ## 0.23.4
 
 - fix(snapshotAgent): don't create service account if disabled

charts/openbao/Chart.yaml

@@ -3,7 +3,7 @@
 
 apiVersion: v2
 name: openbao
-version: 0.23.4
+version: 0.23.5
 appVersion: v2.4.4
 kubeVersion: ">= 1.30.0-0"
 description: Official OpenBao Chart
@@ -28,7 +28,7 @@ annotations:
   artifacthub.io/changes: |
     - kind: fixed
       description: |
-        fix(snapshotAgent): don't create service account if disabled
+        fix(snapshotAgent): set BAO_ADDR to active service when running a cluster
 
 maintainers:
   - name: OpenBao

charts/openbao/README.md

@@ -1,6 +1,6 @@
 # openbao
 
-![Version: 0.23.4](https://img.shields.io/badge/Version-0.23.4-informational?style=flat-square) ![AppVersion: v2.4.4](https://img.shields.io/badge/AppVersion-v2.4.4-informational?style=flat-square)
+![Version: 0.23.5](https://img.shields.io/badge/Version-0.23.5-informational?style=flat-square) ![AppVersion: v2.4.4](https://img.shields.io/badge/AppVersion-v2.4.4-informational?style=flat-square)
 
 Official OpenBao Chart
 

charts/openbao/templates/snapshotagent-configmap.yaml

@@ -23,6 +23,8 @@ data:
   BAO_ROLE: {{ .Values.snapshotAgent.config.baoRole }}
   {{- if include "openbao.externalAddr" . }}
   BAO_ADDR: "{{ include "openbao.externalAddr" . }}"
+  {{- else if and (eq .mode "ha") (eq (.Values.server.service.active.enabled | toString) "true")}}
+  BAO_ADDR: {{ include "openbao.scheme" . }}://{{ template "openbao.fullname" . }}-active.{{ include "openbao.namespace" . }}.svc:{{ .Values.server.service.port }}
   {{- else }}
   BAO_ADDR: {{ include "openbao.scheme" . }}://{{ template "openbao.fullname" . }}.{{ include "openbao.namespace" . }}.svc:{{ .Values.server.service.port }}
   {{- end }}

test/acceptance/snapshot.bats

@@ -70,7 +70,7 @@ EOF
   # redeploy with snapshotAgent enabled
   helm upgrade --install "$(name_prefix)" . --set injector.enabled=false \
     --set server.ha.enabled=true \
-    --set server.ha.replicas=1 \
+    --set server.ha.replicas=3 \
     --set server.ha.raft.enabled=true \
     --set snapshotAgent.enabled=true \
     --set snapshotAgent.config.s3Bucket=openbao-snapshots \
@@ -113,7 +113,7 @@ initialize() {
   # install openbao
   helm install "$(name_prefix)" . --set injector.enabled=false \
     --set server.ha.enabled=true \
-    --set server.ha.replicas=1 \
+    --set server.ha.replicas=3 \
     --set server.ha.raft.enabled=true
   wait_for_running $(name_prefix)-0
 

test/unit/snapshotagent.bats

@@ -239,6 +239,18 @@ load _helpers
   [ "${actual}" = "http://release-name-openbao.foo.svc:8200" ]
 }
 
+@test "snapshot/configmap: specify baoAddr" {
+  cd `chart_dir`
+  local actual=$(helm template \
+    --show-only templates/snapshotagent-configmap.yaml \
+    --set 'snapshotAgent.enabled=true' \
+    --set 'server.ha.enabled=true' \
+    --namespace foo \
+    . | tee /dev/stderr |
+    yq -r '.data.BAO_ADDR' | tee /dev/stderr)
+  [ "${actual}" = "http://release-name-openbao-active.foo.svc:8200" ]
+}
+
 @test "snapshot/configmap: configuration: externalBaoAddr" {
   cd `chart_dir`
   local actual=$(helm template \