From 8fc93abc79eb3fa74facda7ca2e8798ff7d01658 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Tue, 18 Oct 2022 13:17:30 +0200
Subject: Some things are now in result-bin

---
 script/test-smoke.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'script')

diff --git a/script/test-smoke.sh b/script/test-smoke.sh
index bb939d35..eababf38 100755
--- a/script/test-smoke.sh
+++ b/script/test-smoke.sh
@@ -8,7 +8,7 @@ SCRIPT_FOLDER="`dirname \"$0\"`"
 REPO_FOLDER="${SCRIPT_FOLDER}/../"
 GARAGE_DEBUG="${REPO_FOLDER}/target/debug/"
 GARAGE_RELEASE="${REPO_FOLDER}/target/release/"
-NIX_RELEASE="${REPO_FOLDER}/result/bin/"
+NIX_RELEASE="${REPO_FOLDER}/result/bin/:${REPO_FOLDER}/result-bin/bin/"
 PATH="${GARAGE_DEBUG}:${GARAGE_RELEASE}:${NIX_RELEASE}:$PATH"
 CMDOUT=/tmp/garage.cmd.tmp
 
-- 
cgit v1.2.3


From d6c77ea3271b890f08980efeba4ddaa935ef353b Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Tue, 18 Oct 2022 22:30:05 +0200
Subject: Fix helm chart with correct configuration syntax

---
 script/helm/garage/templates/configmap.yaml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'script')

diff --git a/script/helm/garage/templates/configmap.yaml b/script/helm/garage/templates/configmap.yaml
index e33a4dbd..bfcd5d8c 100644
--- a/script/helm/garage/templates/configmap.yaml
+++ b/script/helm/garage/templates/configmap.yaml
@@ -15,9 +15,10 @@ data:
 
     bootstrap_peers = {{ .Values.garage.bootstrapPeers }}
 
-    kubernetes_namespace = "{{ .Release.Namespace }}"
-    kubernetes_service_name = "{{ include "garage.fullname" . }}"
-    kubernetes_skip_crd = {{ .Values.garage.kubernetesSkipCrd }}
+    [kubernetes_discovery]
+    namespace = "{{ .Release.Namespace }}"
+    service_name = "{{ include "garage.fullname" . }}"
+    skip_crd = {{ .Values.garage.kubernetesSkipCrd }}
 
     [s3_api]
     s3_region = "{{ .Values.garage.s3.api.region }}"
@@ -27,4 +28,4 @@ data:
     [s3_web]
     bind_addr = "[::]:3902"
     root_domain = "{{ .Values.garage.s3.web.rootDomain }}"
-    index = "{{ .Values.garage.s3.web.index }}"
\ No newline at end of file
+    index = "{{ .Values.garage.s3.web.index }}"
-- 
cgit v1.2.3