Test components

.github/workflows/linter.yaml

@@ -37,3 +37,11 @@ jobs:
       - name: Run chart-testing (lint)
         if: steps.list-changed.outputs.changed == 'true'
         run: ct lint --target-branch ${{ github.event.repository.default_branch }}
+
+      - name: Create kind cluster
+        if: steps.list-changed.outputs.changed == 'true'
+        uses: helm/kind-action@v1.10.0
+
+      - name: Run chart-testing (install)
+        if: steps.list-changed.outputs.changed == 'true'
+        run: ct install --target-branch ${{ github.event.repository.default_branch }}

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: 2.3.1
+version: 2.3.2
 # 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.

charts/mint/templates/datacatalog.yaml

@@ -47,10 +47,19 @@ spec:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:
         - name: data-catalog
-          {{- with .Values.components.data_catalog  }}
+
+          {{- if .Values.arm_support  }}
+          {{- with .Values.components.data_catalog }}
+          image: "{{ .arm_image.repository }}:{{ .arm_image.tag | default $.Chart.AppVersion }}"
+          imagePullPolicy: {{ .arm_image.pullPolicy }}
+          {{- end }}
+          {{- else }}
+          {{- with .Values.components.data_catalog }}
           image: "{{ .image.repository }}:{{ .image.tag | default $.Chart.AppVersion }}"
           imagePullPolicy: {{ .image.pullPolicy }}
           {{- end }}
+          {{- end }}
+
           ports:
             - name: http
               containerPort: 7000
@@ -84,10 +93,19 @@ spec:
                   name: {{ include "mint.prefix" . }}-data-catalog-db-secrets
                   key: password
         - name: data-catalog-db
+
+          {{- if .Values.arm_support  }}
+          {{- with .Values.components.data_catalog_db }}
+          image: "{{ .arm_image.repository }}:{{ .arm_image.tag | default $.Chart.AppVersion }}"
+          imagePullPolicy: {{ .arm_image.pullPolicy }}
+          {{- end }}
+          {{- else }}
           {{- with .Values.components.data_catalog_db }}
           image: "{{ .image.repository }}:{{ .image.tag | default $.Chart.AppVersion }}"
           imagePullPolicy: {{ .image.pullPolicy }}
           {{- end }}
+          {{- end }}
+
           resources: {}
           volumeMounts:
           - mountPath: /var/lib/postgresql/data

charts/mint/templates/hasura.yaml

@@ -99,6 +99,7 @@ spec:
           imagePullPolicy: {{ .image.pullPolicy }}
           {{- end }}
           {{- end }}
+
           resources: {}
           volumeMounts:
           - mountPath: /var/lib/postgresql/data

charts/mint/templates/mic-ui-config.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.components.mic_ui.enabled }}
 ---
 apiVersion: v1
 kind: ConfigMap
@@ -35,3 +36,5 @@ data:
         {{- end }}
       {{- end }}
     {{- end }}
+
+{{- end}}

charts/mint/templates/model-catalog-endpoint.yaml

@@ -75,7 +75,6 @@ spec:
             httpGet:
               path: /
               port: http
-
       volumes:
         - name: config
           {{- if .Values.components.model_catalog_endpoint.persistence.enabled }}

charts/mint/templates/post-install-hasura.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.components.hasura.enabled }}
 apiVersion: batch/v1
 kind: Job
 metadata:
@@ -33,4 +34,5 @@ spec:
             valueFrom:
               secretKeyRef:
                 name: {{ include "mint.prefix" . }}-hasura-secrets
-                key: admin_secret
+                key: admin_secret
+{{- end }}

charts/mint/templates/post-install-mic.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.components.mic_api.enabled }}
 apiVersion: batch/v1
 kind: Job
 metadata:
@@ -45,4 +46,5 @@ spec:
             valueFrom:
               secretKeyRef:
                 name: {{ include "mint.prefix" . }}-mic-api-db-secrets
-                key: password
+                key: password
+{{- end }}

charts/mint/templates/post-install-model-catalog-endpoint.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.components.model_catalog_endpoint.enabled }}
 apiVersion: batch/v1
 kind: Job
 metadata:
@@ -43,3 +44,4 @@ spec:
               secretKeyRef:
                 name: {{ include "mint.prefix" . }}-model-catalog-endpoint-secrets
                 key: password
+{{- end }}

charts/mint/templates/pvc-datacatalog.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.components.data_catalog.enabled }}
 {{- if and .Values.components.data_catalog_db.persistence.enabled (not .Values.components.data_catalog_db.persistence.existingClaim) }}
 kind: PersistentVolumeClaim
 apiVersion: v1
