From bf108dea5906f309e21182e6c17a807a8a19ae7b Mon Sep 17 00:00:00 2001
From: kota2and3kan <47254383+kota2and3kan@users.noreply.github.com>
Date: Tue, 1 Jul 2025 18:09:18 +0900
Subject: [PATCH 1/4] [scalardb-cluster] Make Envoy optional

---
 .../scalardb-cluster/deployment.yaml          |  5 ++++
 .../templates/scalardb-cluster/service.yaml   | 25 +++++++++++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/charts/scalardb-cluster/templates/scalardb-cluster/deployment.yaml b/charts/scalardb-cluster/templates/scalardb-cluster/deployment.yaml
index 5ce70553..81e0ae3c 100644
--- a/charts/scalardb-cluster/templates/scalardb-cluster/deployment.yaml
+++ b/charts/scalardb-cluster/templates/scalardb-cluster/deployment.yaml
@@ -55,8 +55,13 @@ spec:
           env:
           - name: SCALAR_DB_CLUSTER_MEMBERSHIP_KUBERNETES_ENDPOINT_NAMESPACE_NAME
             value: {{ .Release.Namespace }}
+          {{- if .Values.envoy.enabled }}
           - name: SCALAR_DB_CLUSTER_MEMBERSHIP_KUBERNETES_ENDPOINT_NAME
             value: {{ include "scalardb-cluster.fullname" . }}-headless
+          {{- else }}
+          - name: SCALAR_DB_CLUSTER_MEMBERSHIP_KUBERNETES_ENDPOINT_NAME
+            value: {{ include "scalardb-cluster.fullname" . }}
+          {{- end }}
           - name: SCALAR_DB_CLUSTER_LOG_LEVEL
             value: "{{ .Values.scalardbCluster.logLevel }}"
           {{- if and (.Values.scalardbCluster.encryption.enabled) (eq .Values.scalardbCluster.encryption.type "self") }}
diff --git a/charts/scalardb-cluster/templates/scalardb-cluster/service.yaml b/charts/scalardb-cluster/templates/scalardb-cluster/service.yaml
index 60a4c67f..f6eae710 100644
--- a/charts/scalardb-cluster/templates/scalardb-cluster/service.yaml
+++ b/charts/scalardb-cluster/templates/scalardb-cluster/service.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.envoy.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -8,16 +9,36 @@ metadata:
   annotations:
     {{- toYaml .Values.scalardbCluster.service.annotations | nindent 4 }}
 spec:
-  type: {{ .Values.scalardbCluster.service.type }}
   clusterIP: None
   sessionAffinity: None
   ports:
   {{- range $key, $value := .Values.scalardbCluster.service.ports }}
     - name: {{ $key }}
-{{ toYaml $value | indent 6 }}
+      {{- toYaml $value | nindent 6 }}
+  {{- end }}
+  selector:
+    {{- include "scalardb-cluster.selectorLabels" . | nindent 4 }}
+{{- else }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "scalardb-cluster.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "scalardb-cluster.labels" . | nindent 4 }}
+  annotations:
+    {{- toYaml .Values.scalardbCluster.service.annotations | nindent 4 }}
+spec:
+  type: {{ .Values.scalardbCluster.service.type }}
+  ports:
+  {{- range $key, $value := .Values.scalardbCluster.service.ports }}
+    - name: {{ $key }}
+      {{- toYaml $value | nindent 6 }}
   {{- end }}
   selector:
     {{- include "scalardb-cluster.selectorLabels" . | nindent 4 }}
+{{- end }}
 ---
 apiVersion: v1
 kind: Service

From 3ab9b2135d6be92585e700463c9cb1d2dd5a0921 Mon Sep 17 00:00:00 2001
From: kota2and3kan <47254383+kota2and3kan@users.noreply.github.com>
Date: Fri, 12 Sep 2025 11:30:45 +0900
Subject: [PATCH 2/4] Remain headless service for scalar admin

---
 .../scalardb-cluster/deployment.yaml          |  5 -----
 .../templates/scalardb-cluster/service.yaml   | 21 ++++++++++---------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/charts/scalardb-cluster/templates/scalardb-cluster/deployment.yaml b/charts/scalardb-cluster/templates/scalardb-cluster/deployment.yaml
index 81e0ae3c..5ce70553 100644
--- a/charts/scalardb-cluster/templates/scalardb-cluster/deployment.yaml
+++ b/charts/scalardb-cluster/templates/scalardb-cluster/deployment.yaml
@@ -55,13 +55,8 @@ spec:
           env:
           - name: SCALAR_DB_CLUSTER_MEMBERSHIP_KUBERNETES_ENDPOINT_NAMESPACE_NAME
             value: {{ .Release.Namespace }}
-          {{- if .Values.envoy.enabled }}
           - name: SCALAR_DB_CLUSTER_MEMBERSHIP_KUBERNETES_ENDPOINT_NAME
             value: {{ include "scalardb-cluster.fullname" . }}-headless
-          {{- else }}
-          - name: SCALAR_DB_CLUSTER_MEMBERSHIP_KUBERNETES_ENDPOINT_NAME
-            value: {{ include "scalardb-cluster.fullname" . }}
-          {{- end }}
           - name: SCALAR_DB_CLUSTER_LOG_LEVEL
             value: "{{ .Values.scalardbCluster.logLevel }}"
           {{- if and (.Values.scalardbCluster.encryption.enabled) (eq .Values.scalardbCluster.encryption.type "self") }}
diff --git a/charts/scalardb-cluster/templates/scalardb-cluster/service.yaml b/charts/scalardb-cluster/templates/scalardb-cluster/service.yaml
index f6eae710..94ac52f2 100644
--- a/charts/scalardb-cluster/templates/scalardb-cluster/service.yaml
+++ b/charts/scalardb-cluster/templates/scalardb-cluster/service.yaml
@@ -1,44 +1,45 @@
-{{- if .Values.envoy.enabled }}
+{{- if not .Values.envoy.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "scalardb-cluster.fullname" . }}-headless
+  name: {{ include "scalardb-cluster.fullname" . }}-endpoint
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "scalardb-cluster.labels" . | nindent 4 }}
   annotations:
     {{- toYaml .Values.scalardbCluster.service.annotations | nindent 4 }}
 spec:
-  clusterIP: None
+  type: {{ .Values.scalardbCluster.service.type }}
   sessionAffinity: None
   ports:
   {{- range $key, $value := .Values.scalardbCluster.service.ports }}
     - name: {{ $key }}
-      {{- toYaml $value | nindent 6 }}
+      {{ toYaml $value | nindent 6 }}
   {{- end }}
   selector:
     {{- include "scalardb-cluster.selectorLabels" . | nindent 4 }}
-{{- else }}
+{{- end }}
 ---
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "scalardb-cluster.fullname" . }}
+  name: {{ include "scalardb-cluster.fullname" . }}-headless
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "scalardb-cluster.labels" . | nindent 4 }}
   annotations:
     {{- toYaml .Values.scalardbCluster.service.annotations | nindent 4 }}
 spec:
-  type: {{ .Values.scalardbCluster.service.type }}
+  type: ClusterIP
+  clusterIP: None
+  sessionAffinity: None
   ports:
   {{- range $key, $value := .Values.scalardbCluster.service.ports }}
     - name: {{ $key }}
-      {{- toYaml $value | nindent 6 }}
+      {{ toYaml $value | nindent 6 }}
   {{- end }}
   selector:
     {{- include "scalardb-cluster.selectorLabels" . | nindent 4 }}
-{{- end }}
 ---
 apiVersion: v1
 kind: Service
@@ -76,4 +77,4 @@ spec:
   {{- end }}
   selector:
     {{- include "scalardb-cluster.selectorLabels" . | nindent 4 }}
-{{- end }}
+{{- end }}
\ No newline at end of file

From b8d2a832aa3b5ccb5281f7e22c151d3315e7e4d5 Mon Sep 17 00:00:00 2001
From: kota2and3kan <47254383+kota2and3kan@users.noreply.github.com>
Date: Fri, 12 Sep 2025 11:31:41 +0900
Subject: [PATCH 3/4] Update service.yaml

---
 charts/scalardb-cluster/templates/scalardb-cluster/service.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/scalardb-cluster/templates/scalardb-cluster/service.yaml b/charts/scalardb-cluster/templates/scalardb-cluster/service.yaml
index 94ac52f2..8b7e4815 100644
--- a/charts/scalardb-cluster/templates/scalardb-cluster/service.yaml
+++ b/charts/scalardb-cluster/templates/scalardb-cluster/service.yaml
@@ -77,4 +77,4 @@ spec:
   {{- end }}
   selector:
     {{- include "scalardb-cluster.selectorLabels" . | nindent 4 }}
-{{- end }}
\ No newline at end of file
+{{- end }}

From 5a4fe38ea5580bc42e0031919c0ef40bbfde86d0 Mon Sep 17 00:00:00 2001
From: kota2and3kan <47254383+kota2and3kan@users.noreply.github.com>
Date: Fri, 12 Sep 2025 11:44:33 +0900
Subject: [PATCH 4/4] Add "-" for nindent to remove unneccesary new line

---
 .../scalardb-cluster/templates/scalardb-cluster/service.yaml  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/scalardb-cluster/templates/scalardb-cluster/service.yaml b/charts/scalardb-cluster/templates/scalardb-cluster/service.yaml
index 8b7e4815..4b8c0c2d 100644
--- a/charts/scalardb-cluster/templates/scalardb-cluster/service.yaml
+++ b/charts/scalardb-cluster/templates/scalardb-cluster/service.yaml
@@ -14,7 +14,7 @@ spec:
   ports:
   {{- range $key, $value := .Values.scalardbCluster.service.ports }}
     - name: {{ $key }}
-      {{ toYaml $value | nindent 6 }}
+      {{- toYaml $value | nindent 6 }}
   {{- end }}
   selector:
     {{- include "scalardb-cluster.selectorLabels" . | nindent 4 }}
@@ -36,7 +36,7 @@ spec:
   ports:
   {{- range $key, $value := .Values.scalardbCluster.service.ports }}
     - name: {{ $key }}
-      {{ toYaml $value | nindent 6 }}
+      {{- toYaml $value | nindent 6 }}
   {{- end }}
   selector:
     {{- include "scalardb-cluster.selectorLabels" . | nindent 4 }}