From 82e1d1e365f71df0a8b9691e95145f0c234a0646 Mon Sep 17 00:00:00 2001 From: Cori Avila Date: Wed, 2 Aug 2023 13:50:03 +0200 Subject: [PATCH] [bitnami/kubectl] Deprecate kubectl 1.24 Signed-off-by: Cori Avila --- bitnami/kubectl/1.24/debian-11/Dockerfile | 52 ------------------- .../kubectl/1.24/debian-11/docker-compose.yml | 7 --- .../opt/bitnami/.bitnami_components.json | 8 --- .../opt/bitnami/licenses/licenses.txt | 2 - .../prebuildfs/usr/sbin/install_packages | 27 ---------- bitnami/kubectl/1.24/debian-11/tags-info.yaml | 4 -- 6 files changed, 100 deletions(-) delete mode 100644 bitnami/kubectl/1.24/debian-11/Dockerfile delete mode 100644 bitnami/kubectl/1.24/debian-11/docker-compose.yml delete mode 100644 bitnami/kubectl/1.24/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json delete mode 100644 bitnami/kubectl/1.24/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt delete mode 100755 bitnami/kubectl/1.24/debian-11/prebuildfs/usr/sbin/install_packages delete mode 100644 bitnami/kubectl/1.24/debian-11/tags-info.yaml diff --git a/bitnami/kubectl/1.24/debian-11/Dockerfile b/bitnami/kubectl/1.24/debian-11/Dockerfile deleted file mode 100644 index e028a2a03401f..0000000000000 --- a/bitnami/kubectl/1.24/debian-11/Dockerfile +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -FROM docker.io/bitnami/minideb:bullseye - -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-07-30T19:27:06Z" \ - org.opencontainers.image.description="Application packaged by VMware, Inc" \ - org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="1.24.16-debian-11-r10" \ - org.opencontainers.image.title="kubectl" \ - org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="1.24.16" - -ENV HOME="/" \ - OS_ARCH="${TARGETARCH:-amd64}" \ - OS_FLAVOUR="debian-11" \ - OS_NAME="linux" - -COPY prebuildfs / -SHELL ["/bin/bash", "-o", "pipefail", "-c"] -# Install required system packages and dependencies -RUN install_packages ca-certificates curl git jq procps -RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \ - COMPONENTS=( \ - "kubectl-1.24.16-2-linux-${OS_ARCH}-debian-11" \ - ) && \ - for COMPONENT in "${COMPONENTS[@]}"; do \ - if [ ! -f "${COMPONENT}.tar.gz" ]; then \ - curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${COMPONENT}.tar.gz" -O ; \ - curl -SsLf "https://downloads.bitnami.com/files/stacksmith/${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 - -ENV APP_VERSION="1.24.16" \ - BITNAMI_APP_NAME="kubectl" \ - PATH="/opt/bitnami/kubectl/bin:$PATH" - -USER 1001 -ENTRYPOINT [ "kubectl" ] -CMD [ "--help" ] diff --git a/bitnami/kubectl/1.24/debian-11/docker-compose.yml b/bitnami/kubectl/1.24/debian-11/docker-compose.yml deleted file mode 100644 index ceeb6afa74694..0000000000000 --- a/bitnami/kubectl/1.24/debian-11/docker-compose.yml +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright VMware, Inc. -# SPDX-License-Identifier: APACHE-2.0 - -version: '2' -services: - kubectl: - image: docker.io/bitnami/kubectl:1.24 diff --git a/bitnami/kubectl/1.24/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/kubectl/1.24/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json deleted file mode 100644 index 6671d516b53ac..0000000000000 --- a/bitnami/kubectl/1.24/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "kubectl": { - "arch": "amd64", - "distro": "debian-11", - "type": "NAMI", - "version": "1.24.16-2" - } -} \ No newline at end of file diff --git a/bitnami/kubectl/1.24/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/kubectl/1.24/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt deleted file mode 100644 index 76956b38e82c6..0000000000000 --- a/bitnami/kubectl/1.24/debian-11/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.24/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/kubectl/1.24/debian-11/prebuildfs/usr/sbin/install_packages deleted file mode 100755 index acbc3173208c0..0000000000000 --- a/bitnami/kubectl/1.24/debian-11/prebuildfs/usr/sbin/install_packages +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# Copyright VMware, Inc. -# 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.24/debian-11/tags-info.yaml b/bitnami/kubectl/1.24/debian-11/tags-info.yaml deleted file mode 100644 index 66cef74b029ee..0000000000000 --- a/bitnami/kubectl/1.24/debian-11/tags-info.yaml +++ /dev/null @@ -1,4 +0,0 @@ -rolling-tags: -- "1.24" -- 1.24-debian-11 -- 1.24.16