[wip] split cores

dCache · Oct 16, 2023 · 2eba157 · 2eba157
1 parent 281eff5
commit 2eba157
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 11 deletions.
diff --git a/templates/configmap.yaml b/templates/configmap.yaml
@@ -3,25 +3,38 @@ kind: ConfigMap
 metadata:
   name: {{ .Release.Name }}-configmap
 data:
-  dcache-k8s-door: |-
+
+{{- range $core_index, $core := until ($.Values.dcache.numberOfCores | int) }}
+  dcache-core-{{ $core }}: |-
     dcache.broker.scheme = core
+    dcache.java.options.extra=-Dorg.dcache.net.localaddresses={{ $.Release.Name }}-core-{{ $core }}.{{ $.Release.Namespace }}.svc.cluster.local
 
     chimerashell.db.host = ${chimera.db.host}
     chimerashell.db.user = ${chimera.db.user}
     chimerashell.db.password = ${chimera.db.password}
     chimerashell.db.name = ${chimera.db.name}
 
-    dcache.java.options.extra=-Dorg.dcache.net.localaddresses={{ $.Release.Name }}-door-svc.{{ $.Release.Namespace }}.svc.cluster.local
-
-    [{{ $.Release.Name }}-door-svc]
-    [{{ $.Release.Name }}-door-svc/poolmanager]
+    [{{ $.Release.Name }}-core-{{ $core }}]
+    [{{ $.Release.Name }}-core-{{ $core }}/poolmanager]
 
-    [{{ $.Release.Name }}-door-svc/pnfsmanager]
+    [{{ $.Release.Name }}-core-{{ $core }}/pnfsmanager]
     chimera.db.url=jdbc:postgresql://${chimera.db.host}/${chimera.db.name}?ApplicationName=${pnfsmanager.cell.name}
 
-    [{{ $.Release.Name }}-door-svc/cleaner-disk]
+    [{{ $.Release.Name }}-core-{{ $core }}/cleaner-disk]
     chimera.db.url=jdbc:postgresql://${chimera.db.host}/${chimera.db.name}?ApplicationName=${cleaner-disk.cell.name}
 
+{{- end }}
+
+  dcache-k8s-door: |-
+
+    chimerashell.db.host = ${chimera.db.host}
+    chimerashell.db.user = ${chimera.db.user}
+    chimerashell.db.password = ${chimera.db.password}
+    chimerashell.db.name = ${chimera.db.name}
+
+    dcache.java.options.extra=-Dorg.dcache.net.localaddresses={{ $.Release.Name }}-door-svc.{{ $.Release.Namespace }}.svc.cluster.local
+
+    [{{ $.Release.Name }}-door-svc]
     [{{ $.Release.Name }}-door-svc/nfs]
     chimera.db.url=jdbc:postgresql://${chimera.db.host}/${chimera.db.name}?ApplicationName=${cleaner-disk.cell.name}
     nfs.version=4.1

diff --git a/templates/door-svc.yaml b/templates/door-svc.yaml
@@ -35,9 +35,6 @@ spec:
     - name: srm-door
       port: {{ $.Values.door.ports.srm }}
       targetPort: 8443
-    - name: cell-tunnel
-      port: {{ $.Values.cell.tunnel }}
-      targetPort: 11111
     {{ $range_start := ( $.Values.mover.wan_range_min | int) }}
     {{ $range_stop := ( $.Values.mover.wan_range_max | int) }}
     {{- range $port_index, $port := untilStep $range_start $range_stop 1 }}

diff --git a/templates/pool.yaml b/templates/pool.yaml
@@ -49,7 +49,7 @@ spec:
               name: certs-store-{{ . }}
         - name: wait-for-core
           image: busybox:1.28
-          command: ['sh', '-c', "until nc -z -v  {{ $.Release.Name }}-door-svc.{{ $.Release.Namespace }}.svc.cluster.local {{ $.Values.cell.tunnel }}; do echo waiting for core to start; sleep 2; done"]
+          command: ['sh', '-c', "until nc -z -v  {{ $.Release.Name }}-core-0.{{ $.Release.Namespace }}.svc.cluster.local {{ $.Values.cell.tunnel }}; do echo waiting for core to start; sleep 2; done"]
       volumes:
       - name: certs-store-{{ . }}
         persistentVolumeClaim:

diff --git a/values.yaml b/values.yaml
@@ -10,6 +10,7 @@ image:
 
 
 dcache:
+  numberOfCores: 2
   pools:
     - a
     - b