Skip to content

Commit 3a63194

Browse files
committed
Add necessary values for the charts
1 parent 1c6f6f2 commit 3a63194

File tree

4 files changed

+23
-5
lines changed

4 files changed

+23
-5
lines changed

nix/scripts/list-helm-containers.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,18 +119,21 @@ while IFS= read -r chart; do
119119
raw_images=""
120120
fi
121121

122-
rm -f "$temp_helm_output"
123122
set -e # Re-enable exit on error
124123

125124
if [[ $helm_exit_code -ne 0 ]]; then
126125
echo "ERROR: Failed to process chart $(basename $chart)" >&2
127126
echo "Chart path: $chart" >&2
128127
echo "Values file: ${values_file:-none}" >&2
129128
echo "Secrets file: ${secrets_file:-none}" >&2
129+
echo "Helm error output:" >&2
130+
cat "$temp_helm_output" >&2
130131
echo "Try running: helm template $chart $([ -n "$values_file" ] && echo "-f $values_file") $([ -n "$secrets_file" ] && echo "-f $secrets_file")" >&2
131132
raw_images=""
132133
fi
133134

135+
rm -f "$temp_helm_output"
136+
134137
# Process extracted images
135138
if [[ -n "$raw_images" ]]; then
136139
current_images=$(echo "$raw_images" | grep -v "^$" | optionally_complain | sort -u)

offline/tasks/patch-chart-images.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ PATCH_EXCLUDE_LIST=(
2929
"fake-aws-s3"
3030
"fake-aws-sqs"
3131
"demo-smtp"
32-
"inbucket"
3332
)
3433

3534
echo "Patching bitnami repository references in: $CHARTS_DIR"
@@ -113,7 +112,8 @@ echo "Scanning and patching files..."
113112
# Process values.yaml files
114113
while IFS= read -r -d '' file; do
115114
file_count=$((file_count + 1))
116-
patch_file "$file" && rc=$? || rc=$?
115+
patch_file "$file"
116+
rc=$?
117117
if [[ $rc -eq 0 ]]; then
118118
patched_count=$((patched_count + 1))
119119
elif [[ $rc -eq 2 ]]; then
@@ -124,7 +124,8 @@ done < <(find "$CHARTS_DIR" -name "values.yaml" -print0)
124124
# Process Chart.yaml files
125125
while IFS= read -r -d '' file; do
126126
file_count=$((file_count + 1))
127-
patch_file "$file" && rc=$? || rc=$?
127+
patch_file "$file"
128+
rc=$?
128129
if [[ $rc -eq 0 ]]; then
129130
patched_count=$((patched_count + 1))
130131
elif [[ $rc -eq 2 ]]; then
@@ -135,7 +136,8 @@ done < <(find "$CHARTS_DIR" -name "Chart.yaml" -print0)
135136
# Process template files (for direct image references)
136137
while IFS= read -r -d '' file; do
137138
file_count=$((file_count + 1))
138-
patch_file "$file" && rc=$? || rc=$?
139+
patch_file "$file"
140+
rc=$?
139141
if [[ $rc -eq 0 ]]; then
140142
patched_count=$((patched_count + 1))
141143
elif [[ $rc -eq 2 ]]; then
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
11
secrets:
22
zrestSecret: ""
3+
4+
# Minimal config to allow helm template to work
5+
federate:
6+
enabled: false
7+
dtls:
8+
enabled: false
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Minimal config to allow helm template to work for image extraction
2+
# wire-utility chart has fail() checks that require certain values
3+
4+
cargohold:
5+
config:
6+
aws:
7+
s3Endpoint: "http://fake-aws-s3:9000"

0 commit comments

Comments
 (0)