Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/helm-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,10 @@ jobs:
shell: bash
run: sleep 10s


- id: watchservices
name: watch services boot
timeout-minutes: 10
continue-on-error: true
run: |
kubectl config set-context --current --namespace=eoapitest
while [[ -z "$(kubectl get pod | grep "^raster-$RELEASE_NAME-.*$" | cut -d' ' -f1 | xargs -I{} kubectl logs pod/{} | grep "GET /healthz" | head -n 1)" ]]; do
Expand All @@ -129,6 +130,8 @@ jobs:
run: |
echo "The previous step failed or timed out. Running cleanup logic..."
helm uninstall $RELEASE_NAME
# force GH action to show failed result
exit 128

- name: install python unit-test dependencies
run: |
Expand Down
4 changes: 2 additions & 2 deletions helm-chart/eoapi/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ kubeVersion: ">=1.23.0-0"
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: "0.1.6"
version: "0.1.7"

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "0.1.4"
appVersion: "0.1.5"
1 change: 1 addition & 0 deletions helm-chart/eoapi/templates/db/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,6 @@ data:
pypgstac load collections /opt/initdb/json-data/noaa-emergency-response.json --dsn $DSN --method insert_ignore
pypgstac load items /opt/initdb/json-data/noaa-eri-nashville2020.json --dsn $DSN --method insert_ignore
psql $DSN -f /opt/initdb/sql-data/initdb.sql
echo "DONE LOADING!!!!!!"
# run it forever like a docker process should
tail -f /dev/null
7 changes: 7 additions & 0 deletions helm-chart/eoapi/templates/db/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,13 @@ spec:
name: pgstac-secrets-{{ $.Release.Name }}
ports:
- containerPort: 5432
resources:
limits:
cpu: {{ .Values.db.settings.resources.limits.cpu }}
memory: {{ .Values.db.settings.resources.limits.memory }}
requests:
cpu: {{ .Values.db.settings.resources.requests.cpu }}
memory: {{ .Values.db.settings.resources.requests.memory }}
{{- if not (eq .Values.providerContext "minikube") }}
volumeMounts:
- mountPath: /var/lib/postgresql/data
Expand Down
19 changes: 14 additions & 5 deletions helm-chart/eoapi/test-unittest-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,15 @@ ingress:
className: "nginx"
db:
enabled: true
settings:
resources:
requests:
storage: "100Mi"
cpu: "256m"
memory: "1024Mi"
limits:
cpu: "512m"
memory: "1024Mi"
raster:
enabled: true
settings:
Expand All @@ -14,17 +23,17 @@ raster:
memory: "4096Mi"
requests:
cpu: "256m"
memory: "1048Mi"
memory: "1024Mi"
stac:
enabled: true
settings:
resources:
limits:
cpu: "256m"
memory: "512Mi"
cpu: "512m"
memory: "1024Mi"
requests:
cpu: "256m"
memory: "512Mi"
cpu: "512m"
memory: "1024Mi"
vector:
enabled: true
settings:
Expand Down
2 changes: 1 addition & 1 deletion helm-chart/eoapi/tests/deploy_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ tests:
value: "1024Mi"
- equal:
path: spec.template.spec.containers[0].resources.requests.memory
value: "256Mi"
value: "1024Mi"
- equal:
path: metadata.labels.gitsha
value: "ABC123"
9 changes: 7 additions & 2 deletions helm-chart/eoapi/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ db:
resources:
requests:
storage: "100Mi"
cpu: "512m"
memory: "1024Mi"
limits:
cpu: "512m"
memory: "1024Mi"
secrets:
POSTGRES_DB: "postgis"
POSTGRES_USER: ""
Expand All @@ -56,7 +61,7 @@ db:
POSTGRES_HOST_READER: "pgstac"
POSTGRES_HOST_WRITER: "pgstac"
DB_MIN_CONN_SIZE: "1"
DB_MAX_CONN_SIZE: "10"
DB_MAX_CONN_SIZE: "15"
# default connect: https://www.postgresql.org/docs/current/libpq-envars.html
PGDATA: "/var/lib/postgresql/data/pgdata"
PGUSER: ""
Expand Down Expand Up @@ -143,7 +148,7 @@ stac:
memory: "1024Mi"
requests:
cpu: "256m"
memory: "256Mi"
memory: "1024Mi"
envVars:
##############
# uvicorn
Expand Down