From a5ff9bf65be195587ec580be8f4d695017274e94 Mon Sep 17 00:00:00 2001
From: Andrei Kvapil <kvapss@gmail.com>
Date: Fri, 27 Jun 2025 13:53:47 +0200
Subject: [PATCH] [etcd] Update etcd application (fix resources and headless
 services)

Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
---
 packages/extra/etcd/Chart.yaml                  | 2 +-
 packages/extra/etcd/templates/datastore.yaml    | 6 ++----
 packages/extra/etcd/templates/etcd-cluster.yaml | 6 +++++-
 packages/extra/etcd/values.yaml                 | 8 ++------
 packages/extra/versions_map                     | 3 ++-
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/packages/extra/etcd/Chart.yaml b/packages/extra/etcd/Chart.yaml
index c2208b87..cdc44062 100644
--- a/packages/extra/etcd/Chart.yaml
+++ b/packages/extra/etcd/Chart.yaml
@@ -3,4 +3,4 @@ name: etcd
 description: Storage for Kubernetes clusters
 icon: /logos/etcd.svg
 type: application
-version: 2.8.0
+version: 2.9.0
diff --git a/packages/extra/etcd/templates/datastore.yaml b/packages/extra/etcd/templates/datastore.yaml
index 591f6519..2a4a9e05 100644
--- a/packages/extra/etcd/templates/datastore.yaml
+++ b/packages/extra/etcd/templates/datastore.yaml
@@ -6,9 +6,7 @@ metadata:
 spec:
   driver: etcd
   endpoints:
-  {{- range $i := until (int $.Values.replicas) }}
-  - etcd-{{ $i }}.etcd-headless.{{ $.Release.Namespace }}.svc:2379
-  {{- end }}
+  - etcd.{{ $.Release.Namespace }}.svc:2379
   tlsConfig:
     certificateAuthority:
       certificate:
@@ -47,4 +45,4 @@ metadata:
   name: etcd-client-tls
   annotations:
     helm.sh/hook: pre-install
-    helm.sh/resource-policy: keep
\ No newline at end of file
+    helm.sh/resource-policy: keep
diff --git a/packages/extra/etcd/templates/etcd-cluster.yaml b/packages/extra/etcd/templates/etcd-cluster.yaml
index a44ff0ca..f3b5637f 100644
--- a/packages/extra/etcd/templates/etcd-cluster.yaml
+++ b/packages/extra/etcd/templates/etcd-cluster.yaml
@@ -47,7 +47,7 @@ spec:
           containerPort: 2381
           protocol: TCP
         {{- with .Values.resources }}
-        resources: {{- toYaml . | nindent 10 }}
+        resources: {{- include "cozy-lib.resources.sanitize" (list . $) | nindent 10 }}
         {{- end }}
       topologySpreadConstraints:
       - maxSkew: 1
@@ -152,6 +152,8 @@ spec:
     - "signing"
     - "key encipherment"
   dnsNames:
+  - etcd
+  - etcd.{{ $.Release.Namespace }}.svc
   {{- range $i := until (int $.Values.replicas) }}
   - etcd-{{ $i }}
   - etcd-{{ $i }}.etcd-headless
@@ -186,6 +188,8 @@ spec:
     - "signing"
     - "key encipherment"
   dnsNames:
+  - etcd
+  - etcd.{{ $.Release.Namespace }}.svc
   {{- range $i := until (int $.Values.replicas) }}
   - etcd-{{ $i }}
   - etcd-{{ $i }}.etcd-headless
diff --git a/packages/extra/etcd/values.yaml b/packages/extra/etcd/values.yaml
index 7a6a89e5..d8b927fe 100644
--- a/packages/extra/etcd/values.yaml
+++ b/packages/extra/etcd/values.yaml
@@ -10,9 +10,5 @@ replicas: 3
 
 ## @param resources Resources
 resources:
-  limits:
-    cpu: 1000m
-    memory: 1Gi
-  requests:
-    cpu: 100m
-    memory: 512Mi
+  cpu: 4
+  memory: 1Gi
diff --git a/packages/extra/versions_map b/packages/extra/versions_map
index beb2c324..cb9683bb 100644
--- a/packages/extra/versions_map
+++ b/packages/extra/versions_map
@@ -12,7 +12,8 @@ etcd 2.5.0 24fa7222
 etcd 2.6.0 8c460528
 etcd 2.6.1 45a7416c
 etcd 2.7.0 632224a3
-etcd 2.8.0 HEAD
+etcd 2.8.0 4369b031
+etcd 2.9.0 HEAD
 info 1.0.0 93bdf411
 info 1.0.1 632224a3
 info 1.1.0 HEAD