public_git/bitnami-containers
1
0
Fork 0
mirror of https://github.com/bitnami/containers.git synced 2026-10-17 14:56:05 +02:00
Code Issues Projects Releases Wiki Activity

[bitnami/etcd] Release 3.6.12-debian-12-r2 (#94357)

Browse Source 
Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>
This commit is contained in:
Bitnami Bot
2026-06-05 12:34:19 +02:00
committed by GitHub
parent 47fe9c8edb
commit ff9dbf6c63
3 changed files with 75 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitnami/etcd/3.6/debian-12/Dockerfile
+2 -2
View File
@@ -7,7 +7,7 @@ ARG DOWNLOADS_URL="downloads.bitnami.com/files/stacksmith"
ARG TARGETARCH
LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
org.opencontainers.image.created="2026-06-03T00:05:18Z" \
org.opencontainers.image.created="2026-06-05T09:58:40Z" \
org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/etcd/README.md" \
org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/etcd" \
@@ -50,7 +50,7 @@ COPY rootfs /
RUN /opt/bitnami/scripts/etcd/postunpack.sh
ENV APP_VERSION="3.6.12" \
BITNAMI_APP_NAME="etcd" \
IMAGE_REVISION="1" \
IMAGE_REVISION="2" \
PATH="/opt/bitnami/common/bin:/opt/bitnami/etcd/bin:$PATH"
EXPOSE 2379 2380
bitnami/etcd/3.6/debian-12/rootfs/opt/bitnami/scripts/etcd/run.sh
+2 -7
View File
@@ -20,13 +20,8 @@ set -o pipefail
# We need to unset ETCD_ROOT_PASSWORD otherwise it will be logged by etcd process
unset ETCD_ROOT_PASSWORD
if [[ -f "$ETCD_NEW_MEMBERS_ENV_FILE" ]]; then
debug "Loading env vars of existing cluster"
. "$ETCD_NEW_MEMBERS_ENV_FILE"
# We rely on the original value of ETCD_INITIAL_CLUSTER
# when bootstrapping a new cluster since
# we need all initial members to calcualte a same cluster_id
fi
# Load env vars of existing cluster
etcd_safe_load_member_env
declare -a cmd=("etcd")
# If provided, run using configuration file
bitnami/etcd/3.6/debian-12/rootfs/opt/bitnami/scripts/libetcd.sh
+71 -10
View File
@@ -299,11 +299,15 @@ etcdctl_auth_norbac_flags() {
# None
########################
etcd_configure_rbac() {
local orig_listen_client_urls="$ETCD_LISTEN_CLIENT_URLS"
local return_value=0
local scheme="http"
[[ $ETCD_AUTO_TLS = true || -f "$ETCD_CERT_FILE" ]] && scheme="https"
export ETCD_LISTEN_CLIENT_URLS="${scheme}://127.0.0.1:2379"
! is_etcd_running && etcd_start_bg
read -r -a extra_flags <<<"$(etcdctl_auth_norbac_flags)"
is_boolean_yes "$ETCD_ON_K8S" && extra_flags+=("--endpoints=$(etcdctl_get_endpoints)")
extra_flags+=("--endpoints=${scheme}://127.0.0.1:2379")
if retry_while "etcdctl ${extra_flags[*]} member list" >/dev/null 2>&1; then
if retry_while "etcdctl ${extra_flags[*]} auth status" >/dev/null 2>&1; then
if etcdctl "${extra_flags[@]}" auth status | grep -q "Authentication Status: true"; then
@@ -315,8 +319,51 @@ etcd_configure_rbac() {
etcdctl "${extra_flags[@]}" auth enable
fi
fi
else
error "Failed to enable etcd authentication"
return_value=1
fi
etcd_stop
export ETCD_LISTEN_CLIENT_URLS="$orig_listen_client_urls"
return $return_value
}
########################
# Wait for primary member to enable RBAC before opening client port
# Globals:
# ETCD_*
# Arguments:
# None
# Returns:
# None
########################
etcd_wait_for_rbac() {
local return_value=0
local orig_listen_client_urls="$ETCD_LISTEN_CLIENT_URLS"
local scheme="http"
[[ $ETCD_AUTO_TLS = true || -f "$ETCD_CERT_FILE" ]] && scheme="https"
export ETCD_LISTEN_CLIENT_URLS="${scheme}://127.0.0.1:2379"
! is_etcd_running && etcd_start_bg
read -r -a extra_flags <<<"$(etcdctl_auth_norbac_flags)"
extra_flags+=("--endpoints=${scheme}://127.0.0.1:2379")
info "Non-primary member: waiting for primary to enable RBAC before opening client port"
# shellcheck disable=SC2329
_auth_enabled() {
etcdctl "${extra_flags[@]}" auth status | grep -q "Authentication Status: true"
}
if ! retry_while "_auth_enabled"; then
error "Timed out waiting for RBAC — refusing to start production etcd unauthenticated."
return_value=1
else
info "RBAC is enabled"
fi
etcd_stop
export ETCD_LISTEN_CLIENT_URLS="$orig_listen_client_urls"
return $return_value
}
########################
@@ -505,8 +552,24 @@ add_new_member() {
extra_flags+=("--peer-urls=$ETCD_INITIAL_ADVERTISE_PEER_URLS")
mkdir -p "$(dirname $ETCD_NEW_MEMBERS_ENV_FILE)" || true
etcdctl member add "$ETCD_NAME" "${extra_flags[@]}" | grep "^ETCD_" >"$ETCD_NEW_MEMBERS_ENV_FILE"
replace_in_file "$ETCD_NEW_MEMBERS_ENV_FILE" "^" "export "
sync -d "$ETCD_NEW_MEMBERS_ENV_FILE"
}
########################
# Safe loader — reads KEY=VALUE without eval or source
# Globals:
# ETCD_NEW_MEMBERS_ENV_FILE
# Arguments:
# None
# Returns:
# None
#########################
etcd_safe_load_member_env() {
[[ -f "$ETCD_NEW_MEMBERS_ENV_FILE" ]] || return 0
local _k _v
while IFS='=' read -r _k _v; do
[[ "$_k" =~ ^ETCD_[A-Z_]+$ ]] || continue
export "$_k"="$_v"
done < "$ETCD_NEW_MEMBERS_ENV_FILE"
}
########################
@@ -597,6 +660,7 @@ etcd_initialize() {
# it from ETCD_INITIAL_ADVERTISE_PEER_URLS
domain="$ETCD_CLUSTER_DOMAIN"
fi
# shellcheck disable=SC2329
hostname_has_N_ips() {
local -r hostname="${1:?hostname is required}"
local -r n=${2:?number of ips is required}
@@ -697,8 +761,8 @@ etcd_initialize() {
# When there's more than one etcd replica, RBAC should be only enabled in one member
if ! is_empty_value "$ETCD_ROOT_PASSWORD" && [[ "${initial_members[0]}" = *"$ETCD_INITIAL_ADVERTISE_PEER_URLS"* ]]; then
etcd_configure_rbac
else
debug "Skipping RBAC configuration in member $ETCD_NAME"
elif [[ "${ETCD_INITIAL_CLUSTER_STATE:-}" != "existing" ]]; then
etcd_wait_for_rbac || return 1
fi
else
! is_empty_value "$ETCD_ROOT_PASSWORD" && etcd_configure_rbac
@@ -726,7 +790,6 @@ add_self_to_cluster() {
done
# only send req to healthy nodes
if is_empty_value "$(get_member_id)"; then
read -r -a extra_flags <<<"$(etcdctl_auth_norbac_flags)"
extra_flags+=("--endpoints=${ETCD_ACTIVE_ENDPOINTS}" "--peer-urls=$ETCD_INITIAL_ADVERTISE_PEER_URLS")
@@ -735,13 +798,11 @@ add_self_to_cluster() {
warn "Failed to add self to cluster, keeping trying..."
sleep 10
done
replace_in_file "$ETCD_NEW_MEMBERS_ENV_FILE" "^" "export "
sync -d "$ETCD_NEW_MEMBERS_ENV_FILE"
else
info "Node already in cluster"
fi
info "Loading env vars of existing cluster"
. "$ETCD_NEW_MEMBERS_ENV_FILE"
etcd_safe_load_member_env
}
########################