Ckan-minor-changes (#59)

* fix: minor changes * add: resources to jobs * fix: typo * fix: typo * fix: tests
mintproject · Sep 9, 2024 · 691fbaf · 691fbaf
1 parent fab6de5
commit 691fbaf
Show file tree

Hide file tree

Showing 8 changed files with 124 additions and 103 deletions.
diff --git a/charts/mint/Chart.yaml b/charts/mint/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # 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: 3.3.1-alpha.10
+version: 3.3.1-alpha.12
 # 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.

diff --git a/charts/mint/templates/ensemble-manager-config.yaml b/charts/mint/templates/ensemble-manager-config.yaml
@@ -26,7 +26,7 @@ data:
          {{- end}}
 
          {{ with .Values.external_services}}
-         {{- if .ckan and eq .ckan.enabled true }}
+         {{- if eq .ckan.enabled true }}
          "data_catalog_api": {{ .ckan.url | quote }},
          "data_catalog_type": {{ .ckan.type | quote }},
          "data_catalog_extra": {
@@ -36,7 +36,7 @@ data:
          {{- end}}
          {{end}}
 
-         {{- if .Values.external_services.s3 and .Values.external_services.s3.enabled }}
+         {{- if eq .Values.external_services.s3.enabled true }}
          "data_server_type": {{ .Values.external_services.s3.type | quote }},
          "data_server": {
             "region": {{ .Values.external_services.s3.region | quote }},

diff --git a/charts/mint/templates/post-install-hasura.yaml b/charts/mint/templates/post-install-hasura.yaml
@@ -50,13 +50,10 @@ spec:
         args: ["-c", "env && pushd /hasura && hasura migrate apply && hasura metadata apply && hasura seeds apply"]
         {{- with .Values.components.hasura  }}
         image: "{{ .image.repository }}:{{ .image.tag | default $.Chart.AppVersion }}"
+        {{ end }}
+        {{- with .Values.jobs.hasura }}
         resources:
-          requests:
-            cpu: 1000m
-            memory: 1000Mi
-          limits:
-            cpu: 1100m
-            memory: 1100Mi
+          {{- toYaml .resources | nindent 12 }}
         {{ end }}
         env:
           - name: HASURA_GRAPHQL_ENDPOINT

diff --git a/charts/mint/templates/post-install-model-catalog-endpoint.yaml b/charts/mint/templates/post-install-model-catalog-endpoint.yaml
@@ -43,6 +43,8 @@ spec:
           "]
         {{- with .Values.components.model_catalog_endpoint  }}
         image: "{{ .image.repository }}:{{ .image.tag | default $.Chart.AppVersion }}"
+        {{ end }}
+        {{- with .Values.jobs.model_catalog_endpoint }}
         resources:
           {{- toYaml .resources | nindent 12 }}
         {{ end }}

diff --git a/charts/mint/templates/ui-config.yaml b/charts/mint/templates/ui-config.yaml
@@ -13,21 +13,25 @@ data:
     {{- end }}
     // Mint Services
     {{ if eq .Values.service.type "ClusterIP" }}
+
     {{ with .Values.components.cromo }}
     {{ if  .enabled }}
     window.REACT_APP_CROMO_URL = "http{{ if .ingress.tls }}s{{ end }}://{{ with (first .ingress.hosts ) }}{{ .host }}{{ end }}";
     {{ end }}
     {{ end }}
+
     {{ with .Values.components.data_catalog }}
     {{ if  .enabled }}
     window.REACT_APP_DATA_CATALOG_API = "http{{ if .ingress.tls }}s{{ end }}://{{ with (first .ingress.hosts ) }}{{ .host }}{{ end }}";
     {{ end }}
     {{ end }}
+
     {{ with .Values.components.model_catalog_api}}
     {{ if  .enabled }}
     window.REACT_APP_MODEL_CATALOG_API = "http{{ if .ingress.tls }}s{{ end }}://{{ with (first .ingress.hosts ) }}{{ .host }}{{ end }}/{{ .api_version }}";
     {{ end }}
     {{ end }}
+
     {{ with .Values.components.hasura }}
     {{ if  .enabled }}
     window.REACT_APP_GRAPHQL_ENDPOINT = "{{ with (first .ingress.hosts ) }}{{ .host }}{{ end }}/v1/graphql";
@@ -39,6 +43,7 @@ data:
     {{ with .Values.components.ensemble_manager }}
     window.REACT_APP_ENSEMBLE_MANAGER_API = "http{{ if .ingress.tls }}s{{ end }}://{{ with (first .ingress.hosts ) }}{{ .host }}{{ end }}/{{ .api_version }}";
     {{ end }}
+    {{ end }}
 
     {{ with .Values.components.ensemble_manager.config.execution_engine }}
     window.REACT_APP_EXECUTION_ENGINE = "{{ .type }}";
@@ -51,6 +56,7 @@ data:
     window.REACT_APP_LOCALEX_LOGURL = "{{ .data_url }}/logs";
     window.REACT_APP_LOCALEX_PARALLEL = "{{ .parallellelism }}";
     {{ end }}
+
     {{ if eq .type "tapis" }}
     window.REACT_APP_LOCALEX_CODEDIR = "{{ .data_dir }}/code";
     window.REACT_APP_LOCALEX_DATADIR = "{{ .data_dir }}/data";
@@ -60,6 +66,7 @@ data:
     window.REACT_APP_LOCALEX_LOGURL = "{{ .data_url }}/logs";
     window.REACT_APP_LOCALEX_PARALLEL = "{{ .parallelism }}";
     {{ end }}
+
     {{ if eq .type "wings" }}
     //Execution - Wings
     window.REACT_APP_WINGS_EXPORT_URL = "{{ .wings_export_url }}";
@@ -86,16 +93,14 @@ data:
     window.REACT_APP_AIRFLOW_DAG_DOWNLOAD_THREAD_ID = "download_thread"
 
     {{ with .Values.external_services }}
-    {{- if .ckan and eq .ckan.enabled true }}
+    {{ if eq .ckan.enabled true }}
     window.REACT_APP_DATA_CATALOG_TYPE = {{ .ckan.type | quote }};
     window.REACT_APP_DATA_CATALOG_KEY = {{ .ckan.api_key | quote }};
     {{ end }}
     {{ end }}
 
-    {{ with .Values.components.data_catalog }}
-    {{ if  eq .enabled false }}
+    {{ if  eq .Values.components.data_catalog.enabled false }}
     window.REACT_APP_DATA_CATALOG_API = {{.Values.external_services.ckan.url | quote }};
     {{ end }}
-    {{ end }}
 
 {{- end }}
diff --git a/charts/mint/values.yaml b/charts/mint/values.yaml
@@ -306,10 +306,13 @@ components:
       selector: {}
       annotations:
         helm.sh/resource-policy: keep
-
-external:
-  data_catalog:
-    url: http://localhost:5000
+jobs:
+  model_catalog_endpoint:
+    enabled: true
+    resources: {}
+  hasura:
+    enabled: true
+    resources: {}
 
 google:
   maps:
@@ -381,8 +384,8 @@ external_services:
     type: "CKAN"
     api_key: "CHANGEME"
     extra:
-      owner_organization_id: "21033e7d-484d-4974-9340-8c5755242c1f"
-      owner_provenance_id: "9ef60317-5da5-4050-8bbc-7d6826fee49f"
+      owner_organization_id: ""
+      owner_provenance_id: ""
   s3:
     enabled: false
     type: "S3"