Remove nginx reverse proxy from Helm chart (#2816)

* remove nginx reveerse proxy from Helm

* delete obsolete template

* move nginx templates to services/reverse-proxy

chart/env/prod.yaml

@@ -8,7 +8,6 @@ global:
     service:
       ports:
         datasetsServer:
-          proxy: 30931
           admin: 32702
           api: 31370
           rows: 31371
@@ -18,11 +17,6 @@ global:
 images:
   pullPolicy: IfNotPresent
   pullSecrets: []
-  reverseProxy:
-    useGlobalRegistry: false
-    registry: docker.io
-    repository: nginx
-    tag: "1.20"
   jobs:
     mongodbMigration:
       registry: huggingface
@@ -252,21 +246,7 @@ cacheMetricsCollector:
       cpu: 1
       memory: "512Mi"
 
-# --- reverse proxy ---
-
-reverseProxy:
-  nodeSelector:
-    role-datasets-server: "true"
-  replicas: 2
-  resources:
-    requests:
-      cpu: 1
-      memory: "64Mi"
-    limits:
-      cpu: 1
-      memory: "256Mi"
-  service:
-    type: NodePort
+# --- ALB ---
 
 ingress:
   tls:

chart/env/staging.yaml

@@ -13,11 +13,6 @@ global:
 images:
   pullPolicy: IfNotPresent
   pullSecrets: []
-  reverseProxy:
-    useGlobalRegistry: false
-    registry: docker.io
-    repository: nginx
-    tag: "1.25.3"
   jobs:
     mongodbMigration:
       registry: huggingface
@@ -179,19 +174,7 @@ queueMetricsCollector:
       cpu: 1
       memory: "512Mi"
 
-# --- reverse proxy ---
-
-reverseProxy:
-  replicas: 1
-  resources:
-    requests:
-      cpu: 100m
-      memory: "64Mi"
-    limits:
-      cpu: 1
-      memory: "256Mi"
-  service:
-    type: NodePort
+# --- ALB ---
 
 ingress:
   tls:

chart/templates/_common/_helpers.tpl

@@ -26,10 +26,6 @@ Create chart name and version as used by the chart label.
 {{/*
 Docker image management
 */}}
-{{- define "reverseproxy.image" -}}
-{{ include "hf.common.images.image" (dict "imageRoot" .Values.images.reverseProxy "global" .Values.global.huggingface) }}
-{{- end -}}
-
 {{- define "jobs.mongodbMigration.image" -}}
 {{ include "hf.common.images.image" (dict "imageRoot" .Values.images.jobs.mongodbMigration "global" .Values.global.huggingface) }}
 {{- end -}}
@@ -70,11 +66,6 @@ Docker image management
 {{/*
 Common labels
 */}}
-{{- define "labels.reverseProxy" -}}
-{{ include "hf.labels.commons" . }}
-app.kubernetes.io/component: "{{ include "name" . }}-reverse-proxy"
-{{- end -}}
-
 {{- define "labels.mongodbMigration" -}}
 {{ include "hf.labels.commons" . }}
 app.kubernetes.io/component: "{{ include "name" . }}-mongodb-migration"
@@ -135,13 +126,6 @@ app.kubernetes.io/component: "{{ include "name" . }}-sse-api"
 app.kubernetes.io/component: "{{ include "name" . }}-worker-{{ .workerValues.deployName }}"
 {{- end -}}
 
-{{/*
-Return the api ingress anotation
-*/}}
-{{- define "datasetsServer.ingress.annotations" -}}
-{{ .Values.ingress.annotations | toYaml }}
-{{- end -}}
-
 {{/*
 The dataset viewer API base url
 */}}
@@ -183,71 +167,6 @@ The parquet-metadata/ subpath in the EFS
 {{- printf "%s/%s/%s/" .Chart.Name .Release.Name "parquet-metadata" }}
 {{- end }}
 
-{{/*
-The duckdb-index/ subpath in EFS
-- in a subdirectory named as the chart (dataset-viewer/), and below it,
-- in a subdirectory named as the Release, so that Releases will not share the same dir
-*/}}
-{{- define "duckDBIndex.subpath" -}}
-{{- printf "%s/%s/%s/" .Chart.Name .Release.Name "duckdb-index" }}
-{{- end }}
-
-{{/*
-The URL to access the mongodb instance created if mongodb.enable is true
-It's named using the Release name
-*/}}
-{{- define "mongodb.url" -}}
-{{- printf "mongodb://%s-mongodb" .Release.Name }}
-{{- end }}
-
-{{/*
-The URL to access the admin service from another container
-See https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#a-aaaa-records
-*/}}
-{{- define "admin.url" -}}
-{{- printf "http://%s-admin.%s.svc.cluster.local:80" ( include "name" . ) ( .Release.Namespace ) }}
-{{- end }}
-
-{{/*
-The URL to access the API service from another container
-See https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#a-aaaa-records
-*/}}
-{{- define "api.url" -}}
-{{- printf "http://%s-api.%s.svc.cluster.local:80" ( include "name" . ) ( .Release.Namespace ) }}
-{{- end }}
-
-{{/*
-The URL to access the rows service from another container
-See https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#a-aaaa-records
-*/}}
-{{- define "rows.url" -}}
-{{- printf "http://%s-rows.%s.svc.cluster.local:80" ( include "name" . ) ( .Release.Namespace ) }}
-{{- end }}
-
-{{/*
-The URL to access the search service from another container
-See https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#a-aaaa-records
-*/}}
-{{- define "search.url" -}}
-{{- printf "http://%s-search.%s.svc.cluster.local:80" ( include "name" . ) ( .Release.Namespace ) }}
-{{- end }}
-
-{{/*
-The URL to access the SSE API service from another container
-See https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#a-aaaa-records
-*/}}
-{{- define "sseApi.url" -}}
-{{- printf "http://%s-sse-api.%s.svc.cluster.local:80" ( include "name" . ) ( .Release.Namespace ) }}
-{{- end }}
-
-{{/*
-The URL to access the worker service from another container
-See https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#a-aaaa-records
-*/}}
-{{- define "worker.url" -}}
-{{- printf "http://%s-worker.%s.svc.cluster.local:80" ( include "name" . ) ( .Release.Namespace ) }}
-{{- end }}
-
 {{/*
 Return the HUB url
 */}}

chart/templates/services/admin/service.yaml

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # Copyright 2022 The HuggingFace Authors.
 
-{{ $serviceType := .Values.reverseProxy.service.type | default .Values.global.huggingface.service.type }}
+{{ $serviceType := .Values.global.huggingface.service.type }}
 apiVersion: v1
 kind: Service
 metadata:

chart/templates/services/api/service.yaml

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # Copyright 2022 The HuggingFace Authors.
 
-{{ $serviceType := .Values.reverseProxy.service.type | default .Values.global.huggingface.service.type }}
+{{ $serviceType := .Values.global.huggingface.service.type }}
 apiVersion: v1
 kind: Service
 metadata:

chart/templates/services/rows/service.yaml

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # Copyright 2023 The HuggingFace Authors.
 
-{{ $serviceType := .Values.reverseProxy.service.type | default .Values.global.huggingface.service.type }}
+{{ $serviceType := .Values.global.huggingface.service.type }}
 apiVersion: v1
 kind: Service
 metadata:

chart/templates/services/search/service.yaml

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # Copyright 2023 The HuggingFace Authors.
 
-{{ $serviceType := .Values.reverseProxy.service.type | default .Values.global.huggingface.service.type }}
+{{ $serviceType := .Values.global.huggingface.service.type }}
 apiVersion: v1
 kind: Service
 metadata: