fix: 🐛 name the objects with the chart + release

this way, two instances of datasets-server can run on the same
namespace, with different domain names. Fixes
#227 (comment)

Author: severo

.vscode/monorepo.code-workspace

@@ -31,11 +31,9 @@
       "services": true
     },
     "python.formatting.provider": "black",
-    "editor.formatOnPaste": false,
-    "editor.formatOnSave": true,
     "python.linting.enabled": true,
     "python.linting.mypyEnabled": true,
-    "python.linting.flake8Enabled": true
+    "python.linting.flake8Enabled": true,
   },
   "extensions": {
     "recommendations": [

infra/charts/datasets-server/Makefile

@@ -1,4 +1,3 @@
-RELEASE_NAME := datasets-server
 K8S_NAMESPACE := hub
 
 .PHONY: init
@@ -7,15 +6,15 @@ init:
 
 .PHONY: uninstall
 uninstall:
-	helm uninstall $(RELEASE_NAME) -n $(K8S_NAMESPACE)
+	helm uninstall $(ENV) -n $(K8S_NAMESPACE)
 
 .PHONY: diff
 diff:
-	helm diff upgrade --install $(RELEASE_NAME) . --values env/$(ENV).yaml -n $(K8S_NAMESPACE)
+	helm diff upgrade --install $(ENV) . --values env/$(ENV).yaml -n $(K8S_NAMESPACE)
 
 .PHONY: upgrade
 upgrade:
-	helm upgrade --install $(RELEASE_NAME) . --values env/$(ENV).yaml -n $(K8S_NAMESPACE)
+	helm upgrade --install $(ENV) . --values env/$(ENV).yaml -n $(K8S_NAMESPACE)
 
 .PHONY: diff-dev
 diff-dev:

infra/charts/datasets-server/env/dev.yaml

@@ -6,6 +6,8 @@ storage:
     path: "/fsx"
     server: "svm-0a8e8f8730e2ad14b.fs-0a24e04dfda29bd3f.fsx.us-east-1.amazonaws.com"
 
+domain: "datasets-server.us.dev.moon.huggingface.tech"
+
 api:
   replicas: 1
 

infra/charts/datasets-server/templates/_apiPod.tpl

@@ -1,7 +1,7 @@
 {{- define "apiPodSpec" -}}
 spec:
   containers:
-  - name: hub-datasets-server-api
+  - name: "{{ include "instanceName" .}}-api-worker"
     env:
     - name: APP_HOSTNAME
       value: {{ .Values.api.appHostname | quote }}

infra/charts/datasets-server/templates/_datasetsWorkerPod.tpl

@@ -1,7 +1,7 @@
 {{- define "datasetsWorkerPodSpec" -}}
 spec:
   containers:
-  - name: hub-datasets-server-worker
+  - name: "{{ include "instanceName" .}}-datasets-worker"
     env:
     # - name: ASSETS_DIRECTORY
     #   value: {{ .Values.storage.assetsDirectory | quote }}

infra/charts/datasets-server/templates/_helpers.tpl

@@ -12,6 +12,14 @@ Create chart name and version as used by the chart label.
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
+{{/*
+Name of the instance (chart + release).
+*/}}
+{{- define "instanceName" -}}
+{{- printf "%s-%s" .Chart.Name .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+
 {{/*
 Selector labels
 */}}
@@ -35,18 +43,17 @@ heritage: {{ $.Release.Service | quote }}
 chart: "{{ include "name" . }}"
 {{- end }}
 
-
 {{- define "labels.api" -}}
 {{ include "labels" . }}
-app: "{{ include "name" . }}-api"
+app: "{{ include "instanceName" . }}-api"
 {{- end -}}
 
 {{- define "labels.datasetsWorker" -}}
 {{ include "labels" . }}
-app: "{{ include "name" . }}-datasets-worker"
+app: "{{ include "instanceName" . }}-datasets-worker"
 {{- end -}}
 
 {{- define "labels.splitsWorker" -}}
 {{ include "labels" . }}
-app: "{{ include "name" . }}-splits-worker"
+app: "{{ include "instanceName" . }}-splits-worker"
 {{- end -}}

infra/charts/datasets-server/templates/_splitsWorkerPod.tpl

@@ -1,7 +1,7 @@
 {{- define "splitsWorkerPodSpec" -}}
 spec:
   containers:
-  - name: hub-datasets-server-worker
+  - name: "{{ include "instanceName" .}}-splits-worker"
     env:
     # - name: ASSETS_DIRECTORY
     #   value: {{ .Values.storage.assetsDirectory | quote }}

infra/charts/datasets-server/templates/deployment-api.yaml

@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   labels:
     {{ include "labels.api" . | nindent 4 }}
-  name: {{ include "name" . }}-api
+  name: "{{ include "instanceName" . }}-api"
   namespace: {{ .Release.Namespace }}
 spec:
   progressDeadlineSeconds: 600

infra/charts/datasets-server/templates/deployment-datasets-worker.yaml

@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   labels:
     {{ include "labels.datasetsWorker" . | nindent 4 }}
-  name: {{ include "name" . }}-datasets-worker
+  name: "{{ include "instanceName" . }}-datasets-worker"
   namespace: {{ .Release.Namespace }}
 spec:
   progressDeadlineSeconds: 600

infra/charts/datasets-server/templates/deployment-splits-worker.yaml

@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   labels:
     {{ include "labels.splitsWorker" . | nindent 4 }}
-  name: {{ include "name" . }}-splits-worker
+  name: "{{ include "instanceName" . }}-splits-worker"
   namespace: {{ .Release.Namespace }}
 spec:
   progressDeadlineSeconds: 600