chart updates to be joint actually this is the right folder not the h…

…elm one@
DiamondLightSource · Jan 17, 2025 · 70b7ac2 · 70b7ac2
1 parent 1ac2cf7
commit 70b7ac2
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 66 deletions.
diff --git a/channelfinder-elasticsearch/templates/deployment.yaml b/channelfinder-elasticsearch/templates/deployment.yaml
@@ -5,64 +5,35 @@ metadata:
   labels:
     {{- include "channelfinder-elasticsearch.labels" . | nindent 4 }}
 spec:
-  {{- if not .Values.autoscaling.enabled }}
-  replicas: {{ .Values.replicaCount }}
-  {{- end }}
+  replicas: {{ .Values.replicas }}
   selector:
     matchLabels:
-      {{- include "channelfinder-elasticsearch.selectorLabels" . | nindent 6 }}
+      app: {{ include "channelfinder-elasticsearch.fullname" . }}
   template:
     metadata:
-      {{- with .Values.podAnnotations }}
-      annotations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
       labels:
-        {{- include "channelfinder-elasticsearch.labels" . | nindent 8 }}
-        {{- with .Values.podLabels }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
+        app: {{ include "channelfinder-elasticsearch.fullname" . }}
     spec:
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      serviceAccountName: {{ include "channelfinder-elasticsearch.serviceAccountName" . }}
-      securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
       containers:
-        - name: {{ .Chart.Name }}
-          securityContext:
-            {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+        - name: channelfinderservice
+          image: "{{ .Values.channelfinderservice.image.repository }}:{{ .Values.channelfinderservice.image.tag }}"
           ports:
-            - name: http
-              containerPort: {{ .Values.service.port }}
-              protocol: TCP
-          livenessProbe:
-            {{- toYaml .Values.livenessProbe | nindent 12 }}
-          readinessProbe:
-            {{- toYaml .Values.readinessProbe | nindent 12 }}
+            - containerPort: 8080
           resources:
-            {{- toYaml .Values.resources | nindent 12 }}
-          {{- with .Values.volumeMounts }}
-          volumeMounts:
-            {{- toYaml . | nindent 12 }}
-          {{- end }}
-      {{- with .Values.volumes }}
-      volumes:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
+            limits:
+              cpu: {{ .Values.channelfinderservice.resources.limits.cpu }}
+              memory: {{ .Values.channelfinderservice.resources.limits.memory }}
+            requests:
+              cpu: {{ .Values.channelfinderservice.resources.requests.cpu }}
+              memory: {{ .Values.channelfinderservice.resources.requests.memory }}
+        - name: elasticsearch
+          image: "{{ .Values.elasticsearch.image.repository }}:{{ .Values.elasticsearch.image.tag }}"
+          ports:
+            - containerPort: 9200
+          resources:
+            limits:
+              cpu: {{ .Values.elasticsearch.resources.limits.cpu }}
+              memory: {{ .Values.elasticsearch.resources.limits.memory }}
+            requests:
+              cpu: {{ .Values.elasticsearch.resources.requests.cpu }}
+              memory: {{ .Values.elasticsearch.resources.requests.memory }}
diff --git a/channelfinder-elasticsearch/templates/service-channelfinder.yaml b/channelfinder-elasticsearch/templates/service-channelfinder.yaml
@@ -1,13 +1,15 @@
-# templates/service-channelfinder.yaml
-
 apiVersion: v1
 kind: Service
 metadata:
-  name: channelfinderservice
+  name: {{ include "channelfinder-elasticsearch.fullname" . }}-channelfinderservice
+  labels:
+    {{- include "channelfinder-elasticsearch.labels" . | nindent 4 }}
 spec:
+  type: {{ .Values.channelfinderservice.service.type }}
+  ports:
+    - port: {{ .Values.channelfinderservice.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
   selector:
     app: channelfinderservice
-  ports:
-    - protocol: TCP
-      port: 80
-      targetPort: 8080
diff --git a/channelfinder-elasticsearch/templates/service-elasticsearch.yaml b/channelfinder-elasticsearch/templates/service-elasticsearch.yaml
@@ -1,13 +1,15 @@
-# templates/service-elasticsearch.yaml
-
 apiVersion: v1
 kind: Service
 metadata:
-  name: elasticsearch
+  name: {{ include "channelfinder-elasticsearch.fullname" . }}-elasticsearch
+  labels:
+    {{- include "channelfinder-elasticsearch.labels" . | nindent 4 }}
 spec:
-  selector:
-    app: elasticsearch
+  type: {{ .Values.elasticsearch.service.type }}
   ports:
-    - protocol: TCP
-      port: 9200
+    - port: {{ .Values.elasticsearch.service.port }}
       targetPort: 9200
+      protocol: TCP
+      name: http
+  selector:
+    app: elasticsearch
diff --git a/channelfinder-elasticsearch/values.yaml b/channelfinder-elasticsearch/values.yaml
@@ -109,12 +109,16 @@ nodeSelector: {}
 tolerations: []
 
 affinity: {}
+# values.yaml
 
 channelfinderservice:
   image:
     repository: ghcr.io/channelfinder/channelfinderservice
     tag: master
   replicas: 1
+  service:
+    type: ClusterIP
+    port: 80
   resources:
     limits:
       cpu: "500m"
@@ -128,6 +132,9 @@ elasticsearch:
     repository: docker.elastic.co/elasticsearch/elasticsearch-wolfi
     tag: 8.17.0
   replicas: 1
+  service:
+    type: ClusterIP
+    port: 9200
   resources:
     limits:
       cpu: "1"