Consolidated data directory.

Author: pantierra

CHANGELOG.md

@@ -15,6 +15,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Fixed Helm template to check queryables `file` field with schema validation [#380](https://github.com/developmentseed/eoapi-k8s/pull/380)
 
+### Changed
+
+- Consolidated service data into one data directory [#387](https://github.com/developmentseed/eoapi-k8s/pull/387)
+
 ## [0.8.1]
 
 ### Added

…ts/eoapi/dashboards/eoAPI-Dashboard.json …api/data/dashboards/eoAPI-Dashboard.jsoncharts/eoapi/dashboards/eoAPI-Dashboard.json renamed to charts/eoapi/data/dashboards/eoAPI-Dashboard.json charts/eoapi/dashboards/eoAPI-Dashboard.json renamed to charts/eoapi/data/dashboards/eoAPI-Dashboard.json

@@ -66,7 +66,7 @@ pgstacBootstrap:
     # Queryables configuration for testing
     queryables:
       - name: test-queryables.json
-        file: "initdb-data/queryables/test-queryables.json"
+        file: "data/initdb/queryables/test-queryables.json"
         indexFields: ["platform", "instruments"]
         deleteMissing: true
 

…tdb-data/queryables/test-queryables.json …a/initdb/queryables/test-queryables.jsoncharts/eoapi/initdb-data/queryables/test-queryables.json renamed to charts/eoapi/data/initdb/queryables/test-queryables.json charts/eoapi/initdb-data/queryables/test-queryables.json renamed to charts/eoapi/data/initdb/queryables/test-queryables.json

@@ -13,9 +13,9 @@ metadata:
     helm.sh/hook-delete-policy: "before-hook-creation,hook-succeeded"
 data:
   pgstac-settings.sql: |
-    {{- tpl ($.Files.Get "initdb-data/settings/pgstac-settings.sql.tpl") $ | nindent 4 }}
+    {{- tpl ($.Files.Get "data/initdb/settings/pgstac-settings.sql.tpl") $ | nindent 4 }}
     {{- if (index .Values "eoapi-notifier").enabled }}
-    {{ $.Files.Get "initdb-data/settings/pgstac-notification-triggers.sql" | nindent 4 }}
+    {{ $.Files.Get "data/initdb/settings/pgstac-notification-triggers.sql" | nindent 4 }}
     {{- end }}
 ---
 {{- if .Values.pgstacBootstrap.settings.loadSamples }}
@@ -29,7 +29,7 @@ metadata:
     helm.sh/hook-delete-policy: "before-hook-creation,hook-succeeded"
 data:
   initdb.sql: |
-    {{- range $path, $bytes := $.Files.Glob "initdb-data/samples/*.sql"  -}}
+    {{- range $path, $bytes := $.Files.Glob "data/initdb/samples/*.sql"  -}}
     {{ $.Files.Get $path | nindent 4 }}
     {{- end }}
 ---
@@ -42,7 +42,7 @@ metadata:
     helm.sh/hook-weight: "-7"
     helm.sh/hook-delete-policy: "before-hook-creation,hook-succeeded"
 data:
-  {{- range $path, $bytes := $.Files.Glob "initdb-data/samples/*.json"  -}}
+  {{- range $path, $bytes := $.Files.Glob "data/initdb/samples/*.json"  -}}
   {{- base $path | nindent 2 -}}: | {{- $.Files.Get $path | nindent 4 -}}
   {{- end }}
 {{- end }}