From 91fac2cb07deb4c43a65df71895f6c6102ed0c0b Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Tue, 27 Jun 2023 17:01:26 +0200
Subject: [PATCH] [bitnami/etcd] Release 3.5.9-debian-11-r17 (#39124)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/etcd/3.5/debian-11/Dockerfile         |  6 ++---
 bitnami/etcd/3.5/debian-11/docker-compose.yml |  3 +++
 .../opt/bitnami/.bitnami_components.json      |  2 +-
 .../opt/bitnami/scripts/libbitnami.sh         |  2 ++
 .../prebuildfs/opt/bitnami/scripts/libfile.sh |  2 ++
 .../prebuildfs/opt/bitnami/scripts/libfs.sh   |  2 ++
 .../prebuildfs/opt/bitnami/scripts/libhook.sh |  2 ++
 .../prebuildfs/opt/bitnami/scripts/liblog.sh  |  2 ++
 .../prebuildfs/opt/bitnami/scripts/libnet.sh  |  2 ++
 .../prebuildfs/opt/bitnami/scripts/libos.sh   |  2 ++
 .../opt/bitnami/scripts/libpersistence.sh     |  2 ++
 .../opt/bitnami/scripts/libservice.sh         | 24 +++++++++++++++----
 .../opt/bitnami/scripts/libvalidations.sh     |  2 ++
 .../opt/bitnami/scripts/libversion.sh         |  2 ++
 .../opt/bitnami/scripts/libwebserver.sh       |  2 ++
 .../prebuildfs/usr/sbin/install_packages      |  2 ++
 .../rootfs/opt/bitnami/scripts/etcd-env.sh    |  2 ++
 .../opt/bitnami/scripts/etcd/entrypoint.sh    |  2 ++
 .../opt/bitnami/scripts/etcd/healthcheck.sh   |  2 ++
 .../opt/bitnami/scripts/etcd/postunpack.sh    |  2 ++
 .../opt/bitnami/scripts/etcd/prestop.sh       |  2 ++
 .../rootfs/opt/bitnami/scripts/etcd/run.sh    |  2 ++
 .../rootfs/opt/bitnami/scripts/etcd/setup.sh  |  2 ++
 .../opt/bitnami/scripts/etcd/snapshot.sh      |  2 ++
 .../rootfs/opt/bitnami/scripts/libetcd.sh     |  2 ++
 bitnami/etcd/docker-compose.yml               |  3 +++
 26 files changed, 71 insertions(+), 9 deletions(-)

diff --git a/bitnami/etcd/3.5/debian-11/Dockerfile b/bitnami/etcd/3.5/debian-11/Dockerfile
index 33c11e671f0d..d716a60202cd 100644
--- a/bitnami/etcd/3.5/debian-11/Dockerfile
+++ b/bitnami/etcd/3.5/debian-11/Dockerfile
@@ -6,10 +6,10 @@ FROM docker.io/bitnami/minideb:bullseye
 ARG TARGETARCH
 
 LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-06-24T14:20:21Z" \
+      org.opencontainers.image.created="2023-06-27T14:41:56Z" \
       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-r16" \
+      org.opencontainers.image.ref.name="3.5.9-debian-11-r17" \
       org.opencontainers.image.title="etcd" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="3.5.9"
@@ -25,7 +25,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.1-0-linux-${OS_ARCH}-debian-11" \
+      "yq-4.34.1-2-linux-${OS_ARCH}-debian-11" \
       "etcd-3.5.9-2-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
diff --git a/bitnami/etcd/3.5/debian-11/docker-compose.yml b/bitnami/etcd/3.5/debian-11/docker-compose.yml
index 8e3c9ac5ff9a..e6ef9eef5439 100644
--- a/bitnami/etcd/3.5/debian-11/docker-compose.yml
+++ b/bitnami/etcd/3.5/debian-11/docker-compose.yml
@@ -1,3 +1,6 @@
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
+
 version: '2'
 
 services:
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 eb6e231f782a..7c782881e5fa 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.1-0"
+        "version": "4.34.1-2"
     }
 }
\ No newline at end of file
diff --git a/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh
index 4242023f9415..184de8a117e2 100644
--- a/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh
+++ b/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libbitnami.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
 #
 # Bitnami custom library
 
diff --git a/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh b/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh
index 41ebaf7464f6..63759c777f3b 100644
--- a/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh
+++ b/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libfile.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
 #
 # Library for managing files
 
diff --git a/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh
index eb52f7644785..96b22f99710c 100644
--- a/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh
+++ b/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libfs.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
 #
 # Library for file system actions
 
diff --git a/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh b/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh
index 9694852a7d25..dadd06149e00 100644
--- a/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh
+++ b/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libhook.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
 #
 # Library to use for scripts expected to be used as Kubernetes lifecycle hooks
 
diff --git a/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh b/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh
index c7c0f6d4422a..2a9e76a4d725 100644
--- a/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh
+++ b/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/liblog.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
 #
 # Library for logging functions
 
diff --git a/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh b/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh
index 8bbf165e3e2a..b47c69a56825 100644
--- a/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh
+++ b/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libnet.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
 #
 # Library for network functions
 
diff --git a/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
index 6d9ca8546eef..c0500acee78d 100644
--- a/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
+++ b/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libos.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
 #
 # Library for operating system actions
 
diff --git a/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh b/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh
index 99df69681c27..af6af64d6dd0 100644
--- a/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh
+++ b/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libpersistence.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
 #
 # Bitnami persistence library
 # Used for bringing persistence capabilities to applications that don't have clear separation of data and logic
diff --git a/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
index d70cf0779ec8..107f54e6b5c9 100644
--- a/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
+++ b/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libservice.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
 #
 # Library for managing services
 
