From e65a19009623e8234950f29765f13f94c1d6ee90 Mon Sep 17 00:00:00 2001
From: David Gomez <dgomezleon@vmware.com>
Date: Tue, 17 Dec 2024 17:12:51 +0100
Subject: [PATCH] [bitnami/kubectl] Remove kubectl 1.31 (#75790)

Signed-off-by: David Gomez <dgomezleon@vmware.com>
---
 bitnami/kubectl/1.31/README.md                |  5 ++
 bitnami/kubectl/1.31/debian-12/Dockerfile     | 57 -------------------
 .../opt/bitnami/.bitnami_components.json      | 14 -----
 .../opt/bitnami/licenses/licenses.txt         |  2 -
 .../prebuildfs/usr/sbin/install_packages      | 27 ---------
 .../debian-12/prebuildfs/usr/sbin/run-script  | 24 --------
 bitnami/kubectl/1.31/debian-12/tags-info.yaml |  5 --
 7 files changed, 5 insertions(+), 129 deletions(-)
 create mode 100644 bitnami/kubectl/1.31/README.md
 delete mode 100644 bitnami/kubectl/1.31/debian-12/Dockerfile
 delete mode 100644 bitnami/kubectl/1.31/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
 delete mode 100644 bitnami/kubectl/1.31/debian-12/prebuildfs/opt/bitnami/licenses/licenses.txt
 delete mode 100755 bitnami/kubectl/1.31/debian-12/prebuildfs/usr/sbin/install_packages
 delete mode 100755 bitnami/kubectl/1.31/debian-12/prebuildfs/usr/sbin/run-script
 delete mode 100644 bitnami/kubectl/1.31/debian-12/tags-info.yaml

diff --git a/bitnami/kubectl/1.31/README.md b/bitnami/kubectl/1.31/README.md
new file mode 100644
index 0000000000000..5237e148ec0d9
--- /dev/null
+++ b/bitnami/kubectl/1.31/README.md
@@ -0,0 +1,5 @@
+# Only latest stable branch maintained in the free Bitnami catalog
+
+Starting December 10th 2024, only the latest stable branch of any container will receive updates in the free Bitnami catalog. To access up-to-date releases for all upstream-supported branches, consider upgrading to Bitnami Premium. Previous versions already released will not be deleted. They are still available to pull from DockerHub.
+
+Please check the Bitnami Premium page in our partner [Arrow Electronics](https://www.arrow.com/globalecs/na/vendors/bitnami?utm_source=GitHub&utm_medium=containers) for more information.
diff --git a/bitnami/kubectl/1.31/debian-12/Dockerfile b/bitnami/kubectl/1.31/debian-12/Dockerfile
deleted file mode 100644
index b80dcff889cb2..0000000000000
--- a/bitnami/kubectl/1.31/debian-12/Dockerfile
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright Broadcom, Inc. All Rights Reserved.
-# SPDX-License-Identifier: APACHE-2.0
-
-FROM docker.io/bitnami/minideb:bookworm
-
-ARG DOWNLOADS_URL="downloads.bitnami.com/files/stacksmith"
-ARG TARGETARCH
-
-LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
-      org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2024-12-17T15:15:46Z" \
-      org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
-      org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/kubectl/README.md" \
-      org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="1.31.4-debian-12-r1" \
-      org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/kubectl" \
-      org.opencontainers.image.title="kubectl" \
-      org.opencontainers.image.vendor="Broadcom, Inc." \
-      org.opencontainers.image.version="1.31.4"
-
-ENV HOME="/" \
-    OS_ARCH="${TARGETARCH:-amd64}" \
-    OS_FLAVOUR="debian-12" \
-    OS_NAME="linux"
-
-COPY prebuildfs /
-SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
-# Install required system packages and dependencies
-RUN install_packages ca-certificates curl gettext git jq procps
-RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
-    COMPONENTS=( \
-      "yq-4.44.6-0-linux-${OS_ARCH}-debian-12" \
-      "kubectl-1.31.4-1-linux-${OS_ARCH}-debian-12" \
-    ) ; \
-    for COMPONENT in "${COMPONENTS[@]}"; do \
-      if [ ! -f "${COMPONENT}.tar.gz" ]; then \
-        curl -SsLf "https://${DOWNLOADS_URL}/${COMPONENT}.tar.gz" -O ; \
-        curl -SsLf "https://${DOWNLOADS_URL}/${COMPONENT}.tar.gz.sha256" -O ; \
-      fi ; \
-      sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \
-      tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \
-      rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \
-    done
-RUN apt-get autoremove --purge -y curl && \
-    apt-get update && apt-get upgrade -y && \
-    apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives
-RUN chmod g+rwX /opt/bitnami
-RUN mkdir /.kube && chmod g+rwX /.kube
-RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true
-
-ENV APP_VERSION="1.31.4" \
-    BITNAMI_APP_NAME="kubectl" \
-    PATH="/opt/bitnami/common/bin:/opt/bitnami/kubectl/bin:$PATH"
-
-USER 1001
-ENTRYPOINT [ "kubectl" ]
-CMD [ "--help" ]
diff --git a/bitnami/kubectl/1.31/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/kubectl/1.31/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
deleted file mode 100644
index bc0d6a703e64a..0000000000000
--- a/bitnami/kubectl/1.31/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "kubectl": {
-        "arch": "amd64",
-        "distro": "debian-12",
-        "type": "NAMI",
-        "version": "1.31.4-1"
-    },
-    "yq": {
-        "arch": "amd64",
-        "distro": "debian-12",
-        "type": "NAMI",
-        "version": "4.44.6-0"
-    }
-}
\ No newline at end of file
diff --git a/bitnami/kubectl/1.31/debian-12/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/kubectl/1.31/debian-12/prebuildfs/opt/bitnami/licenses/licenses.txt
deleted file mode 100644
index 76956b38e82c6..0000000000000
--- a/bitnami/kubectl/1.31/debian-12/prebuildfs/opt/bitnami/licenses/licenses.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Bitnami containers ship with software bundles. You can find the licenses under:
-/opt/bitnami/[name-of-bundle]/licenses/[bundle-version].txt
diff --git a/bitnami/kubectl/1.31/debian-12/prebuildfs/usr/sbin/install_packages b/bitnami/kubectl/1.31/debian-12/prebuildfs/usr/sbin/install_packages
deleted file mode 100755
index ccce248b2d141..0000000000000
--- a/bitnami/kubectl/1.31/debian-12/prebuildfs/usr/sbin/install_packages
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-# Copyright Broadcom, Inc. All Rights Reserved.
-# SPDX-License-Identifier: APACHE-2.0
-set -eu
-
-n=0
-max=2
-export DEBIAN_FRONTEND=noninteractive
-
-until [ $n -gt $max ]; do
-    set +e
-    (
-      apt-get update -qq &&
-      apt-get install -y --no-install-recommends "$@"
-    )
-    CODE=$?
-    set -e
-    if [ $CODE -eq 0 ]; then
-        break
-    fi
-    if [ $n -eq $max ]; then
-        exit $CODE
-    fi
-    echo "apt failed, retrying"
-    n=$(($n + 1))
-done
-apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives
diff --git a/bitnami/kubectl/1.31/debian-12/prebuildfs/usr/sbin/run-script b/bitnami/kubectl/1.31/debian-12/prebuildfs/usr/sbin/run-script
deleted file mode 100755
index 0e07c9038dfde..0000000000000
--- a/bitnami/kubectl/1.31/debian-12/prebuildfs/usr/sbin/run-script
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-# Copyright Broadcom, Inc. All Rights Reserved.
-# SPDX-License-Identifier: APACHE-2.0
-set -u
-
-if [ $# -eq 0 ]; then
-    >&2 echo "No arguments provided"
-    exit 1
-fi
-
-script=$1
-exit_code="${2:-96}"
-fail_if_not_present="${3:-n}"
-
-if test -f "$script"; then
-  sh $script
-
-  if [ $? -ne 0 ]; then
-    exit $((exit_code))
-  fi
-elif [ "$fail_if_not_present" = "y" ]; then
-  >&2 echo "script not found: $script"
-  exit 127
-fi
diff --git a/bitnami/kubectl/1.31/debian-12/tags-info.yaml b/bitnami/kubectl/1.31/debian-12/tags-info.yaml
deleted file mode 100644
index 90efe7e93139b..0000000000000
--- a/bitnami/kubectl/1.31/debian-12/tags-info.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-rolling-tags:
-- "1.31"
-- 1.31-debian-12
-- 1.31.4
-- latest