Merge branch 'main' into 'dev_stuff'

# Conflicts:
#   setup.py

.bumpversion.cfg

 [bumpversion]
-current_version = 2.0.1
+current_version = 2.0.2
 commit = True
 tag = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+)\.(?P<build>\d+))?

Dockerfile

@@ -92,4 +92,4 @@ EXPOSE 80
 ENTRYPOINT ["./entrypoint.sh"]
 CMD ["./run-httpd.sh"]
 
-LABEL version="2.0.1"
+LABEL version="2.0.2"

charts/vs-registrar/Chart.yaml

@@ -19,10 +19,10 @@ maintainers:
 # 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.0
+version: 0.1.1
 
 # 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: "2.0.1"
+appVersion: "2.0.2"

charts/vs-registrar/files/init-db.sh

@@ -91,7 +91,7 @@ if python3 manage.py id check {{ index (keys $.Values.global.collections) 0 | qu
 
     python3 manage.py coveragetype import /rgbnir_definition.json --traceback
 
-    python3 manage.py coveragetype import /def-sentinel-2-l1c-l2a.json --traceback
+    python3 manage.py coveragetype import /opt/core/def-sentinel-2-l1c-l2a.json --traceback
 
     {{- if $.Values.global.coverageTypes }}
     {{- range $coverageType := $.Values.global.coverageTypes }}

charts/vs-registrar/files/registrar-config.yaml

@@ -38,3 +38,13 @@ backends:
   {{- range .Values.backends }}
   -{{ toYaml . | nindent 6 }}
   {{- end }}
+
+{{- if not (empty .Values.preHandlers) }}
+pre_handlers:
+  {{- toYaml .Values.preHandlers | nindent 4 -}}
+{{- end }}
+
+{{- if not (empty .Values.postHandlers) }}
+post_handlers:
+  {{- toYaml .Values.postHandlers | nindent 4 -}}
+{{- end }}

charts/vs-registrar/values.yaml

@@ -24,6 +24,8 @@ volumes: []
 
 disableDefaultEoxserver: false
 backends: []
+preHandlers: []
+postHandlers: []
 
 global:
   env:

charts/vs-renderer/Chart.yaml

@@ -25,4 +25,4 @@ version: 0.1.0
 # 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: "2.0.1"
+appVersion: "2.0.2"

charts/vs-renderer/files/init-db.sh

@@ -91,7 +91,7 @@ if python3 manage.py id check {{ index (keys $.Values.global.collections) 0 | qu
 
     python3 manage.py coveragetype import /rgbnir_definition.json --traceback
 
-    python3 manage.py coveragetype import /def-sentinel-2-l1c-l2a.json --traceback
+    python3 manage.py coveragetype import /opt/core/def-sentinel-2-l1c-l2a.json --traceback
 
     {{- if $.Values.global.coverageTypes }}
     {{- range $coverageType := $.Values.global.coverageTypes }}

setup.py

@@ -5,8 +5,8 @@ from setuptools import setup, find_packages
 long_description = ""
 
 setup(
-    name="registrar",  # Replace with your own username
-    version="2.0.1",
+    name="registrar", # Replace with your own username
+    version="2.0.2",
     author="",
     author_email="",
     description="registrar for PVS",