Add default resources (#54)

* add: default resources * fix: missing label * fix: add post install * fix: add post install
mintproject · Sep 8, 2024 · 6f114a9 · 6f114a9
1 parent 2247205
commit 6f114a9
Show file tree

Hide file tree

Showing 8 changed files with 269 additions and 116 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 kubeconfig
+uscd.yaml
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.5
+version: 3.3.1-alpha.6
 # 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/model-catalog-explorer.yaml b/charts/mint/templates/model-catalog-explorer.yaml
@@ -44,10 +44,10 @@ spec:
       containers:
         - name: model-catalog-explorer
           {{- with .Values.components.model_catalog_explorer }}
-          image: "{{ .image.repository }}:{{ .image.tag | default $.Chart.AppVersion }}"
-          imagePullPolicy: {{ .image.pullPolicy }}
           resources:
             {{- toYaml .resources | nindent 12 }}
+          image: "{{ .image.repository }}:{{ .image.tag | default $.Chart.AppVersion }}"
+          imagePullPolicy: {{ .image.pullPolicy }}
           {{- end }}
           ports:
             - name: http

diff --git a/charts/mint/values.yaml b/charts/mint/values.yaml
@@ -44,7 +44,13 @@ components:
             - path: /
               pathType: ImplementationSpecific
       tls: []
-    resources: {}
+    resources:
+      requests:
+        memory: "256Mi"
+        cpu: "100m"
+      limits:
+        memory: "512Mi"
+        cpu: "200m"
   mic_api:
     enabled: false
     image:
@@ -61,13 +67,25 @@ components:
             - path: /
               pathType: ImplementationSpecific
       tls: []
-    resources: {}
+    resources:
+      requests:
+        memory: "256Mi"
+        cpu: "100m"
+      limits:
+        memory: "512Mi"
+        cpu: "200m"
   mic_api_db:
     image:
       repository: postgres
       tag: 14.6
       pullPolicy: IfNotPresent
-    resources: {}
+    resources:
+      requests:
+        memory: "256Mi"
+        cpu: "100m"
+      limits:
+        memory: "512Mi"
+        cpu: "200m"
     persistence:
       enabled: true
       storageClass: ""
@@ -89,7 +107,13 @@ components:
       repository: mintproject/data-catalog
       tag: 8a6af95cae183320d596dc5219f2f76d1f234749
       pullPolicy: IfNotPresent
-    resources: {}
+    resources:
+      requests:
+        memory: "500Mi"
+        cpu: "500m"
+      limits:
+        memory: "512Mi"
+        cpu: "600m"
     ingress:
       enabled: true
       className: ""
@@ -109,7 +133,13 @@ components:
       repository: mintproject/data-catalog-db
       tag: 8a6af95cae183320d596dc5219f2f76d1f234749
       pullPolicy: IfNotPresent
-    resources: {}
+    resources:
+      requests:
+        memory: "256Mi"
+        cpu: "100m"
+      limits:
+        memory: "512Mi"
+        cpu: "200m"
     persistence:
       enabled: true
       storageClass: ""
@@ -127,7 +157,13 @@ components:
       repository: mintproject/model-catalog-endpoint
       tag: 29256555a6fbaefae4729d5cd259564708a4ab04
       pullPolicy: IfNotPresent
-    resources: {}
+    resources:
+      requests:
+        memory: "2000Mi"
+        cpu: "1000m"
+      limits:
+        memory: "2500Mi"
+        cpu: "1024m"
     environment:
       dataset: modelcatalog
       graph_base: http://endpoint.mint.isi.edu/modelCatalog-1.8.0/data/
@@ -161,7 +197,13 @@ components:
       repository: mintproject/graphql-engine
       tag: 305c0dbeba1878eafe348f21fc300fbfc017d9dc
       pullPolicy: IfNotPresent
-    resources: {}
+    resources:
+      requests:
+        memory: "1024Mi"
+        cpu: "1000m"
+      limits:
+        memory: "1100Mi"
+        cpu: "1100m"
     environment:
       enable_console: true
       enable_dev_mode: false
@@ -185,7 +227,13 @@ components:
       repository: imresamu/postgis-arm64
       tag: 12-3.4-alpine
       pullPolicy: IfNotPresent
-    resources: {}
+    resources:
+      requests:
+        memory: "1024Mi"
+        cpu: "1000m"
+      limits:
+        memory: "1100Mi"
+        cpu: "1100m"
     persistence:
       enabled: true
       storageClass: ""
@@ -203,7 +251,13 @@ components:
       repository: mintproject/model-catalog-explorer
       tag: 0b2f9f0a9124076aeb492add2f123d0757066f6b
       pullPolicy: IfNotPresent
-    resources: {}
+    resources:
+      requests:
+        memory: "256Mi"
+        cpu: "100m"
+      limits:
+        memory: "512Mi"
+        cpu: "200m"
     ingress:
       enabled: true
       className: ""
@@ -221,7 +275,13 @@ components:
       repository: mintproject/model-catalog-fastapi
       tag: c5f784785c52034f75de24c46b89907c74a14312
       pullPolicy: IfNotPresent
-    resources: {}
+    resources:
+      requests:
+        memory: "1024Mi"
+        cpu: "1000m"
+      limits:
+        memory: "1100Mi"
+        cpu: "1100m"
     environment:
       context_dir: contexts/
       queries_dir: queries/
@@ -242,7 +302,13 @@ components:
       repository: mintproject/mint-ui-lit
       tag: 858ce054d1f757d0f6ec3765e878ec54091bb110
       pullPolicy: IfNotPresent
-    resources: {}
+    resources:
+      requests:
+        memory: "256Mi"
+        cpu: "100m"
+      limits:
+        memory: "512Mi"
+        cpu: "200m"
     ingress:
       enabled: true
       className: ""
@@ -260,7 +326,13 @@ components:
       repository: mintproject/ensemble-manager
       tag: be57e330e06c1ba73295b3eb500c352384e9dbca
       pullPolicy: IfNotPresent
-    resources: {}
+    resources:
+      requests:
+        memory: "1024Mi"
+        cpu: "1000m"
+      limits:
+        memory: "1100Mi"
+        cpu: "1100m"
     serviceAccountName: default
     environment:
       data_dir: /var/mint