new name for etcd

packages/core/installer/images/installer.json

@@ -1,14 +1,14 @@
 {
-  "containerimage.config.digest": "sha256:63e741140d3780c59d0c318e79746543affd046178786aedf0a40885e17c2d30",
+  "containerimage.config.digest": "sha256:fc7667f4be5f929b88190b6df94797e06a842166b485beeb80c6e4068b58c17d",
   "containerimage.descriptor": {
     "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
-    "digest": "sha256:18557ff98320d45c8e790467fdcce3f3f879658f75f495b285de0fe7de94668b",
+    "digest": "sha256:e03c6dec1a13b0419f24629ecbbdbd0bdad929c3d4d46dbf998565b9587e1c26",
     "size": 2074,
     "platform": {
       "architecture": "amd64",
       "os": "linux"
     }
   },
-  "containerimage.digest": "sha256:18557ff98320d45c8e790467fdcce3f3f879658f75f495b285de0fe7de94668b",
+  "containerimage.digest": "sha256:e03c6dec1a13b0419f24629ecbbdbd0bdad929c3d4d46dbf998565b9587e1c26",
   "image.name": "ghcr.io/aenix-io/cozystack/installer:latest"
 }

packages/extra/etcd/templates/kamaji-etcd.yaml

@@ -15,4 +15,5 @@ spec:
   interval: 1m0s
   timeout: 5m0s
   values:
-    fullnameOverride: etcd
+    kamaji-etcd:
+      fullnameOverride: etcd

packages/system/kamaji-etcd/Makefile

@@ -5,3 +5,4 @@ update:
 	helm pull clastix/kamaji-etcd --untar --untardir charts
 	sed -i 's/hook-failed/before-hook-creation,hook-failed/' `grep -rl hook-failed charts`
 	patch -p4 < patches/fix-svc.diff
+	patch -p4 < patches/fullnameOverride.diff

packages/system/kamaji-etcd/charts/kamaji-etcd/templates/_helpers.tpl

@@ -9,8 +9,17 @@ Expand the name of the chart.
 Create a default fully qualified etcd name.
 */}}
 {{- define "etcd.fullname" -}}
-{{- .Release.Name }}
-{{- end }}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
 
 {{/*
 Create chart name and version as used by the chart label.
@@ -156,4 +165,4 @@ Create the minio-client fully-qualified Docker image to use
 */}}
 {{- define "minio-client.fullyQualifiedDockerImage" -}}
 {{- printf "%s:%s" .Values.backup.s3.image.repository .Values.backup.s3.image.tag -}}
-{{- end }}
+{{- end }}

packages/system/kamaji-etcd/patches/fullnameOverride.diff

@@ -0,0 +1,31 @@
+diff --git a/packages/system/kamaji-etcd/charts/kamaji-etcd/templates/_helpers.tpl b/packages/system/kamaji-etcd/charts/kamaji-etcd/templates/_helpers.tpl
+index 4f7014e..403e187 100644
+--- a/packages/system/kamaji-etcd/charts/kamaji-etcd/templates/_helpers.tpl
++++ b/packages/system/kamaji-etcd/charts/kamaji-etcd/templates/_helpers.tpl
+@@ -9,8 +9,17 @@ Expand the name of the chart.
+ Create a default fully qualified etcd name.
+ */}}
+ {{- define "etcd.fullname" -}}
+-{{- .Release.Name }}
+-{{- end }}
++{{- if .Values.fullnameOverride -}}
++{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
++{{- else -}}
++{{- $name := default .Chart.Name .Values.nameOverride -}}
++{{- if contains $name .Release.Name -}}
++{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
++{{- else -}}
++{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
++{{- end -}}
++{{- end -}}
++{{- end -}}
+ 
+ {{/*
+ Create chart name and version as used by the chart label.
+@@ -156,4 +165,4 @@ Create the minio-client fully-qualified Docker image to use
+ */}}
+ {{- define "minio-client.fullyQualifiedDockerImage" -}}
+ {{- printf "%s:%s" .Values.backup.s3.image.repository .Values.backup.s3.image.tag -}}
+-{{- end }}
+\ No newline at end of file
++{{- end }}

packages/system/kamaji-etcd/templates/datastore.yaml

@@ -5,29 +5,29 @@ metadata:
 spec:
   driver: etcd
   endpoints:
-  - {{ .Release.Name }}-0.{{ .Release.Name }}.{{ .Release.Namespace }}.svc:2379
-  - {{ .Release.Name }}-1.{{ .Release.Name }}.{{ .Release.Namespace }}.svc:2379
-  - {{ .Release.Name }}-2.{{ .Release.Name }}.{{ .Release.Namespace }}.svc:2379
+  - etcd-0.etcd.{{ .Release.Namespace }}.svc:2379
+  - etcd-1.etcd.{{ .Release.Namespace }}.svc:2379
+  - etcd-2.etcd.{{ .Release.Namespace }}.svc:2379
   tlsConfig:
     certificateAuthority:
       certificate:
         secretReference:
           keyPath: ca.crt
-          name: {{ .Release.Name }}-certs
+          name: etcd-certs
           namespace: {{ .Release.Namespace }}
       privateKey:
         secretReference:
           keyPath: ca.key
-          name: {{ .Release.Name }}-certs
+          name: etcd-certs
           namespace: {{ .Release.Namespace }}
     clientCertificate:
       certificate:
         secretReference:
           keyPath: tls.crt
-          name: {{ .Release.Name }}-root-client-certs
+          name: etcd-root-client-certs
           namespace: {{ .Release.Namespace }}
       privateKey:
         secretReference:
           keyPath: tls.key
-          name: {{ .Release.Name }}-root-client-certs
+          name: etcd-root-client-certs
           namespace: {{ .Release.Namespace }}