From 03906736a5f3bd26460a013347c24369bbf8026e Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Thu, 10 Nov 2022 21:13:43 +0100
Subject: [PATCH] [bitnami/kubectl] Release 1.25.4-debian-11-r0 (#13257)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/kubectl/1.25/debian-11/Dockerfile                 | 8 ++++----
 .../prebuildfs/opt/bitnami/.bitnami_components.json       | 4 ++--
 bitnami/kubectl/1.25/debian-11/tags-info.yaml             | 2 +-
 bitnami/kubectl/README.md                                 | 4 ++++
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/bitnami/kubectl/1.25/debian-11/Dockerfile b/bitnami/kubectl/1.25/debian-11/Dockerfile
index 824a05ab32dc..5afbf4e84324 100644
--- a/bitnami/kubectl/1.25/debian-11/Dockerfile
+++ b/bitnami/kubectl/1.25/debian-11/Dockerfile
@@ -4,11 +4,11 @@ ARG TARGETARCH
 
 LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
       org.opencontainers.image.description="Application packaged by Bitnami" \
-      org.opencontainers.image.ref.name="1.25.3-debian-11-r9" \
+      org.opencontainers.image.ref.name="1.25.4-debian-11-r0" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/kubectl" \
       org.opencontainers.image.title="kubectl" \
       org.opencontainers.image.vendor="VMware, Inc." \
-      org.opencontainers.image.version="1.25.3"
+      org.opencontainers.image.version="1.25.4"
 
 ENV HOME="/" \
     OS_ARCH="${TARGETARCH:-amd64}" \
@@ -21,7 +21,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl git jq procps
 RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
     COMPONENTS=( \
-      "kubectl-1.25.3-0-linux-${OS_ARCH}-debian-11" \
+      "kubectl-1.25.4-0-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -38,7 +38,7 @@ RUN apt-get autoremove --purge -y curl && \
 RUN chmod g+rwX /opt/bitnami
 RUN mkdir /.kube && chmod g+rwX /.kube
 
-ENV APP_VERSION="1.25.3" \
+ENV APP_VERSION="1.25.4" \
     BITNAMI_APP_NAME="kubectl" \
     PATH="/opt/bitnami/kubectl/bin:$PATH"
 
diff --git a/bitnami/kubectl/1.25/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/kubectl/1.25/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 1783bf23e279..7867f08270c6 100644
--- a/bitnami/kubectl/1.25/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/kubectl/1.25/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -1,9 +1,9 @@
 {
     "kubectl": {
         "arch": "amd64",
-        "digest": "425af8124080796b0077bdd365fc3f1ce85f8151f4abdf7bd00b28fee749ca17",
+        "digest": "d99e89e92f748f97474a2b5e39022efb3510c76c36e31d873baa801a01fd49a9",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.25.3-0"
+        "version": "1.25.4-0"
     }
 }
\ No newline at end of file
diff --git a/bitnami/kubectl/1.25/debian-11/tags-info.yaml b/bitnami/kubectl/1.25/debian-11/tags-info.yaml
index 599dead725ce..1bd1709547b4 100644
--- a/bitnami/kubectl/1.25/debian-11/tags-info.yaml
+++ b/bitnami/kubectl/1.25/debian-11/tags-info.yaml
@@ -1,5 +1,5 @@
 rolling-tags:
   - "1.25"
   - "1.25-debian-11"
-  - "1.25.3"
+  - "1.25.4"
   - "latest"
diff --git a/bitnami/kubectl/README.md b/bitnami/kubectl/README.md
index 0375e55f392c..d2e7b8d701b2 100644
--- a/bitnami/kubectl/README.md
+++ b/bitnami/kubectl/README.md
@@ -73,6 +73,10 @@ It's possible to load your own configuration, which is useful if you want to con
 $ docker run --rm --name kubectl -v /path/to/your/kube/config:/.kube/config bitnami/kubectl:latest
 ```
 
+## Branch Deprecation Notice
+
+Kubectl's branch 1.22 is no longer maintained by upstream and is now internally tagged as to be deprecated. This branch will no longer be released in our catalog a month after this notice is published, but already released container images will still persist in the registries. Valid to be removed starting on: 12-09-2022
+
 ## Contributing
 
 We'd love for you to contribute to this container. You can request new features by creating an [issue](https://github.com/bitnami/containers/issues) or submitting a [pull request](https://github.com/bitnami/containers/pulls) with your contribution.