@@ -30,4 +31,4 @@ spec:
   dataSource: {{- include "common.tplvalues.render" (dict "value" .Values.components.data_catalog_db.persistence.dataSource "context" $) | nindent 4 }}
   {{- end }}
 {{- end }}
- 
+{{- end }}

charts/mint/templates/pvc-hasura.yaml

@@ -1,3 +1,4 @@
+{{- if  .Values.components.hasura.enabled }}
 {{- if and .Values.components.hasura_db.persistence.enabled (not .Values.components.hasura_db.persistence.existingClaim) }}
 kind: PersistentVolumeClaim
 apiVersion: v1
@@ -31,4 +32,4 @@ spec:
   dataSource: {{- include "common.tplvalues.render" (dict "value" .Values.components.hasura_db.persistence.dataSource "context" $) | nindent 4 }}
   {{- end }}
 {{- end }}
- 
+{{- end }}

charts/mint/templates/pvc-mic.yaml

@@ -1,4 +1,4 @@
-{{- if and .Values.components.mic_api_db.persistence.enabled (not .Values.components.mic_api_db.persistence.existingClaim) }}
+{{- if and .Values.components.mic_api.enabled and .Values.components.mic_api_db.persistence.enabled (not .Values.components.mic_api_db.persistence.existingClaim) }}
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
@@ -30,4 +30,3 @@ spec:
   dataSource: {{- include "common.tplvalues.render" (dict "value" .Values.components.mic_api_db.persistence.dataSource "context" $) | nindent 4 }}
   {{- end }}
 {{- end }}
-

charts/mint/templates/pvc-model-catalog.yaml

@@ -1,3 +1,4 @@
+{{- if and .Values.components.model_catalog_endpoint.enabled }}
 {{- if and .Values.components.model_catalog_endpoint.persistence.enabled (not .Values.components.model_catalog_endpoint.persistence.existingClaim) }}
 kind: PersistentVolumeClaim
 apiVersion: v1
@@ -61,4 +62,4 @@ spec:
   dataSource: {{- include "common.tplvalues.render" (dict "value" .Values.components.model_catalog_endpoint.persistence.dataSource "context" $) | nindent 4 }}
   {{- end }}
 {{- end }}
- 
+{{- end }}

charts/mint/templates/ui-config.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.components.ui.enabled }}
 ---
 apiVersion: v1
 kind: ConfigMap
@@ -93,3 +94,4 @@ data:
     window.REACT_APP_INGESTION_API = "http://node1.ingestion.mint.isi.edu/v1.3.0";
     window.REACT_APP_AIRFLOW_API = "https://airflow.mint.isi.edu/api/v1";
     window.REACT_APP_AIRFLOW_DAG_DOWNLOAD_THREAD_ID = "download_thread"
+{{- end}}

charts/mint/values.yaml

@@ -25,7 +25,7 @@ components:
               pathType: ImplementationSpecific
       tls: []
   mic_ui:
-    enabled: true
+    enabled: false
     image:
       repository: mintproject/mic-web
       tag: a736ac5841d471de4679bec80c13b0fb646ae073
@@ -44,7 +44,7 @@ components:
               pathType: ImplementationSpecific
       tls: []
   mic_api:
-    enabled: true
+    enabled: false
     image:
       repository: mintproject/mic-api
       tag: ee71a1a364fc3d384f85243684ad95d37913b049
@@ -76,10 +76,14 @@ components:
       annotations:
         helm.sh/resource-policy: keep
   data_catalog:
-    enabled: false
+    enabled: true
     image:
       repository: mintproject/data-catalog
-      tag: 0e6b32b73228ef268065694ddf0aec47d28bf58e
+      tag: 9be70359feabe03ed55bfdbf92c20a7e43ab928b
+      pullPolicy: IfNotPresent
+    arm_image:
+      repository: mintproject/data-catalog
+      tag: 8a6af95cae183320d596dc5219f2f76d1f234749
       pullPolicy: IfNotPresent
     ingress:
       enabled: true
@@ -94,7 +98,11 @@ components:
   data_catalog_db:
     image:
       repository: mintproject/data-catalog-db
-      tag: 0e6b32b73228ef268065694ddf0aec47d28bf58e
+      tag: 9be70359feabe03ed55bfdbf92c20a7e43ab928b
+      pullPolicy: IfNotPresent
+    arm_image:
+      repository: mintproject/data-catalog-db
+      tag: 8a6af95cae183320d596dc5219f2f76d1f234749
       pullPolicy: IfNotPresent
     persistence:
       enabled: true