From a4071582bbee17259316f73a43f4131efe76ab83 Mon Sep 17 00:00:00 2001 From: webcoderz <19884161+webcoderz@users.noreply.github.com> Date: Sat, 19 Aug 2023 15:41:55 -0400 Subject: [PATCH 1/4] Update .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 380729e6..7dd7e039 100644 --- a/.gitignore +++ b/.gitignore @@ -150,4 +150,4 @@ cluster-config/cluster-config.yaml charts/graphistry-helm/templates/postgres/pg-sts.yaml -chart-bundle \ No newline at end of file +charts-aux-bundled \ No newline at end of file From 230ab44d35c85255a4993dae2bab3e4161e4c69b Mon Sep 17 00:00:00 2001 From: webcoderz <19884161+webcoderz@users.noreply.github.com> Date: Sat, 19 Aug 2023 15:43:26 -0400 Subject: [PATCH 2/4] fixing args --- charts/graphistry-helm/templates/dask/dask-cluster.yml | 7 ++++--- .../templates/dask/dask-cuda-worker-daemonset.yaml | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/charts/graphistry-helm/templates/dask/dask-cluster.yml b/charts/graphistry-helm/templates/dask/dask-cluster.yml index a14c02c3..7dffdf9f 100644 --- a/charts/graphistry-helm/templates/dask/dask-cluster.yml +++ b/charts/graphistry-helm/templates/dask/dask-cluster.yml @@ -29,12 +29,13 @@ spec: image: {{.Values.global.containerregistry.name}}/{{.Values.graphistry}}:{{.Values.daskcudaworker.repository}}-{{.Values.global.tag}}-{{.Values.cuda.version}} imagePullPolicy: {{.Values.global.imagePullPolicy }} args: - - dask-cuda-worker + - dask cuda worker - --interface - eth0 - --dashboard-address localhost:8787 - #- --resources GPU=10 - #- dask-scheduler:8786 + - --resources GPU=10,PROCESS=2 + - --nthreads 2 + - {{.Values.daskscheduler.location | quote }} command: - /entrypoints/rapids-entrypoint.sh env: diff --git a/charts/graphistry-helm/templates/dask/dask-cuda-worker-daemonset.yaml b/charts/graphistry-helm/templates/dask/dask-cuda-worker-daemonset.yaml index 8d3cd457..dae03407 100644 --- a/charts/graphistry-helm/templates/dask/dask-cuda-worker-daemonset.yaml +++ b/charts/graphistry-helm/templates/dask/dask-cuda-worker-daemonset.yaml @@ -41,12 +41,13 @@ spec: - "nexus" containers: - args: - - dask-cuda-worker + - dask cuda worker - --interface - eth0 - --dashboard-address localhost:8787 - #- --resources GPU=10 - - dask-scheduler:8786 + - --resources GPU=10,PROCESS=2 + - --nthreads 2 + - {{.Values.daskscheduler.location | quote }} command: - /entrypoints/rapids-entrypoint.sh env: From b7d11a6207c45ea6cdc4230ef238f7eb0ab9556b Mon Sep 17 00:00:00 2001 From: webcoderz <19884161+webcoderz@users.noreply.github.com> Date: Sat, 19 Aug 2023 15:49:07 -0400 Subject: [PATCH 3/4] updating eks-dev values to latest version --- charts/values-overrides/internal/eks-dev-values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/values-overrides/internal/eks-dev-values.yaml b/charts/values-overrides/internal/eks-dev-values.yaml index d1257db4..0ee092ab 100644 --- a/charts/values-overrides/internal/eks-dev-values.yaml +++ b/charts/values-overrides/internal/eks-dev-values.yaml @@ -30,7 +30,7 @@ k8sDashboard: global: provisioner: ebs.csi.aws.com - tag: v2.40.3 + tag: v2.40.27 nodeSelector: {"accelerator": "nvidia"} #change log levels #logs: From fe33391580acffeea4f5774013be54a357dc44ee Mon Sep 17 00:00:00 2001 From: webcoderz <19884161+webcoderz@users.noreply.github.com> Date: Sat, 19 Aug 2023 15:59:12 -0400 Subject: [PATCH 4/4] added few more changes that didnt make it into release PR last time but are important --- charts/graphistry-helm/templates/dask/dask-cluster.yml | 2 ++ .../templates/dask/dask-cuda-worker-daemonset.yaml | 2 ++ .../templates/forge-etl/forge-etl-python-daemonset.yaml | 2 +- charts/graphistry-helm/templates/nginx/nginx-deployment.yaml | 2 +- charts/graphistry-helm/values.yaml | 2 +- charts/postgres-cluster/templates/postgres-cluster.yaml | 4 ++-- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/charts/graphistry-helm/templates/dask/dask-cluster.yml b/charts/graphistry-helm/templates/dask/dask-cluster.yml index 7dffdf9f..4eb7af49 100644 --- a/charts/graphistry-helm/templates/dask/dask-cluster.yml +++ b/charts/graphistry-helm/templates/dask/dask-cluster.yml @@ -41,6 +41,8 @@ spec: env: - name: GRAPHISTRY_CPU_MODE value: {{.Values.graphistryCPUMode | quote }} + - name: SKIP_SERVER + value: "1" {{- range .Values.env }} - name: {{ .name }} value: {{ .value | quote }} diff --git a/charts/graphistry-helm/templates/dask/dask-cuda-worker-daemonset.yaml b/charts/graphistry-helm/templates/dask/dask-cuda-worker-daemonset.yaml index dae03407..b919aa6b 100644 --- a/charts/graphistry-helm/templates/dask/dask-cuda-worker-daemonset.yaml +++ b/charts/graphistry-helm/templates/dask/dask-cuda-worker-daemonset.yaml @@ -53,6 +53,8 @@ spec: env: - name: GRAPHISTRY_CPU_MODE value: {{.Values.graphistryCPUMode | quote }} + - name: SKIP_SERVER + value: "1" {{- range .Values.env }} - name: {{ .name }} value: {{ .value | quote }} diff --git a/charts/graphistry-helm/templates/forge-etl/forge-etl-python-daemonset.yaml b/charts/graphistry-helm/templates/forge-etl/forge-etl-python-daemonset.yaml index b8f60e0c..73978127 100644 --- a/charts/graphistry-helm/templates/forge-etl/forge-etl-python-daemonset.yaml +++ b/charts/graphistry-helm/templates/forge-etl/forge-etl-python-daemonset.yaml @@ -97,7 +97,7 @@ spec: command: - sh - -c - - "curl -f http://localhost:8080/cudfhealth && curl -f http://localhost:8080/blazinghealth" + - "curl -f http://localhost:8080/cudfhealth && curl -f http://localhost:8080/dasksqlhealth" failureThreshold: 3 initialDelaySeconds: 180 periodSeconds: 120 diff --git a/charts/graphistry-helm/templates/nginx/nginx-deployment.yaml b/charts/graphistry-helm/templates/nginx/nginx-deployment.yaml index f68e7fb1..d01d3848 100644 --- a/charts/graphistry-helm/templates/nginx/nginx-deployment.yaml +++ b/charts/graphistry-helm/templates/nginx/nginx-deployment.yaml @@ -207,7 +207,7 @@ spec: - name: PROMETHEUS_PORT value: "4040" {{- if eq .Values.global.containerregistry.name "docker.io/graphistry" }} - image: quay.io/martinhelmich/prometheus-nginxlog-exporter:v1.9.2 #DockerHub + image: ghcr.io/martin-helmich/prometheus-nginxlog-exporter/exporter:v1.9.2 #DockerHub {{ else }} image: {{.Values.global.containerregistry.name}}/prometheus-nginxlog-exporter:v1.9.2 {{- end }} diff --git a/charts/graphistry-helm/values.yaml b/charts/graphistry-helm/values.yaml index 0598bb6c..f5ad9a23 100644 --- a/charts/graphistry-helm/values.yaml +++ b/charts/graphistry-helm/values.yaml @@ -406,7 +406,7 @@ dask: #dask-scheduler repository name daskscheduler: repository: etl-server-python #dask-scheduler repository name - location: "dask-scheduler:8786" #dask-scheduler location + location: dask-scheduler:8786 #dask-scheduler location vgpu: false #enables vgpu mode for bigger than memory workloads on VGPU diff --git a/charts/postgres-cluster/templates/postgres-cluster.yaml b/charts/postgres-cluster/templates/postgres-cluster.yaml index f0de4ad2..8deb21be 100644 --- a/charts/postgres-cluster/templates/postgres-cluster.yaml +++ b/charts/postgres-cluster/templates/postgres-cluster.yaml @@ -48,11 +48,11 @@ spec: {{- if eq .Values.global.multiNode true }} accessModes: - "ReadWriteMany" - storageClassName: postgres-longhorn-{{ .Release.Namespace }} + storageClassName: postgres-longhorn {{- else }} accessModes: - "ReadWriteOnce" - storageClassName: retain-sc-{{ .Release.Namespace }} + storageClassName: retain-sc {{- end }} resources: requests: