conditionally use dCache embedded zookeeper

Author: kofemann

templates/configmap.yaml

@@ -199,7 +199,11 @@ data:
     chimerashell.db.password = ${chimera.db.password}
     chimerashell.db.name = ${chimera.db.name}
 
+{{- if .Values.zookeeper.embedded }}
+    dcache.zookeeper.connection={{ $.Release.Name }}-door-svc.{{ $.Release.Namespace }}.svc.cluster.local:2181
+{{- else }}
     dcache.zookeeper.connection={{ $.Values.zookeeper.servers }}
+{{- end}}
 
 {{- if .Values.kafka.enabled}}
     dcache.kafka.bootstrap-servers={{ $.Values.kafka.bootstrap_servers }}

templates/door-svc.yaml

@@ -83,6 +83,13 @@ spec:
       targetPort: 3881
     {{- end }}
 
+    {{ if .Values.zookeeper.embedded }}
+    - name: zookeeper
+      port: 2181
+      targetPort: 2181
+    {{- end }}
+
+
     - name: cell-tunnel
       port: {{ $.Values.cell.tunnel }}
       targetPort: 11111

values.yaml

@@ -57,6 +57,9 @@ cell:
 # Zookeeper to use
 #
 zookeeper:
+  # whether to use dCache-embedded zookeeper
+  embedded: false
+  # connection string to external zookeeper servers
   servers: cells-zookeeper:2181
 
 kafka: