From f385f0ede6af9ee429b25ea9c20094fa4e036ffe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Rodr=C3=ADguez=20Hern=C3=A1ndez?=
 <carlosrh@vmware.com>
Date: Mon, 20 Jun 2022 11:28:27 +0200
Subject: [PATCH] Delete 1.21 directory

---
 bitnami/kubectl/1.21/debian-10/Dockerfile     | 27 -------------------
 .../kubectl/1.21/debian-10/docker-compose.yml |  4 ---
 .../opt/bitnami/.bitnami_components.json      |  9 -------
 .../opt/bitnami/licenses/licenses.txt         |  3 ---
 .../prebuildfs/usr/sbin/install_packages      | 24 -----------------
 bitnami/kubectl/1.21/debian-11/Dockerfile     | 27 -------------------
 .../kubectl/1.21/debian-11/docker-compose.yml |  4 ---
 .../opt/bitnami/.bitnami_components.json      |  9 -------
 .../opt/bitnami/licenses/licenses.txt         |  3 ---
 .../prebuildfs/usr/sbin/install_packages      | 24 -----------------
 10 files changed, 134 deletions(-)
 delete mode 100644 bitnami/kubectl/1.21/debian-10/Dockerfile
 delete mode 100644 bitnami/kubectl/1.21/debian-10/docker-compose.yml
 delete mode 100644 bitnami/kubectl/1.21/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
 delete mode 100644 bitnami/kubectl/1.21/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt
 delete mode 100755 bitnami/kubectl/1.21/debian-10/prebuildfs/usr/sbin/install_packages
 delete mode 100644 bitnami/kubectl/1.21/debian-11/Dockerfile
 delete mode 100644 bitnami/kubectl/1.21/debian-11/docker-compose.yml
 delete mode 100644 bitnami/kubectl/1.21/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
 delete mode 100644 bitnami/kubectl/1.21/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt
 delete mode 100755 bitnami/kubectl/1.21/debian-11/prebuildfs/usr/sbin/install_packages

