Skip to content

Commit 0144f84

Browse files
NotYuShengclaude
andcommitted
fix: Address Gemini code review feedback
- Fix Makefile deploy-all-charts values file precedence order - Reduce unrealistic CRC resource requirements (32GB RAM, 12 CPU cores) - Make create-secrets.sh auto-discover services from helm charts - Fix minor YAML formatting in pdf-processor-service values 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
1 parent 095934c commit 0144f84

5 files changed

Lines changed: 57 additions & 19 deletions

File tree

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,13 @@ define deploy-all-charts
131131
CHART=$$(basename $$dir); \
132132
if [ "$$CHART" != "shared-values" ] && [ "$$CHART" != "assets" ]; then \
133133
echo "$(1) chart: $$CHART"; \
134-
CHART_VALUES="-f $(SHARED_BASE_VALUES)"; \
134+
CHART_VALUES="-f helm/$$CHART/values.yaml"; \
135+
if [ -f "$(SHARED_BASE_VALUES)" ]; then \
136+
CHART_VALUES="$$CHART_VALUES -f $(SHARED_BASE_VALUES)"; \
137+
fi; \
135138
if [ -f "$(SHARED_VALUES_DIR)/common-$(ENV).yaml" ]; then \
136139
CHART_VALUES="$$CHART_VALUES -f $(SHARED_VALUES_DIR)/common-$(ENV).yaml"; \
137140
fi; \
138-
CHART_VALUES="$$CHART_VALUES -f helm/$$CHART/values.yaml"; \
139141
if [ -f "helm/$$CHART/values-$(ENV).yaml" ]; then \
140142
CHART_VALUES="$$CHART_VALUES -f helm/$$CHART/values-$(ENV).yaml"; \
141143
fi; \

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,8 @@ Alternatively, configure CRC manually:
219219
crc stop
220220

221221
# Configure CRC resources (adjust based on your system)
222-
crc config set memory 262144 # 256GB RAM
223-
crc config set cpus 32 # 32 CPU cores
222+
crc config set memory 32768 # 32GB RAM (adjust based on your system)
223+
crc config set cpus 12 # 12 CPU cores (adjust based on your system)
224224
crc config set disk-size 80 # 80GB disk
225225

226226
# Start CRC with new configuration

config-crc/setup-crc.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ crc stop 2>/dev/null || true
1212

1313
# Configure CRC resources
1414
echo "Configuring CRC resources..."
15-
crc config set memory 262144 # 256GB RAM
16-
crc config set cpus 32 # 32 CPU cores
15+
crc config set memory 32768 # 32GB RAM (adjust based on your system)
16+
crc config set cpus 12 # 12 CPU cores (adjust based on your system)
1717
crc config set disk-size 120 # 120GB disk (increased for ML workloads)
1818
crc config set enable-cluster-monitoring true
1919
crc config set consent-telemetry no

create-secrets.sh

Lines changed: 48 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,54 @@ create_secret_from_env() {
3636
echo "✅ Created secret: $secret_name"
3737
}
3838

39-
# Create secrets for all services
40-
create_secret_from_env "chat-service" "chat_service/.env"
41-
create_secret_from_env "pdf-processor-service" "pdf_processor_service/.env"
42-
create_secret_from_env "pdf-extraction-service" "pdf_extraction_service/.env"
43-
create_secret_from_env "docling-translation-service" "docling_translation_service/.env"
44-
create_secret_from_env "pdf-renderer-service" "pdf_renderer_service/.env"
45-
create_secret_from_env "embedder-service" "embedder_service/.env"
46-
create_secret_from_env "metadata-service" "metadata_service/.env"
47-
create_secret_from_env "image-captioner-service" "image_captioner_service/.env"
48-
create_secret_from_env "cleaner" "cleaner/.env"
49-
create_secret_from_env "nginx" "nginx/.env"
50-
create_secret_from_env "frontend" "frontend/.env"
39+
# Auto-discover services by checking helm charts and .env files
40+
echo "🔍 Auto-discovering services from helm charts and .env files..."
41+
42+
# Create secrets for services with helm charts (excluding shared-values and assets)
43+
for helm_dir in helm/*/; do
44+
chart_name=$(basename "$helm_dir")
45+
if [ "$chart_name" != "shared-values" ] && [ "$chart_name" != "assets" ]; then
46+
# Convert chart name to directory name pattern
47+
if [ "$chart_name" = "chat-service" ]; then
48+
env_dir="chat_service"
49+
elif [ "$chart_name" = "pdf-processor-service" ]; then
50+
env_dir="pdf_processor_service"
51+
elif [ "$chart_name" = "pdf-extraction-service" ]; then
52+
env_dir="pdf_extraction_service"
53+
elif [ "$chart_name" = "docling-translation-service" ]; then
54+
env_dir="docling_translation_service"
55+
elif [ "$chart_name" = "pdf-renderer-service" ]; then
56+
env_dir="pdf_renderer_service"
57+
elif [ "$chart_name" = "embedder-service" ]; then
58+
env_dir="embedder_service"
59+
elif [ "$chart_name" = "metadata-service" ]; then
60+
env_dir="metadata_service"
61+
elif [ "$chart_name" = "image-captioner-service" ]; then
62+
env_dir="image_captioner_service"
63+
else
64+
# For services like cleaner, nginx, frontend - use chart name as directory name
65+
env_dir="$chart_name"
66+
fi
67+
68+
env_file="${env_dir}/.env"
69+
echo "Checking for service: $chart_name (env file: $env_file)"
70+
create_secret_from_env "$chart_name" "$env_file"
71+
fi
72+
done
73+
74+
# Also check for any additional .env files in root directories not covered by helm charts
75+
echo ""
76+
echo "🔍 Checking for additional .env files..."
77+
for service_dir in */; do
78+
service_name=$(basename "$service_dir")
79+
env_file="${service_dir}.env"
80+
81+
# Skip if already processed via helm chart
82+
if [ ! -d "helm/${service_name}" ] && [ -f "$env_file" ]; then
83+
echo "Found additional service: $service_name"
84+
create_secret_from_env "$service_name" "$env_file"
85+
fi
86+
done
5187

5288
# Interactive creation of infrastructure secrets
5389
echo ""

helm/pdf-processor-service/values-prestaging.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,4 @@ podAnnotations:
7474
sidecar.istio.io/inject: "true"
7575
# PDF processor needs more sidecar resources due to file uploads
7676
sidecar.istio.io/proxyCPU: "20m"
77-
sidecar.istio.io/proxyMemory: "256Mi"
77+
sidecar.istio.io/proxyMemory: "256Mi"

0 commit comments

Comments
 (0)