Skip to content

Commit 541559a

Browse files
committed
Consolidated data directory.
1 parent f658b16 commit 541559a

File tree

14 files changed

+24
-23
lines changed

14 files changed

+24
-23
lines changed
File renamed without changes.

charts/eoapi/initdb-data/queryables/test-queryables.json renamed to charts/eoapi/data/initdb/queryables/test-queryables.json

File renamed without changes.
File renamed without changes.

charts/eoapi/initdb-data/samples/noaa-emergency-response.json renamed to charts/eoapi/data/initdb/samples/noaa-emergency-response.json

File renamed without changes.

charts/eoapi/initdb-data/samples/noaa-eri-nashville2020.json renamed to charts/eoapi/data/initdb/samples/noaa-eri-nashville2020.json

File renamed without changes.

charts/eoapi/initdb-data/settings/pgstac-notification-triggers.sql renamed to charts/eoapi/data/initdb/settings/pgstac-notification-triggers.sql

File renamed without changes.

charts/eoapi/initdb-data/settings/pgstac-settings.sql.tpl renamed to charts/eoapi/data/initdb/settings/pgstac-settings.sql.tpl

File renamed without changes.

charts/eoapi/profiles/experimental.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ pgstacBootstrap:
6666
# Queryables configuration for testing
6767
queryables:
6868
- name: test-queryables.json
69-
file: "initdb-data/queryables/test-queryables.json"
69+
file: "data/initdb/queryables/test-queryables.json"
7070
indexFields: ["platform", "instruments"]
7171
deleteMissing: true
7272

charts/eoapi/templates/database/pgstacbootstrap/configmap.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ metadata:
1313
helm.sh/hook-delete-policy: "before-hook-creation,hook-succeeded"
1414
data:
1515
pgstac-settings.sql: |
16-
{{- tpl ($.Files.Get "initdb-data/settings/pgstac-settings.sql.tpl") $ | nindent 4 }}
16+
{{- tpl ($.Files.Get "data/initdb/settings/pgstac-settings.sql.tpl") $ | nindent 4 }}
1717
{{- if (index .Values "eoapi-notifier").enabled }}
18-
{{ $.Files.Get "initdb-data/settings/pgstac-notification-triggers.sql" | nindent 4 }}
18+
{{ $.Files.Get "data/initdb/settings/pgstac-notification-triggers.sql" | nindent 4 }}
1919
{{- end }}
2020
---
2121
{{- if .Values.pgstacBootstrap.settings.loadSamples }}
@@ -29,7 +29,7 @@ metadata:
2929
helm.sh/hook-delete-policy: "before-hook-creation,hook-succeeded"
3030
data:
3131
initdb.sql: |
32-
{{- range $path, $bytes := $.Files.Glob "initdb-data/samples/*.sql" -}}
32+
{{- range $path, $bytes := $.Files.Glob "data/initdb/samples/*.sql" -}}
3333
{{ $.Files.Get $path | nindent 4 }}
3434
{{- end }}
3535
---
@@ -42,7 +42,7 @@ metadata:
4242
helm.sh/hook-weight: "-7"
4343
helm.sh/hook-delete-policy: "before-hook-creation,hook-succeeded"
4444
data:
45-
{{- range $path, $bytes := $.Files.Glob "initdb-data/samples/*.json" -}}
45+
{{- range $path, $bytes := $.Files.Glob "data/initdb/samples/*.json" -}}
4646
{{- base $path | nindent 2 -}}: | {{- $.Files.Get $path | nindent 4 -}}
4747
{{- end }}
4848
{{- end }}

charts/eoapi/templates/monitoring/observability.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ metadata:
77
eoapi_dashboard: "1"
88
data:
99
kubernetes.json: |-
10-
{{ .Files.Get "dashboards/eoAPI-Dashboard.json" | indent 4 }}
10+
{{ .Files.Get "data/dashboards/eoAPI-Dashboard.json" | indent 4 }}
1111
{{- end }}

0 commit comments

Comments
 (0)