[bitnami/etcd] Fix etcd when using a custom svc port (#8189)

* [bitnami/etcd] Fix etcd when using a custom svc port

Signed-off-by: juan131 <juanariza@vmware.com>

* [bitnami/etcd] Update components versions

Signed-off-by: Bitnami Containers <containers@bitnami.com>

Co-authored-by: Bitnami Containers <containers@bitnami.com>

bitnami/etcd/Chart.yaml

@@ -24,4 +24,4 @@ name: etcd
 sources:
   - https://github.com/bitnami/bitnami-docker-etcd
   - https://coreos.com/etcd/
-version: 6.10.2
+version: 6.10.3

bitnami/etcd/templates/statefulset.yaml

@@ -91,7 +91,7 @@ spec:
       {{- end }}
       containers:
         {{- $replicaCount := int .Values.replicaCount }}
-        {{- $peerPort := int .Values.service.peerPort }}
+        {{- $peerPort := int .Values.containerPorts.peer }}
         {{- $etcdFullname := include "common.names.fullname" . }}
         {{- $releaseNamespace := .Release.Namespace }}
         {{- $etcdHeadlessServiceName := printf "%s-%s" $etcdFullname "headless" }}
@@ -155,11 +155,11 @@ spec:
               value: "simple"
               {{- end }}
             - name: ETCD_ADVERTISE_CLIENT_URLS
-              value: "{{ $etcdClientProtocol }}://$(MY_POD_NAME).{{ $etcdHeadlessServiceName }}.{{ .Release.Namespace }}.svc.{{ $clusterDomain }}:{{ .Values.service.port }}"
+              value: "{{ $etcdClientProtocol }}://$(MY_POD_NAME).{{ $etcdHeadlessServiceName }}.{{ .Release.Namespace }}.svc.{{ $clusterDomain }}:{{ .Values.containerPorts.client }},{{ $etcdClientProtocol }}://{{ $etcdFullname }}.{{ .Release.Namespace }}.svc.{{ $clusterDomain }}:{{ .Values.service.port }}"
             - name: ETCD_LISTEN_CLIENT_URLS
               value: "{{ $etcdClientProtocol }}://0.0.0.0:{{ .Values.containerPorts.client }}"
             - name: ETCD_INITIAL_ADVERTISE_PEER_URLS
-              value: "{{ $etcdPeerProtocol }}://$(MY_POD_NAME).{{ $etcdHeadlessServiceName }}.{{ .Release.Namespace }}.svc.{{ $clusterDomain }}:{{ .Values.service.peerPort }}"
+              value: "{{ $etcdPeerProtocol }}://$(MY_POD_NAME).{{ $etcdHeadlessServiceName }}.{{ .Release.Namespace }}.svc.{{ $clusterDomain }}:{{ .Values.containerPorts.peer }}"
             - name: ETCD_LISTEN_PEER_URLS
               value: "{{ $etcdPeerProtocol }}://0.0.0.0:{{ .Values.containerPorts.peer }}"
             {{- if .Values.autoCompactionMode }}

bitnami/etcd/templates/svc-headless.yaml

@@ -24,9 +24,9 @@ spec:
     - name: {{ .Values.service.clientPortNameOverride }}
     {{- end }}
     {{- else}}
-    - name: "client"
+    - name: client
     {{- end }}
-      port: {{ .Values.service.port  }}
+      port: {{ .Values.containerPorts.client }}
       targetPort: client
     {{- if .Values.service.peerPortNameOverride }}
     {{- if .Values.auth.peer.secureTransport }}
@@ -35,8 +35,8 @@ spec:
     - name: {{ .Values.service.peerPortNameOverride }}
     {{- end }}
     {{- else}}
-    - name: "peer"
+    - name: peer
     {{- end }}
-      port: {{ .Values.service.peerPort  }}
+      port: {{ .Values.containerPorts.peer }}
       targetPort: peer
   selector: {{- include "common.labels.matchLabels" . | nindent 4 }}

bitnami/etcd/values.yaml

@@ -69,7 +69,7 @@ diagnosticMode:
 image:
   registry: docker.io
   repository: bitnami/etcd
-  tag: 3.5.1-debian-10-r30
+  tag: 3.5.1-debian-10-r31
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
   ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -546,7 +546,7 @@ volumePermissions:
   image:
     registry: docker.io
     repository: bitnami/bitnami-shell
-    tag: 10-debian-10-r255
+    tag: 10-debian-10-r256
     pullPolicy: IfNotPresent
     ## Optionally specify an array of imagePullSecrets.
     ## Secrets must be manually created in the namespace.