diff options
| author | Alex Auvolat <alex@adnab.me> | 2022-11-07 12:20:59 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2022-11-07 12:20:59 +0100 |
| commit | 28d7a49f6365fadaffaa903cc10434c1ed28d564 (patch) | |
| tree | 8da5b3213b7ff199af80e64af29a7a1395b9d02d /script | |
| parent | 3039bb5d431532f0ec907eab5e00f94acc4a3472 (diff) | |
| parent | 66f2daa0259538c64508b37cec89d76a74a71a02 (diff) | |
| download | garage-28d7a49f6365fadaffaa903cc10434c1ed28d564.tar.gz garage-28d7a49f6365fadaffaa903cc10434c1ed28d564.zip | |
Merge branch 'main' into optimal-layout
Diffstat (limited to 'script')
| -rw-r--r-- | script/helm/garage/templates/configmap.yaml | 9 | ||||
| -rwxr-xr-x | script/test-smoke.sh | 2 |
2 files changed, 6 insertions, 5 deletions
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 }}" 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 |