removed datascheme part

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

@@ -33,7 +33,7 @@ backends:
       instance_base_path: /var/www/pvs/dev
       instance_name: pvs_instance
       product_types:
-        {{- toYaml .Values.global.dataScheme.productTypes | nindent 10 -}}
+        {{- toYaml .Values.global.productTypes | nindent 10 -}}
   {{- end }}
   {{- range .Values.backends }}
   -{{ toYaml . | nindent 6 }}

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

@@ -85,21 +85,21 @@
 {{- end -}}
 
 # Check if collection exits in database and initialize database only if not
-{{- if .Values.global.dataScheme.collections }}
-if python3 manage.py id check {{ index (keys $.Values.global.dataScheme.collections) 0 | quote }}; then
+{{- if .Values.global.collections }}
+if python3 manage.py id check {{ index (keys $.Values.global.collections) 0 | quote }}; then
     echo "Initializing database"
 
     python3 manage.py coveragetype import /rgbnir_definition.json --traceback
 
     python3 manage.py coveragetype import /def-sentinel-2-l1c-l2a.json --traceback
 
-    {{- if $.Values.global.dataScheme.coverageTypes }}
-    {{- range $coverageType := $.Values.global.dataScheme.coverageTypes }}
+    {{- if $.Values.global.coverageTypes }}
+    {{- range $coverageType := $.Values.global.coverageTypes }}
     echo {{- toJson $coverageType | squote }} | python3 manage.py coveragetype import --in --traceback
     {{- end }}
     {{- end }}
 
-    {{- range $product_type := $.Values.dataScheme.productTypes | default dict }}
+    {{- range $product_type := $.Values.productTypes | default dict }}
 
     python3 manage.py producttype create {{ $product_type.name | quote }} \
         {{ range $coverage_type_name, $coverage_type := $product_type.coverages }}--coverage-type {{ $coverage_type_name | quote }} \
@@ -117,9 +117,9 @@ if python3 manage.py id check {{ index (keys $.Values.global.dataScheme.collecti
     python3 manage.py masktype create {{ $product_type.name | quote }} {{ $mask_type.name | quote }} \
         {{- if $mask_type.validity -}} --validity \ {{- end }} --traceback
     {{- end }}
-    {{- end }}{{/* range $.Values.global.dataScheme.productTypes */}}
+    {{- end }}{{/* range $.Values.global.productTypes */}}
 
-    {{- range $collection_name, $collection := $.Values.global.dataScheme.collections }}
+    {{- range $collection_name, $collection := $.Values.global.collections }}
 
     python3 manage.py collectiontype create "{{ $collection_name }}_type" \
     {{- range $coverage_type := $collection.coverageTypes }}