ajout du discovery

charts/jupyter/templates/_helpers.tpl

@@ -113,7 +113,7 @@ nginx.ingress.kubernetes.io/whitelist-source-range: {{ .Values.security.whitelis
 {{- end }}
 
 
-{{- define "hiveMestastore.configmap" -}}
+{{- define "hiveMetastore.configmap" -}}
 {{ printf "<?xml version=\"1.0\"?>" }}
 {{ printf "<?xml-stylesheet type=\"text/xsl\" href=\"configuration.xsl\"?>" }} 
 {{ printf "<configuration>"}}
@@ -124,10 +124,22 @@ nginx.ingress.kubernetes.io/whitelist-source-range: {{ .Values.security.whitelis
 {{- end }}
 {{ printf "<property>"}}
 {{ printf "<name>metastore.thrift.uris</name>"  | indent 4}}
-{{ printf "<value>thrift://\"%s\":9083</value>" $service.metadata.name | indent 4}}
+{{ printf "<value>thrift://%s:9083</value>" $service.metadata.name | indent 4}}
 {{ printf "</property>"}}
 {{- $virgule = 1}}
+{{- end }}
+{{- end }}
 {{ printf "</configuration>"}}
 {{- end }}
+
+{{/*
+Create the name of the config map hive to use
+*/}}
+{{- define "jupyter.configMapNameHive" -}}
+{{- if .Values.discovery.hive }}
+{{- $name:= (printf "%s-configmaphive" (include "jupyter.fullname" .) )  }}
+{{- default $name .Values.hive.configMapName }}
+{{- else }}
+{{- default "default" .Values.hive.configMapName }}
 {{- end }}
 {{- end }}

charts/jupyter/templates/configmap-hive.yaml

@@ -1,8 +1,8 @@
-{{- if contains "thrift" (include "hiveMetastore.configmap" .)  }}
+{{- if .Values.discovery.hive -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{- printf "%s-configmaphive" (include "jupyter.fullname" .) }}
+  name: {{ include "jupyter.configMapNameHive" . }}
   labels:
     {{- include "jupyter.labels" . | nindent 4 }}
 data:

charts/jupyter/values.yaml

@@ -67,6 +67,10 @@ git:
   name: ""
   email: ""
   cache: ""
+#active ou non la recherche d'un hiveMetastore dans le namespace
+# see configmap-hive.yaml et helpers template
+discovery:
+  hive: true
 
 hive:
   configMapName: ""