Ajout template CM + modif values.yaml

charts/jupyter-pyspark-gpu/templates/configmap-proxy-repository.yaml

+{{ include "library-chart.configMapProxyRepository" . }}
\ No newline at end of file

charts/jupyter-pyspark-gpu/values.yaml

@@ -88,6 +88,12 @@ git:
   token: ""
   repository: ""
   branch: ""
+
+proxyRepository:
+  enabled: false
+  configMapName: ""
+  pipRepository: ""
+  condaRepository: ""
   
 #active ou non la recherche d'un hiveMetastore dans le namespace
 # see configmap-hive.yaml et helpers template

charts/jupyter-pyspark/templates/configmap-proxy-repository.yaml

+{{ include "library-chart.configMapProxyRepository" . }}
\ No newline at end of file

charts/jupyter-pyspark/values.yaml

@@ -88,6 +88,12 @@ git:
   token: ""
   repository: ""
   branch: ""
+
+proxyRepository:
+  enabled: false
+  configMapName: ""
+  pipRepository: ""
+  condaRepository: ""
   
 #active ou non la recherche d'un hiveMetastore dans le namespace
 # see configmap-hive.yaml et helpers template

charts/jupyter-python-gpu/templates/configmap-proxy-repository.yaml

+{{ include "library-chart.configMapProxyRepository" . }}
\ No newline at end of file

charts/jupyter-python-gpu/values.yaml

@@ -64,6 +64,12 @@ git:
   token: ""
   repository: ""
   branch: ""
+
+proxyRepository:
+  enabled: false
+  configMapName: ""
+  pipRepository: ""
+  condaRepository: ""
   
 #active ou non la recherche d'un hiveMetastore dans le namespace
 # see configmap-hive.yaml et helpers template

charts/jupyter-python/values.yaml

@@ -17,15 +17,6 @@ security:
     enabled: true
     ip: "0.0.0.0/0"
 
-proxyRepository:
-  enabled: true
-  configMapName: ""
-  # TODO : vérifier si on peut utiliser une seule URL pour global.index et global.index-url
-  pipRepository: "https://nexus.insee.fr/repository/pypi-public/simple"
-  condaRepository: "https://nexus.insee.fr/repository/conda-proxy/main"
-  # TODO : vérifier valeur pour proxy R, peut-être limité à nexus.insee.fr/
-  rRepository: "https://nexus.insee.fr/repository/r_public/main"
-
 init:
   standardInitPath: "/opt/onyxia-init.sh"
   regionInit: ""
@@ -73,6 +64,12 @@ git:
   token: ""
   repository: ""
   branch: ""
+
+proxyRepository:
+  enabled: false
+  configMapName: ""
+  pipRepository: ""
+  condaRepository: ""
   
 #active ou non la recherche d'un hiveMetastore dans le namespace
 # see configmap-hive.yaml et helpers template

charts/jupyter-pytorch-gpu/templates/configmap-proxy-repository.yaml

+{{ include "library-chart.configMapProxyRepository" . }}
\ No newline at end of file

charts/jupyter-pytorch-gpu/values.yaml

@@ -64,6 +64,12 @@ git:
   token: ""
   repository: ""
   branch: ""
+
+proxyRepository:
+  enabled: false
+  configMapName: ""
+  pipRepository: ""
+  condaRepository: ""
   
 #active ou non la recherche d'un hiveMetastore dans le namespace
 # see configmap-hive.yaml et helpers template

charts/jupyter-pytorch/templates/configmap-proxy-repository.yaml

+{{ include "library-chart.configMapProxyRepository" . }}
\ No newline at end of file

charts/jupyter-pytorch/values.yaml

@@ -64,6 +64,12 @@ git:
   token: ""
   repository: ""
   branch: ""
+
+proxyRepository:
+  enabled: false
+  configMapName: ""
+  pipRepository: ""
+  condaRepository: ""
   
 #active ou non la recherche d'un hiveMetastore dans le namespace
 # see configmap-hive.yaml et helpers template

charts/jupyter-r/templates/configmap-proxy-repository.yaml

+{{ include "library-chart.configMapProxyRepository" . }}
\ No newline at end of file

charts/jupyter-r/values.yaml

@@ -64,6 +64,11 @@ git:
   token: ""
   repository: ""
   branch: ""
+
+proxyRepository:
+  enabled: false
+  configMapName: ""
+  rRepository: ""
   
   # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.

charts/jupyter-tensorflow-gpu/templates/configmap-proxy-repository.yaml

+{{ include "library-chart.configMapProxyRepository" . }}
\ No newline at end of file

charts/jupyter-tensorflow-gpu/values.yaml

@@ -64,6 +64,12 @@ git:
   token: ""
   repository: ""
   branch: ""
+
+proxyRepository:
+  enabled: false
+  configMapName: ""
+  pipRepository: ""
+  condaRepository: ""
   
 #active ou non la recherche d'un hiveMetastore dans le namespace
 # see configmap-hive.yaml et helpers template

charts/jupyter-tensorflow/templates/configmap-proxy-repository.yaml

+{{ include "library-chart.configMapProxyRepository" . }}
\ No newline at end of file

charts/jupyter-tensorflow/values.yaml

@@ -64,6 +64,12 @@ git:
   token: ""
   repository: ""
   branch: ""
+
+proxyRepository:
+  enabled: false
+  configMapName: ""
+  pipRepository: ""
+  condaRepository: ""
   
 #active ou non la recherche d'un hiveMetastore dans le namespace
 # see configmap-hive.yaml et helpers template

charts/library-chart/templates/_configmap.tpl

@@ -292,8 +292,14 @@ metadata:
     {{- include "library-chart.labels" . | nindent 4 }}
 data:
   # TODO : si valeur manquante, ne pas définir les varenv
+  {{- if .Values.proxyRepository.pipRepository }}
   PIP_REPOSITORY: "{{ .Values.proxyRepository.pipRepository }}"
+  {{- end }}
+  {{- if .Values.proxyRepository.condaRepository }}
   CONDA_REPOSITORY: "{{ .Values.proxyRepository.condaRepository }}"
+  {{- end }}
+  {{- if .Values.proxyRepository.rRepository }}
   R_REPOSITORY: "{{ .Values.proxyRepository.rRepository }}"
+  {{- end }}
 {{- end }}
 {{- end }}
\ No newline at end of file

charts/vscode-python-gpu/templates/configmap-proxy-repository.yaml

+{{ include "library-chart.configMapProxyRepository" . }}
\ No newline at end of file

charts/vscode-python-gpu/values.yaml

@@ -59,6 +59,12 @@ git:
   cache: ""
   branch: ""
 
+proxyRepository:
+  enabled: false
+  configMapName: ""
+  pipRepository: ""
+  condaRepository: ""
+
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 replicaCount: 1