Skip to content

Commit 1baf1b5

Browse files
Merge branch 'main' into chart_refactor
2 parents ee9b045 + c7176cf commit 1baf1b5

File tree

3 files changed

+34
-2
lines changed

3 files changed

+34
-2
lines changed

docs/unified-ingress.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This document describes the unified ingress approach implemented in the eoAPI He
44

55
## Overview
66

7-
eoAPI now uses a consolidated, controller-agnostic ingress configuration. This approach:
7+
As of version 0.7.0, eoAPI uses a consolidated, controller-agnostic ingress configuration. This approach:
88

99
- Eliminates code duplication between different ingress controller implementations
1010
- Provides consistent behavior across controllers
@@ -91,7 +91,7 @@ ingress:
9191

9292
## Migration
9393

94-
If you're migrating from a previous version, follow these guidelines:
94+
If you're migrating from a version 0.6.0 or earlier, follow these guidelines:
9595

9696
1. Update your values to use the new unified configuration
9797
2. Ensure your ingress controller-specific annotations are set correctly
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{{- define "eoapi.pgstacInitContainer" -}}
2+
{{- if .Values.pgstacBootstrap.enabled }}
3+
- name: wait-for-pgstac-migrate
4+
image: bitnami/kubectl:latest
5+
command:
6+
- /bin/sh
7+
- -c
8+
- |
9+
echo "Waiting for pgstac-migrate job to complete..."
10+
until kubectl get job pgstac-migrate -o jsonpath='{.status.conditions[?(@.type=="Complete")].status}' | grep -q "True"; do
11+
echo "pgstac-migrate job not complete yet, waiting..."
12+
sleep 5
13+
done
14+
echo "pgstac-migrate job completed successfully."
15+
{{- if .Values.pgstacBootstrap.settings.loadSamples }}
16+
- name: wait-for-pgstac-load-samples
17+
image: bitnami/kubectl:latest
18+
command:
19+
- /bin/sh
20+
- -c
21+
- |
22+
echo "Waiting for pgstac-load-samples job to complete..."
23+
until kubectl get job pgstac-load-samples -o jsonpath='{.status.conditions[?(@.type=="Complete")].status}' | grep -q "True"; do
24+
echo "pgstac-load-samples job not complete yet, waiting..."
25+
sleep 5
26+
done
27+
echo "pgstac-load-samples job completed successfully."
28+
{{- end }}
29+
{{- end }}
30+
{{- end -}}

helm-chart/eoapi/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ ingress:
4545
className: "nginx"
4646
# Path configuration
4747
pathType: "Prefix" # Can be "Prefix" or "ImplementationSpecific" based on controller
48+
# NOTE: When using nginx ingress controller with regex in pathSuffix,
49+
# you must set pathType to "ImplementationSpecific". See issue #189 for more context.
4850
pathSuffix: "" # Add a suffix to service paths (e.g. "(/|$)(.*)" for nginx regex)
4951
rootPath: "" # Root path for doc server
5052
# Host configuration

0 commit comments

Comments
 (0)