From ffbbb711cb749c318e1a2a38ce3746fcf350343a Mon Sep 17 00:00:00 2001 From: Sean McGary Date: Thu, 14 Nov 2024 09:09:02 -0600 Subject: [PATCH 1/2] Only compress the sidecar binary, not the path --- scripts/bundleReleases.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/bundleReleases.sh b/scripts/bundleReleases.sh index ad12467e..50c2829d 100755 --- a/scripts/bundleReleases.sh +++ b/scripts/bundleReleases.sh @@ -11,5 +11,5 @@ fi for i in $(ls release); do fileName="sidecar-${i}-${VERSION}.tar.gz" - tar -cvf "./release/${fileName}" "./release/${i}/sidecar" + tar -cvf "./release/${fileName}" -C "./release/${i}/" sidecar done From 780bb11fc18401cc46b0fd857dcd7c165a189dd8 Mon Sep 17 00:00:00 2001 From: Sean McGary Date: Thu, 14 Nov 2024 09:49:50 -0600 Subject: [PATCH 2/2] Fix helm chart --- charts/sidecar/Chart.yaml | 4 ++-- charts/sidecar/templates/sidecarStatefulSet.yaml | 10 ++++++++-- charts/sidecar/values.yaml | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/charts/sidecar/Chart.yaml b/charts/sidecar/Chart.yaml index 6957c1b2..94284e1a 100644 --- a/charts/sidecar/Chart.yaml +++ b/charts/sidecar/Chart.yaml @@ -4,6 +4,6 @@ description: A Helm chart for the EigenLayer sidecar type: application -version: 0.1.0-beta.2 +version: 0.1.0-beta.3 -appVersion: "v1.0.0-beta.1" +appVersion: "v1.0.0-beta.3" diff --git a/charts/sidecar/templates/sidecarStatefulSet.yaml b/charts/sidecar/templates/sidecarStatefulSet.yaml index 2682d41c..0a3adb6b 100644 --- a/charts/sidecar/templates/sidecarStatefulSet.yaml +++ b/charts/sidecar/templates/sidecarStatefulSet.yaml @@ -40,12 +40,18 @@ spec: value: '{{ $v }}' {{- end }} {{- if .Values.sidecar.secret.data }} + {{- $secretName := .Values.sidecar.secret.name -}} {{- range $k, $v := .Values.sidecar.secret.data }} - name: {{ $k }} valueFrom: secretKeyRef: - name: {{ .Values.sidecar.secret.name }} + name: {{ $secretName }} key: {{ $k }} {{- end}} - {{ .Values.sidecar.additionalEnv | nindent 12 }} {{- end}} + {{- if .Values.sidecar.additionalEnv }} + {{- range $k, $v := .Values.sidecar.additionalEnv }} + - name: {{ $v.name }} + value: '{{ $v.value }}' + {{- end }} + {{- end }} diff --git a/charts/sidecar/values.yaml b/charts/sidecar/values.yaml index 9b2c868f..3308b605 100644 --- a/charts/sidecar/values.yaml +++ b/charts/sidecar/values.yaml @@ -17,7 +17,7 @@ sidecar: SIDECAR_DATABASE_USER: "sidecar" SIDECAR_DATABASE_DB_NAME: "sidecar" # SIDECAR_STATSD_URL: "" - additionalEnv: {} + additionalEnv: [] # - name: ENV_NAME # value: "env value" ports: