feat: switch between client and headless service (#109)

* feat: switch between client and headless service

Author: bsctl

charts/kamaji-etcd/README.md

@@ -67,6 +67,7 @@ Here the values you can override:
 | clusterDomain | string | `"cluster.local"` | Domain of the Kubernetes cluster. |
 | datastore.annotations | object | `{}` | Assign additional Annotations to the datastore |
 | datastore.enabled | bool | `false` | Create a datastore custom resource for Kamaji |
+| datastore.headless | bool | `true` | Expose the headless service endpoints in the datastore. Set to false to expose with regular service. |
 | datastore.name | string | `""` | Name of Kamaji datastore, set to fully qualified etcd name when null or not provided |
 | extraArgs | list | `[]` | A list of extra arguments to add to the etcd default ones |
 | fullnameOverride | string | `""` |  |

charts/kamaji-etcd/templates/_helpers.tpl

@@ -42,6 +42,13 @@ Create the name of the Service to use
 {{- printf "%s" (include "etcd.fullname" .) | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
+{{/*
+Create the name of the client Service to use
+*/}}
+{{- define "client.serviceName" -}}
+{{- printf "%s-client" (include "etcd.fullname" .) | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
 {{/*
 Common labels
 */}}
@@ -157,8 +164,8 @@ Space separated list of etcd cluster endpoints.
 {{- end }}
 
 {{/*
-Create the minio-client fully-qualified Docker image to use
+Client cluster endpoints.
 */}}
-{{- define "minio-client.fullyQualifiedDockerImage" -}}
-{{- printf "%s:%s" .Values.backup.s3.image.repository .Values.backup.s3.image.tag -}}
-{{- end }}
+{{- define "client.endpointsYAML" }}
+{{ printf "- %s.%s.svc.%s:%d\n" ( include "client.serviceName" .) $.Release.Namespace $.Values.clusterDomain (int $.Values.clientPort) }}
+{{- end }}

charts/kamaji-etcd/templates/etcd_client_service.yaml

@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    {{- include "etcd.labels" . | nindent 4 }}
+    prometheus.io/metrics: "true"
+  name: {{ include "client.serviceName" . }}
+  namespace: {{ .Release.Namespace }}
+spec:
+  type: ClusterIP
+  ports:
+    - port: {{ .Values.clientPort }}
+      name: client
+    - port: {{ .Values.metricsPort }}
+      name: metrics
+  selector:
+    {{- include "etcd.selectorLabels" . | nindent 4 }}

charts/kamaji-etcd/templates/etcd_cm.yaml

@@ -58,6 +58,7 @@ data:
 {{- range $count := until (int $.Values.replicas) -}}
         {{ printf "\"%s-%d.%s.%s.svc.%s\"," ( include "etcd.fullname" $outer ) $count (include "etcd.serviceName" $outer) $.Release.Namespace $.Values.clusterDomain }}
 {{- end }}
+        {{ printf "\"%s.%s.svc.%s\"," (include "client.serviceName" .) $.Release.Namespace $.Values.clusterDomain }}
         "etcd-server.{{ .Release.Namespace }}.svc.{{ $.Values.clusterDomain }}",
         "etcd-server.{{ .Release.Namespace }}.svc",
         "etcd-server",

charts/kamaji-etcd/templates/etcd_datastore.yaml

@@ -12,7 +12,11 @@ metadata:
 spec:
   driver: etcd
   endpoints:
-  {{- include "etcd.endpointsYAML" . | nindent 4 }}
+  {{- if or (not (hasKey .Values.datastore "headless")) .Values.datastore.headless }}
+    {{- include "etcd.endpointsYAML" . | nindent 4 }}
+  {{- else }}
+    {{- include "client.endpointsYAML" . | nindent 4 }}
+  {{- end }}
   tlsConfig:
     certificateAuthority:
       certificate:

…/kamaji-etcd/templates/etcd_service.yaml …tcd/templates/etcd_headless_service.yamlcharts/kamaji-etcd/templates/etcd_service.yaml renamed to charts/kamaji-etcd/templates/etcd_headless_service.yaml charts/kamaji-etcd/templates/etcd_service.yaml renamed to charts/kamaji-etcd/templates/etcd_headless_service.yaml

@@ -12,7 +12,5 @@ spec:
       name: client
     - port: {{ .Values.peerApiPort }}
       name: peer
-    - port: {{ .Values.metricsPort }}
-      name: metrics
   selector:
     {{- include "etcd.selectorLabels" . | nindent 4 }}

charts/kamaji-etcd/templates/etcd_service_monitor.yaml

@@ -38,7 +38,8 @@ spec:
     {{- if .Values.serviceMonitor.matchLabels }}
       {{- toYaml .Values.serviceMonitor.matchLabels | nindent 6 }}
     {{- else }}
-      {{- include "etcd.labels" . | nindent 6 }}
+      prometheus.io/metrics: "true"
+      {{- include "etcd.selectorLabels" . | nindent 6 }}
     {{- end }}
   namespaceSelector:
     matchNames:

charts/kamaji-etcd/values.yaml

@@ -128,6 +128,8 @@ datastore:
   enabled: false
   # -- Name of Kamaji datastore, set to fully qualified etcd name when null or not provided
   name: ""
+  # -- Expose the headless service endpoints in the datastore. Set to false to expose with regular service.
+  headless: true # https://github.com/clastix/kamaji/issues/856
   # -- Assign additional Annotations to the datastore
   annotations: {}
   #  helm.sh/resource-policy: keep