From 061f1d136e0d1c8c1ddcad82bc9eb8c2d26c1b81 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Sat, 12 Aug 2023 13:14:48 +0200
Subject: [PATCH] [bitnami/etcd] Release 3.5.9-debian-11-r93 (#44361)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/etcd/3.5/debian-11/Dockerfile                       | 6 +++---
 .../prebuildfs/opt/bitnami/.bitnami_components.json         | 2 +-
 .../3.5/debian-11/rootfs/opt/bitnami/scripts/libetcd.sh     | 5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/bitnami/etcd/3.5/debian-11/Dockerfile b/bitnami/etcd/3.5/debian-11/Dockerfile
index b1b56e7a66e4..2c19394a26a5 100644
--- a/bitnami/etcd/3.5/debian-11/Dockerfile
+++ b/bitnami/etcd/3.5/debian-11/Dockerfile
@@ -7,10 +7,10 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-08-08T15:23:56Z" \
+      org.opencontainers.image.created="2023-08-11T16:56:10Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="3.5.9-debian-11-r90" \
+      org.opencontainers.image.ref.name="3.5.9-debian-11-r93" \
       org.opencontainers.image.title="etcd" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="3.5.9"
@@ -26,7 +26,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl procps
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "yq-4.34.2-1-linux-${OS_ARCH}-debian-11" \
+      "yq-4.35.1-0-linux-${OS_ARCH}-debian-11" \
       "etcd-3.5.9-6-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
diff --git a/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 71f6dadf1ac4..caec0d857747 100644
--- a/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -9,6 +9,6 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "4.34.2-1"
+        "version": "4.35.1-0"
     }
 }
\ No newline at end of file
diff --git a/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/libetcd.sh b/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/libetcd.sh
index e470f5e6059b..2266205c8875 100644
--- a/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/libetcd.sh
+++ b/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/libetcd.sh
@@ -663,12 +663,11 @@ etcd_initialize() {
             debug_execute chmod -R 700 "$ETCD_DATA_DIR" || true
         fi
         if [[ ${#initial_members[@]} -gt 1 ]]; then
+            member_id="$(get_member_id)"
             if is_boolean_yes "$ETCD_DISABLE_PRESTOP"; then
                 info "The member will try to join the cluster by it's own"
                 export ETCD_INITIAL_CLUSTER_STATE=existing
-            fi
-            member_id="$(get_member_id)"
-            if ! is_healthy_etcd_cluster; then
+            elif ! is_healthy_etcd_cluster; then
                 warn "Cluster not responding!"
                 if is_boolean_yes "$ETCD_DISASTER_RECOVERY"; then
                     latest_snapshot_file="$(find /snapshots/ -maxdepth 1 -type f -name 'db-*' | sort | tail -n 1)"