From 2f79a25f02973d2cdcdb00d2a3b40051514a1c39 Mon Sep 17 00:00:00 2001 From: Maximiliano Osorio Date: Sun, 8 Sep 2024 11:05:09 -0300 Subject: [PATCH 1/6] dump --- charts/mint/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/mint/Chart.yaml b/charts/mint/Chart.yaml index 032420a..01dc643 100644 --- 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.6 +version: 3.3.1-alpha.9 # 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. From 6c6bf604df850b91a2d13caea590aec18a22d21b Mon Sep 17 00:00:00 2001 From: Maximiliano Osorio Date: Sun, 8 Sep 2024 11:09:14 -0300 Subject: [PATCH 2/6] add: test --- .github/workflows/linter.yaml | 2 +- tests/amd64.yaml | 36 +++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 tests/amd64.yaml diff --git a/.github/workflows/linter.yaml b/.github/workflows/linter.yaml index dd4ff1e..fa18561 100644 --- a/.github/workflows/linter.yaml +++ b/.github/workflows/linter.yaml @@ -44,4 +44,4 @@ jobs: - name: Run chart-testing (install) if: steps.list-changed.outputs.changed == 'true' - run: ct install --config ct.yaml + run: ct install --helm-extra-set-args "--values=tests/amd64.yaml" --target-branch ${{ github.event.repository.default_branch }} diff --git a/tests/amd64.yaml b/tests/amd64.yaml new file mode 100644 index 0000000..9a83168 --- /dev/null +++ b/tests/amd64.yaml @@ -0,0 +1,36 @@ +components: + cromo: + enabled: false + resources: {} + mic_ui: + enabled: false + resources: {} + mic_api: + enabled: false + resources: {} + mic_api_db: + resources: {} + data_catalog: + enabled: false + resources: {} + data_catalog_db: + resources: {} + model_catalog_endpoint: + enabled: true + resources: {} + hasura: + enabled: true + resources: {} + model_catalog_explorer: + enabled: true + resources: {} + model_catalog_api: + enabled: true + resources: {} + ui: + enabled: true + resources: {} + ensemble_manager: + enabled: true + resources: {} +resources: {} From f91fa19b5c17449123edce3765c950fa51ad218d Mon Sep 17 00:00:00 2001 From: Maximiliano Osorio Date: Sun, 8 Sep 2024 11:19:10 -0300 Subject: [PATCH 3/6] fix: set extra args --- .github/workflows/linter.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linter.yaml b/.github/workflows/linter.yaml index fa18561..39c2e32 100644 --- a/.github/workflows/linter.yaml +++ b/.github/workflows/linter.yaml @@ -44,4 +44,4 @@ jobs: - name: Run chart-testing (install) if: steps.list-changed.outputs.changed == 'true' - run: ct install --helm-extra-set-args "--values=tests/amd64.yaml" --target-branch ${{ github.event.repository.default_branch }} + run: ct install --helm-extra-args "--values=tests/amd64.yaml" --target-branch ${{ github.event.repository.default_branch }} From 633efcf6aade9cc5a70be324f20be2cb218d3894 Mon Sep 17 00:00:00 2001 From: Maximiliano Osorio Date: Sun, 8 Sep 2024 11:21:59 -0300 Subject: [PATCH 4/6] fix: typo --- .github/workflows/linter.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linter.yaml b/.github/workflows/linter.yaml index 39c2e32..6cafff0 100644 --- a/.github/workflows/linter.yaml +++ b/.github/workflows/linter.yaml @@ -44,4 +44,4 @@ jobs: - name: Run chart-testing (install) if: steps.list-changed.outputs.changed == 'true' - run: ct install --helm-extra-args "--values=tests/amd64.yaml" --target-branch ${{ github.event.repository.default_branch }} + run: ct install --helm-extra-args "-f tests/amd64.yaml" --target-branch ${{ github.event.repository.default_branch }} From b81c293271b091ef987f66d7060819c33f82784d Mon Sep 17 00:00:00 2001 From: Maximiliano Osorio Date: Sun, 8 Sep 2024 12:16:15 -0300 Subject: [PATCH 5/6] fix: resource empty by default --- charts/mint/values.yaml | 96 +++++-------------------------------- tests/amd64.yaml | 104 +++++++++++++++++++++++++++++++++++----- 2 files changed, 104 insertions(+), 96 deletions(-) diff --git a/charts/mint/values.yaml b/charts/mint/values.yaml index c040734..a36063d 100644 --- a/charts/mint/values.yaml +++ b/charts/mint/values.yaml @@ -44,13 +44,7 @@ components: - path: / pathType: ImplementationSpecific tls: [] - resources: - requests: - memory: "256Mi" - cpu: "100m" - limits: - memory: "512Mi" - cpu: "200m" + resources: {} mic_api: enabled: false image: @@ -67,25 +61,13 @@ components: - path: / pathType: ImplementationSpecific tls: [] - resources: - requests: - memory: "256Mi" - cpu: "100m" - limits: - memory: "512Mi" - cpu: "200m" + resources: {} mic_api_db: image: repository: postgres tag: 14.6 pullPolicy: IfNotPresent - resources: - requests: - memory: "256Mi" - cpu: "100m" - limits: - memory: "512Mi" - cpu: "200m" + resources: {} persistence: enabled: true storageClass: "" @@ -107,13 +89,7 @@ components: repository: mintproject/data-catalog tag: 8a6af95cae183320d596dc5219f2f76d1f234749 pullPolicy: IfNotPresent - resources: - requests: - memory: "500Mi" - cpu: "500m" - limits: - memory: "512Mi" - cpu: "600m" + resources: {} ingress: enabled: true className: "" @@ -133,13 +109,7 @@ components: repository: mintproject/data-catalog-db tag: 8a6af95cae183320d596dc5219f2f76d1f234749 pullPolicy: IfNotPresent - resources: - requests: - memory: "256Mi" - cpu: "100m" - limits: - memory: "512Mi" - cpu: "200m" + resources: {} persistence: enabled: true storageClass: "" @@ -157,13 +127,7 @@ components: repository: mintproject/model-catalog-endpoint tag: 29256555a6fbaefae4729d5cd259564708a4ab04 pullPolicy: IfNotPresent - resources: - requests: - memory: "2000Mi" - cpu: "1000m" - limits: - memory: "2500Mi" - cpu: "1024m" + resources: {} environment: dataset: modelcatalog graph_base: http://endpoint.mint.isi.edu/modelCatalog-1.8.0/data/ @@ -197,13 +161,7 @@ components: repository: mintproject/graphql-engine tag: 305c0dbeba1878eafe348f21fc300fbfc017d9dc pullPolicy: IfNotPresent - resources: - requests: - memory: "1024Mi" - cpu: "1000m" - limits: - memory: "1100Mi" - cpu: "1100m" + resources: {} environment: enable_console: true enable_dev_mode: false @@ -227,13 +185,7 @@ components: repository: imresamu/postgis-arm64 tag: 12-3.4-alpine pullPolicy: IfNotPresent - resources: - requests: - memory: "1024Mi" - cpu: "1000m" - limits: - memory: "1100Mi" - cpu: "1100m" + resources: {} persistence: enabled: true storageClass: "" @@ -251,13 +203,7 @@ components: repository: mintproject/model-catalog-explorer tag: 0b2f9f0a9124076aeb492add2f123d0757066f6b pullPolicy: IfNotPresent - resources: - requests: - memory: "256Mi" - cpu: "100m" - limits: - memory: "512Mi" - cpu: "200m" + resources: {} ingress: enabled: true className: "" @@ -275,13 +221,7 @@ components: repository: mintproject/model-catalog-fastapi tag: c5f784785c52034f75de24c46b89907c74a14312 pullPolicy: IfNotPresent - resources: - requests: - memory: "1024Mi" - cpu: "1000m" - limits: - memory: "1100Mi" - cpu: "1100m" + resources: {} environment: context_dir: contexts/ queries_dir: queries/ @@ -302,13 +242,7 @@ components: repository: mintproject/mint-ui-lit tag: 858ce054d1f757d0f6ec3765e878ec54091bb110 pullPolicy: IfNotPresent - resources: - requests: - memory: "256Mi" - cpu: "100m" - limits: - memory: "512Mi" - cpu: "200m" + resources: {} ingress: enabled: true className: "" @@ -326,13 +260,7 @@ components: repository: mintproject/ensemble-manager tag: be57e330e06c1ba73295b3eb500c352384e9dbca pullPolicy: IfNotPresent - resources: - requests: - memory: "1024Mi" - cpu: "1000m" - limits: - memory: "1100Mi" - cpu: "1100m" + resources: {} serviceAccountName: default environment: data_dir: /var/mint diff --git a/tests/amd64.yaml b/tests/amd64.yaml index 9a83168..3973bd7 100644 --- a/tests/amd64.yaml +++ b/tests/amd64.yaml @@ -4,33 +4,113 @@ components: resources: {} mic_ui: enabled: false - resources: {} + resources: + requests: + memory: "256Mi" + cpu: "100m" + limits: + memory: "512Mi" + cpu: "200m" mic_api: enabled: false - resources: {} + resources: + requests: + memory: "256Mi" + cpu: "100m" + limits: + memory: "512Mi" + cpu: "200m" mic_api_db: - resources: {} + resources: + requests: + memory: "256Mi" + cpu: "100m" + limits: + memory: "512Mi" + cpu: "200m" data_catalog: enabled: false - resources: {} + resources: + requests: + memory: "500Mi" + cpu: "500m" + limits: + memory: "512Mi" + cpu: "600m" data_catalog_db: - resources: {} + resources: + requests: + memory: "500Mi" + cpu: "500m" + limits: + memory: "512Mi" + cpu: "600m" model_catalog_endpoint: enabled: true - resources: {} + resources: + requests: + memory: "2000Mi" + cpu: "1000m" + limits: + memory: "2500Mi" + cpu: "1024m" hasura: enabled: true - resources: {} + resources: + requests: + memory: "1024Mi" + cpu: "1000m" + limits: + memory: "1100Mi" + cpu: "1100m" + hasura_db: + resources: + requests: + memory: "1024Mi" + cpu: "1000m" + limits: + memory: "1100Mi" + cpu: "1100m" model_catalog_explorer: enabled: true - resources: {} + resources: + requests: + memory: "256Mi" + cpu: "100m" + limits: + memory: "512Mi" + cpu: "200m" model_catalog_api: enabled: true - resources: {} + resources: + requests: + memory: "1024Mi" + cpu: "1000m" + limits: + memory: "1100Mi" + cpu: "1100m" ui: enabled: true - resources: {} + resources: + requests: + memory: "256Mi" + cpu: "100m" + limits: + memory: "512Mi" + cpu: "200m" ensemble_manager: enabled: true - resources: {} -resources: {} + resources: + requests: + memory: "1024Mi" + cpu: "1000m" + limits: + memory: "1100Mi" + cpu: "1100m" +resources: + requests: + cpu: 200m + memory: 254Mi + limits: + cpu: 210m + memory: 256Mi From 0fadb2c017b992addf4e68adbd822ac26e5c6b26 Mon Sep 17 00:00:00 2001 From: Maximiliano Osorio Date: Sun, 8 Sep 2024 12:29:40 -0300 Subject: [PATCH 6/6] fix: default ct --- .github/workflows/linter.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/linter.yaml b/.github/workflows/linter.yaml index 6cafff0..4a83262 100644 --- a/.github/workflows/linter.yaml +++ b/.github/workflows/linter.yaml @@ -44,4 +44,5 @@ jobs: - name: Run chart-testing (install) if: steps.list-changed.outputs.changed == 'true' - run: ct install --helm-extra-args "-f tests/amd64.yaml" --target-branch ${{ github.event.repository.default_branch }} + #run: ct install --helm-extra-args "-f tests/amd64.yaml" --target-branch ${{ github.event.repository.default_branch }} + run: ct install --target-branch ${{ github.event.repository.default_branch }}