diff --git a/bitnami/kubectl/1.21/debian-10/Dockerfile b/bitnami/kubectl/1.21/debian-10/Dockerfile
deleted file mode 100644
index b5fd0285378a..000000000000
--- a/bitnami/kubectl/1.21/debian-10/Dockerfile
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM docker.io/bitnami/minideb:buster
-LABEL maintainer "Bitnami <containers@bitnami.com>"
-
-ENV HOME="/" \
-    OS_ARCH="amd64" \
-    OS_FLAVOUR="debian-10" \
-    OS_NAME="linux"
-
-COPY prebuildfs /
-# Install required system packages and dependencies
-RUN install_packages ca-certificates curl git gzip jq procps tar wget
-RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/kubectl-1.21.13-0-linux-amd64-debian-10.tar.gz && \
-    echo "ddc393e492486d7c31e43b2775c89eaf3046de337dad7fe0c50bbb00287458a8  /tmp/bitnami/pkg/cache/kubectl-1.21.13-0-linux-amd64-debian-10.tar.gz" | sha256sum -c - && \
-    tar -zxf /tmp/bitnami/pkg/cache/kubectl-1.21.13-0-linux-amd64-debian-10.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \
-    rm -rf /tmp/bitnami/pkg/cache/kubectl-1.21.13-0-linux-amd64-debian-10.tar.gz
-RUN apt-get update && apt-get upgrade -y && \
-    rm -r /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.21.13" \
-    BITNAMI_APP_NAME="kubectl" \
-    PATH="/opt/bitnami/kubectl/bin:$PATH"
-
-USER 1001
-ENTRYPOINT [ "kubectl" ]
-CMD [ "--help" ]
diff --git a/bitnami/kubectl/1.21/debian-10/docker-compose.yml b/bitnami/kubectl/1.21/debian-10/docker-compose.yml
deleted file mode 100644
index 6e1a1b18b612..000000000000
--- a/bitnami/kubectl/1.21/debian-10/docker-compose.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-version: '2'
-services:
-  kubectl:
-    image: docker.io/bitnami/kubectl:1.21
diff --git a/bitnami/kubectl/1.21/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/kubectl/1.21/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
deleted file mode 100644
index a46e7c982fd2..000000000000
--- a/bitnami/kubectl/1.21/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "kubectl": {
-        "arch": "amd64",
-        "digest": "ddc393e492486d7c31e43b2775c89eaf3046de337dad7fe0c50bbb00287458a8",
-        "distro": "debian-10",
-        "type": "NAMI",
-        "version": "1.21.13-0"
-    }
-}
\ No newline at end of file
diff --git a/bitnami/kubectl/1.21/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/kubectl/1.21/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt
deleted file mode 100644
index c76ba31f3b8a..000000000000
--- a/bitnami/kubectl/1.21/debian-10/prebuildfs/opt/bitnami/licenses/licenses.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Bitnami containers ship with software bundles. You can find the licenses under:
-/opt/bitnami/nami/COPYING
-/opt/bitnami/[name-of-bundle]/licenses/[bundle-version].txt
diff --git a/bitnami/kubectl/1.21/debian-10/prebuildfs/usr/sbin/install_packages b/bitnami/kubectl/1.21/debian-10/prebuildfs/usr/sbin/install_packages
deleted file mode 100755
index c9577647443b..000000000000
--- a/bitnami/kubectl/1.21/debian-10/prebuildfs/usr/sbin/install_packages
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-set -e
-set -u
-export DEBIAN_FRONTEND=noninteractive
-n=0
-max=2
-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
-rm -r /var/lib/apt/lists /var/cache/apt/archives
diff --git a/bitnami/kubectl/1.21/debian-11/Dockerfile b/bitnami/kubectl/1.21/debian-11/Dockerfile
deleted file mode 100644
index adf569d67c47..000000000000
--- a/bitnami/kubectl/1.21/debian-11/Dockerfile
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM docker.io/bitnami/minideb:bullseye
-LABEL maintainer "Bitnami <containers@bitnami.com>"
-
-ENV HOME="/" \
-    OS_ARCH="amd64" \
-    OS_FLAVOUR="debian-11" \
-    OS_NAME="linux"
-
-COPY prebuildfs /
-# Install required system packages and dependencies
-RUN install_packages ca-certificates curl git gzip jq procps tar wget
-RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/kubectl-1.21.14-0-linux-amd64-debian-11.tar.gz && \
-    echo "b3cd5e309a5ece7665bf8c77a57f8c9b6b70c353ddf9670aaf75e84362e953a5  /tmp/bitnami/pkg/cache/kubectl-1.21.14-0-linux-amd64-debian-11.tar.gz" | sha256sum -c - && \
-    tar -zxf /tmp/bitnami/pkg/cache/kubectl-1.21.14-0-linux-amd64-debian-11.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \
-    rm -rf /tmp/bitnami/pkg/cache/kubectl-1.21.14-0-linux-amd64-debian-11.tar.gz
-RUN apt-get update && apt-get upgrade -y && \
-    rm -r /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.21.14" \
-    BITNAMI_APP_NAME="kubectl" \
-    PATH="/opt/bitnami/kubectl/bin:$PATH"
-
-USER 1001
-ENTRYPOINT [ "kubectl" ]
-CMD [ "--help" ]
diff --git a/bitnami/kubectl/1.21/debian-11/docker-compose.yml b/bitnami/kubectl/1.21/debian-11/docker-compose.yml
deleted file mode 100644
index 6e1a1b18b612..000000000000
--- a/bitnami/kubectl/1.21/debian-11/docker-compose.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-version: '2'
-services:
-  kubectl:
-    image: docker.io/bitnami/kubectl:1.21
diff --git a/bitnami/kubectl/1.21/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/kubectl/1.21/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
deleted file mode 100644
index 340106b17b87..000000000000
--- a/bitnami/kubectl/1.21/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "kubectl": {
-        "arch": "amd64",
-        "digest": "b3cd5e309a5ece7665bf8c77a57f8c9b6b70c353ddf9670aaf75e84362e953a5",
-        "distro": "debian-11",
-        "type": "NAMI",
-        "version": "1.21.14-0"
-    }
-}
\ No newline at end of file
diff --git a/bitnami/kubectl/1.21/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/kubectl/1.21/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt
deleted file mode 100644
index c76ba31f3b8a..000000000000
--- a/bitnami/kubectl/1.21/debian-11/prebuildfs/opt/bitnami/licenses/licenses.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Bitnami containers ship with software bundles. You can find the licenses under:
-/opt/bitnami/nami/COPYING
-/opt/bitnami/[name-of-bundle]/licenses/[bundle-version].txt
diff --git a/bitnami/kubectl/1.21/debian-11/prebuildfs/usr/sbin/install_packages b/bitnami/kubectl/1.21/debian-11/prebuildfs/usr/sbin/install_packages
deleted file mode 100755
index c9577647443b..000000000000
--- a/bitnami/kubectl/1.21/debian-11/prebuildfs/usr/sbin/install_packages
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-set -e
-set -u
-export DEBIAN_FRONTEND=noninteractive
-n=0
-max=2
-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
-rm -r /var/lib/apt/lists /var/cache/apt/archives