Skip to content

Commit

Permalink
Merge pull request #114 from Calcagiara/oltreDashboard
Browse files Browse the repository at this point in the history
feat/bump(dhub): updated dashboard, removed nefertem test, bumped ver…
  • Loading branch information
ffais committed Sep 4, 2024
2 parents 8be996d + ac7c053 commit 938c706
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 107 deletions.
4 changes: 2 additions & 2 deletions charts/digitalhub/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ maintainers:
url: https://github.com/ffais
- name: calcagiara
url: https://github.com/Calcagiara
version: "0.7.0-beta6"
version: "0.7.0-beta7"
appVersion: "0.7.0"
dependencies:
- name: apigw-operator
Expand All @@ -19,7 +19,7 @@ dependencies:
repository: https://helm.coder.com/v2
condition: coder.enabled
- name: core
version: "0.2.3"
version: "0.2.4"
repository: https://scc-digitalhub.github.io/digitalhub/
condition: core.enabled
- name: kubernetes-resource-manager
Expand Down
40 changes: 22 additions & 18 deletions charts/digitalhub/confs/dashboard/components.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"slug": "minio",
"name": "Minio",
"description": "S3-compatible datalake",
"order": 3,
"port": "",
{{- if (index .Values "minio" "consoleIngress" "enabled") }}
{{- with (index .Values "minio" "consoleIngress" "hosts" 0) }}
Expand All @@ -19,6 +20,7 @@
"slug": "coder",
"name": "Coder",
"description": "Workspace manager",
"order": 1,
"port": "",
{{- if .Values.coder.coder.ingress.enable }}
"link": "https://{{ .Values.coder.coder.ingress.host }}"
Expand All @@ -30,6 +32,7 @@
"slug": "krm",
"name": "Kubernetes Resource Manager",
"description": "Manager for Kubernetes Resources",
"order": 2,
"port": "",
{{- if (index .Values "kubernetes-resource-manager" "ingress" "enabled") }}
{{- with (index .Values "kubernetes-resource-manager" "ingress" "hosts" 0) }}
Expand Down Expand Up @@ -81,6 +84,21 @@
},
{{- end}}
{{- else }}
{
"slug": "kubeflow",
"name": "Kubeflow Dashboard",
"description": "Kubeflow Pipelines is a platform for building and deploying portable, scalable machine learning (ML) workflows",
"port": "",
{{- if (index .Values "mlrun-ce" "pipelines" "ui" "ingress" "enabled") }}
{{- with (index .Values "mlrun-ce" "pipelines" "ui" "ingress" "hosts" 0) }}
"link": "https://{{ .host }}"
{{- end }}
{{- else }}
{{- with (index .Subcharts "mlrun-ce") }}
"link": "http://{{ $externalUrl }}:{{ .Values.pipelines.ui.service.nodePort }}"
{{- end }}
{{- end }}
},
{
"slug": "nuclio",
"name": "Nuclio",
Expand Down Expand Up @@ -109,26 +127,12 @@
{{- end }}
{{- end }}
},
{
"slug": "kubeflow",
"name": "Kubeflow Dashboard",
"description": "Kubeflow Pipelines is a platform for building and deploying portable, scalable machine learning (ML) workflows",
"port": "",
{{- if (index .Values "mlrun-ce" "pipelines" "ui" "ingress" "enabled") }}
{{- with (index .Values "mlrun-ce" "pipelines" "ui" "ingress" "hosts" 0) }}
"link": "https://{{ .host }}"
{{- end }}
{{- else }}
{{- with (index .Subcharts "mlrun-ce") }}
"link": "http://{{ $externalUrl }}:{{ .Values.pipelines.ui.service.nodePort }}"
{{- end }}
{{- end }}
},
{{- end }}
{
"slug": "dhcore",
"name": "DH Core",
"description": "Core Digital Hub",
"slug": "core",
"name": "Core",
"description": "Core Management UI",
"order": 0,
"port": "",
{{- if .Values.core.ingress.enabled }}
{{- with (index .Values.core.ingress.hosts 0) }}
Expand Down
82 changes: 0 additions & 82 deletions charts/digitalhub/confs/tests/python-test/python-test-nefertem.py

This file was deleted.

2 changes: 1 addition & 1 deletion charts/digitalhub/templates/tests/python-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
containers:
- name: python
image: python:3.9-slim
command: ['sh', '-c', 'pip install "digitalhub_runtime_{{$testName}}[local]{{ $.Values.core.testSuite }}" requests-oauthlib {{- if eq ($testName) "nefertem" }} nefertem-inference-frictionless nefertem-profiling-frictionless nefertem-validation-frictionless {{- end }} && python home/{{ $key | trimPrefix "confs/tests/python-test/" }}']
command: ['sh', '-c', 'pip install "digitalhub_runtime_{{$testName}}[local]{{ $.Values.core.testSuite }}" requests-oauthlib && python home/{{ $key | trimPrefix "confs/tests/python-test/" }}']
volumeMounts:
- name: test-volume
mountPath: /home
Expand Down
24 changes: 20 additions & 4 deletions charts/digitalhub/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,9 @@ coder:
- name: jupyter
nodePort: "30040"
iconUrl: https://upload.wikimedia.org/wikipedia/commons/thumb/3/38/Jupyter_logo.svg/1200px-Jupyter_logo.svg.png
image: "ghcr.io/scc-digitalhub/jupyter-3-10:0.7.0b2"
image39: "ghcr.io/scc-digitalhub/jupyter-3-9:0.7.0b2"
image311: "ghcr.io/scc-digitalhub/jupyter-3-11:0.7.0b2"
image: "ghcr.io/scc-digitalhub/jupyter-3-10:0.7.0b3"
image39: "ghcr.io/scc-digitalhub/jupyter-3-9:0.7.0b3"
image311: "ghcr.io/scc-digitalhub/jupyter-3-11:0.7.0b3"
privileged: false
- name: dremio
nodePort: "30120"
Expand Down Expand Up @@ -330,6 +330,22 @@ core:
enabled: true
image: smartcommunitylab/k8s-ansible:1.30.0-1.7.0-nonroot
testSuite: ">=0.7.0b"
coreAuthCreds: # These are example creds, change them to your needs.
clientId: "m04bfbmd03m8sf4u9ucz54ti"
clientSecret: "9rb5215z0aqd7fadzxuoyqe3"
kanikoArgs: false
additionalConfig: # Configuration of pods created by Core
debug:
enableMetrics: false # Enable/disable metrics. Metrics server deployment is required.
enableLogs: true # Enable/disable logs
security:
disableRoot: true # Enable/disable pods running as root
resources: # Set resources requests/limits
cpuReq: "100m"
cpuLim: ""
memReq: "64m"
memLim: ""
gpuKey: "nvidia.com/gpu"

kubernetes-resource-manager:
enabled: true
Expand Down Expand Up @@ -386,7 +402,7 @@ dashboard:
image:
repository: ghcr.io/scc-digitalhub/dh-dashboard
pullPolicy: IfNotPresent
tag: "0.1.0"
tag: "0.1.2"
imagePullSecrets: []
nameOverride: ""
fullnameOverride: ""
Expand Down

0 comments on commit 938c706

Please sign in to comment.