unifying the deployment and exporting the config

DiamondLightSource · Jan 20, 2025 · 89602b5 · 89602b5
1 parent 70b7ac2
commit 89602b5
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 56 deletions.
diff --git a/channelfinder-elasticsearch/templates/channelfinder-config.yaml b/channelfinder-elasticsearch/templates/channelfinder-config.yaml
@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: channelfinder-config
+data:
+  cluster.name: "channelfinder"
+  discovery.type: "single-node"
+  bootstrap.memory_lock: "true"
+  xpack.security.enabled: "false"
+  EPICS_PVAS_INTF_ADDR_LIST: "0.0.0.0"
diff --git a/channelfinder-elasticsearch/templates/deployment-channelfinder.yaml b/channelfinder-elasticsearch/templates/deployment-channelfinder.yaml
diff --git a/channelfinder-elasticsearch/templates/deployment-elasticsearch.yaml b/channelfinder-elasticsearch/templates/deployment-elasticsearch.yaml
diff --git a/channelfinder-elasticsearch/templates/deployment.yaml b/channelfinder-elasticsearch/templates/deployment.yaml
@@ -1,18 +1,18 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "channelfinder-elasticsearch.fullname" . }}
+  name: channelfinder-elasticsearch
   labels:
     {{- include "channelfinder-elasticsearch.labels" . | nindent 4 }}
 spec:
-  replicas: {{ .Values.replicas }}
+  replicas: 1
   selector:
     matchLabels:
-      app: {{ include "channelfinder-elasticsearch.fullname" . }}
+      app: channelfinder-elasticsearch
   template:
     metadata:
       labels:
-        app: {{ include "channelfinder-elasticsearch.fullname" . }}
+        app: channelfinder-elasticsearch
     spec:
       containers:
         - name: channelfinderservice
@@ -26,6 +26,8 @@ spec:
             requests:
               cpu: {{ .Values.channelfinderservice.resources.requests.cpu }}
               memory: {{ .Values.channelfinderservice.resources.requests.memory }}
+          environment:
+            - ELASTICSEARCH_NETWORK_HOST: elasticsearch-cf
         - name: elasticsearch
           image: "{{ .Values.elasticsearch.image.repository }}:{{ .Values.elasticsearch.image.tag }}"
           ports:
@@ -37,3 +39,6 @@ spec:
             requests:
               cpu: {{ .Values.elasticsearch.resources.requests.cpu }}
               memory: {{ .Values.elasticsearch.resources.requests.memory }}
+          envFrom:
+            - configMapRef:
+              name: channelfinder-config