@@ -104,8 +106,6 @@ generate_cron_conf() {
     local schedule="* * * * *"
     local clean="true"
 
-    local clean="true"
-
     # Parse optional CLI flags
     shift 2
     while [[ "$#" -gt 0 ]]; do
@@ -131,7 +131,12 @@ generate_cron_conf() {
 
     mkdir -p /etc/cron.d
     if "$clean"; then
-        echo "${schedule} ${run_as} ${cmd}" > /etc/cron.d/"$service_name"
+        cat > "/etc/cron.d/${service_name}" <<EOF
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
+
+${schedule} ${run_as} ${cmd}
+EOF
     else
         echo "${schedule} ${run_as} ${cmd}" >> /etc/cron.d/"$service_name"
     fi
@@ -187,7 +192,10 @@ generate_monit_conf() {
 
     is_boolean_yes "$disabled" && conf_suffix=".disabled"
     mkdir -p "$monit_conf_dir"
-    cat >"${monit_conf_dir}/${service_name}.conf${conf_suffix:-}" <<EOF
+    cat > "${monit_conf_dir}/${service_name}.conf${conf_suffix:-}" <<EOF
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
+
 check process ${service_name}
   with pidfile "${pid_file}"
   start program = "${start_command}" with timeout 90 seconds
@@ -246,7 +254,10 @@ generate_logrotate_conf() {
     done
 
     mkdir -p "$logrotate_conf_dir"
-    cat <<EOF | sed '/^\s*$/d' >"${logrotate_conf_dir}/${service_name}"
+    cat <<EOF | sed '/^\s*$/d' > "${logrotate_conf_dir}/${service_name}"
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
+
 ${log_path} {
   ${period}
   rotate ${rotations}
@@ -391,6 +402,9 @@ generate_systemd_conf() {
     fi
     # Generate the Systemd unit
     cat > "$service_file" <<EOF
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
+
 [Unit]
 Description=Bitnami service for ${name}
 # Starting/stopping the main bitnami service should cause the same effect for this service
diff --git a/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh
index 2d7aaa943513..3c6a4109c2c5 100644
--- a/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh
+++ b/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
 #
 # Validation functions library
 
diff --git a/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh
index ad2f0eee48df..6ca71ac7bdbb 100644
--- a/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh
+++ b/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libversion.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
 #
 # Library for managing versions strings
 
diff --git a/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh
index 94745ebe419e..8023f9b0549a 100644
--- a/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh
+++ b/bitnami/etcd/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libwebserver.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
 #
 # Bitnami web server handler library
 
diff --git a/bitnami/etcd/3.5/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/etcd/3.5/debian-11/prebuildfs/usr/sbin/install_packages
index 77857a1a57f2..acbc3173208c 100755
--- a/bitnami/etcd/3.5/debian-11/prebuildfs/usr/sbin/install_packages
+++ b/bitnami/etcd/3.5/debian-11/prebuildfs/usr/sbin/install_packages
@@ -1,4 +1,6 @@
 #!/bin/sh
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
 set -eu
 
 n=0
diff --git a/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/etcd-env.sh b/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/etcd-env.sh
index 360f6215a363..5ab58995c4c1 100644
--- a/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/etcd-env.sh
+++ b/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/etcd-env.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
 #
 # Environment configuration for etcd
 
diff --git a/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/etcd/entrypoint.sh b/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/etcd/entrypoint.sh
index 831abc3090a8..a41110e95496 100755
--- a/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/etcd/entrypoint.sh
+++ b/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/etcd/entrypoint.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
 
 # shellcheck disable=SC1091
 
diff --git a/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/etcd/healthcheck.sh b/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/etcd/healthcheck.sh
index c446cda9e35e..3c978b7a5c78 100755
--- a/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/etcd/healthcheck.sh
+++ b/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/etcd/healthcheck.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
 
 # shellcheck disable=SC1091
 
diff --git a/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/etcd/postunpack.sh b/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/etcd/postunpack.sh
index ed658612f701..57d97c8c8ac6 100755
--- a/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/etcd/postunpack.sh
+++ b/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/etcd/postunpack.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
 
 # shellcheck disable=SC1091
 
diff --git a/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/etcd/prestop.sh b/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/etcd/prestop.sh
index 1674f5e16f08..b540eec49053 100755
--- a/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/etcd/prestop.sh
+++ b/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/etcd/prestop.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
 
 # shellcheck disable=SC1091
 set -o errexit
diff --git a/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/etcd/run.sh b/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/etcd/run.sh
index ccd6aac07d8e..e9ce00f19e69 100755
--- a/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/etcd/run.sh
+++ b/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/etcd/run.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
 
 # shellcheck disable=SC1090,SC1091
 
diff --git a/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/etcd/setup.sh b/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/etcd/setup.sh
index 4cd52cd07b39..2e9d28fad543 100755
--- a/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/etcd/setup.sh
+++ b/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/etcd/setup.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
 
 # shellcheck disable=SC1091
 
diff --git a/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/etcd/snapshot.sh b/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/etcd/snapshot.sh
index 02a90834e805..99c7c8209484 100755
--- a/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/etcd/snapshot.sh
+++ b/bitnami/etcd/3.5/debian-11/rootfs/opt/bitnami/scripts/etcd/snapshot.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
 
 # shellcheck disable=SC1091
 
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 aaa9aabd6d9b..c0fea1de1a0d 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
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
 #
 # Bitnami etcd library
 
diff --git a/bitnami/etcd/docker-compose.yml b/bitnami/etcd/docker-compose.yml
index 8e3c9ac5ff9a..e6ef9eef5439 100644
--- a/bitnami/etcd/docker-compose.yml
+++ b/bitnami/etcd/docker-compose.yml
@@ -1,3 +1,6 @@
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
+
 version: '2'
 
 services: