Add single NodePort svc

memgraph · Nov 25, 2024 · d8dbf54 · d8dbf54
1 parent 1936f67
commit d8dbf54
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 70 deletions.
diff --git a/charts/memgraph-high-availability/templates/coordinators.yaml b/charts/memgraph-high-availability/templates/coordinators.yaml
@@ -13,6 +13,7 @@ spec:
     metadata:
       labels:
         app: memgraph-coordinator-{{ $coordinator.id }}
+        instance-type: coordinator
     spec:
     {{ if $.Values.memgraph.affinity.enabled }}
       affinity:
@@ -57,9 +58,9 @@ spec:
         image: "{{ $.Values.memgraph.image.repository }}:{{ $.Values.memgraph.image.tag }}"
         imagePullPolicy: {{ $.Values.memgraph.image.pullPolicy }}
         ports:
-        - containerPort: {{ $coordinator.boltPort }}
-        - containerPort: {{ $coordinator.managementPort }}
-        - containerPort: {{ $coordinator.coordinatorPort }}
+        - containerPort: {{ $.Values.memgraph.ports.boltPort }}
+        - containerPort: {{ $.Values.memgraph.ports.managementPort }}
+        - containerPort: {{ $.Values.memgraph.ports.coordinatorPort }}
         args:
         {{- range $arg := $coordinator.args }}
         - "{{ $arg }}"

diff --git a/charts/memgraph-high-availability/templates/data.yaml b/charts/memgraph-high-availability/templates/data.yaml
@@ -13,6 +13,7 @@ spec:
     metadata:
       labels:
         app: memgraph-data-{{ $data.id }}
+        instance-type: data
     spec:
     {{ if $.Values.memgraph.affinity.enabled }}
       affinity:
@@ -57,9 +58,9 @@ spec:
         image: "{{ $.Values.memgraph.image.repository }}:{{ $.Values.memgraph.image.tag }}"
         imagePullPolicy: {{ $.Values.memgraph.image.pullPolicy }}
         ports:
-        - containerPort: {{ $data.boltPort }}
-        - containerPort: {{ $data.managementPort }}
-        - containerPort: {{ $data.replicationPort }}
+        - containerPort: {{ $.Values.memgraph.ports.boltPort }}
+        - containerPort: {{ $.Values.memgraph.ports.managementPort }}
+        - containerPort: {{ $.Values.memgraph.ports.replicationPort }}
         args:
         {{- range $arg := $data.args }}
         - "{{ $arg }}"

diff --git a/charts/memgraph-high-availability/templates/external-access.yaml b/charts/memgraph-high-availability/templates/external-access.yaml
@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: external-access
+spec:
+  type: NodePort
+  selector:
+    instance-type: coordinator
+  ports:
+    - protocol: TCP
+      name: bolt
+      port: {{ $.Values.memgraph.ports.boltPort }}
+      targetPort: {{ $.Values.memgraph.ports.boltPort }}
diff --git a/charts/memgraph-high-availability/templates/services-coordinators.yaml b/charts/memgraph-high-availability/templates/services-coordinators.yaml
@@ -12,32 +12,14 @@ spec:
   ports:
     - protocol: TCP
       name: bolt
-      port: {{ .boltPort }}
-      targetPort: {{ .boltPort }}
+      port: {{ $.Values.memgraph.ports.boltPort }}
+      targetPort: {{ $.Values.memgraph.ports.boltPort }}
     - protocol: TCP
       name: coordinator
-      port: {{ .coordinatorPort }}
-      targetPort: {{ .coordinatorPort }}
+      port: {{ $.Values.memgraph.ports.coordinatorPort }}
+      targetPort: {{ $.Values.memgraph.ports.coordinatorPort }}
     - protocol: TCP
       name: management
-      port: {{ .managementPort }}
-      targetPort: {{ .managementPort }}
-{{- end }}
-
-# Service for coordinators instances external
-{{- range .Values.coordinators }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: memgraph-coordinator-{{ .id }}-external
-spec:
-  type: NodePort
-  selector:
-    app: memgraph-coordinator-{{ .id }}
-  ports:
-    - protocol: TCP
-      name: bolt
-      port: {{ .boltPort }}
-      targetPort: {{ .boltPort }}
+      port: {{ $.Values.memgraph.ports.managementPort }}
+      targetPort: {{ $.Values.memgraph.ports.managementPort }}
 {{- end }}
diff --git a/charts/memgraph-high-availability/templates/services-data.yaml b/charts/memgraph-high-availability/templates/services-data.yaml
@@ -12,32 +12,14 @@ spec:
   ports:
     - protocol: TCP
       name: bolt
-      port: {{ .boltPort }}
-      targetPort: {{ .boltPort }}
+      port: {{ $.Values.memgraph.ports.boltPort }}
+      targetPort: {{ $.Values.memgraph.ports.boltPort }}
     - protocol: TCP
       name: management
-      port: {{ .managementPort }}
-      targetPort: {{ .managementPort }}
+      port: {{ $.Values.memgraph.ports.managementPort }}
+      targetPort: {{ $.Values.memgraph.ports.managementPort }}
     - protocol: TCP
       name: replication
-      port: {{ .replicationPort }}
-      targetPort: {{ .replicationPort }}
-{{- end }}
-
-# Service for data instances external
-{{- range .Values.data }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: memgraph-data-{{ .id }}-external
-spec:
-  type: NodePort
-  selector:
-    app: memgraph-data-{{ .id }}
-  ports:
-    - protocol: TCP
-      name: bolt
-      port: {{ .boltPort }}
-      targetPort: {{ .boltPort }}
+      port: {{ $.Values.memgraph.ports.replicationPort }}
+      targetPort: {{ $.Values.memgraph.ports.replicationPort }}
 {{- end }}
diff --git a/charts/memgraph-high-availability/values.yaml b/charts/memgraph-high-availability/values.yaml
@@ -1,4 +1,4 @@
-# Default values for memgraph-high-availability.
+#{{ $.Values.memgraph.image.repository }}: Default values for memgraph-high-availability.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.|
 
@@ -38,13 +38,16 @@ memgraph:
       logPVCSize: "256Mi"
   affinity:
     enabled: true
+  ports:
+    boltPort: 7687
+    managementPort: 10000
+    replicationPort: 20000
+    coordinatorPort: 12000
+
 
 
 data:
 - id: "0"
-  boltPort: 7687
-  managementPort: 10000
-  replicationPort: 20000
   args:
   - "--experimental-enabled=high-availability"
   - "--management-port=10000"
@@ -54,9 +57,6 @@ data:
   - "--log-file=/var/log/memgraph/memgraph.log"
 
 - id: "1"
-  boltPort: 7687
-  managementPort: 10000
-  replicationPort: 20000
   args:
   - "--experimental-enabled=high-availability"
   - "--management-port=10000"
@@ -67,9 +67,6 @@ data:
 
 coordinators:
 - id: "1"
-  boltPort: 7687
-  managementPort: 10000
-  coordinatorPort: 12000
   args:
   - "--experimental-enabled=high-availability"
   - "--coordinator-id=1"
@@ -83,9 +80,6 @@ coordinators:
   - "--nuraft-log-file=/var/log/memgraph/memgraph.log"
 
 - id: "2"
-  boltPort: 7687
-  managementPort: 10000
-  coordinatorPort: 12000
   args:
   - "--experimental-enabled=high-availability"
   - "--coordinator-id=2"
@@ -99,9 +93,6 @@ coordinators:
   - "--nuraft-log-file=/var/log/memgraph/memgraph.log"
 
 - id: "3"
-  boltPort: 7687
-  managementPort: 10000
-  coordinatorPort: 12000
   args:
   - "--experimental-enabled=high-availability"
   - "--coordinator-id=3"