From 5251ab98425288db194c2afc3013c2f1de406709 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20J=2E=20Salmer=C3=B3n=20Garc=C3=ADa?= Date: Thu, 27 Aug 2026 11:07:46 +0200 Subject: [PATCH] [bitnami/grafana-operator] chore: Remove 5.24 branch and add notice README (#96905) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [TNZ-134723] [bitnami/grafana-operator] chore: :wrench: Remove 5.24 branch and add notice README Remove 5.24 branch definitions and replace with deprecation notice README. ai-assisted=yes Ref: [TNZ-134723](https://vmw-jira.broadcom.net/browse/TNZ-134723) Signed-off-by: Javier J. Salmerón García * [TNZ-134723] chore(grafana-operator): :wrench: Remove folder ai-assisted=no Ref: [TNZ-134723](https://vmw-jira.broadcom.net/browse/TNZ-134723) Signed-off-by: Javier J. Salmerón García --------- Signed-off-by: Javier J. Salmerón García --- .../5.24/debian-12/Dockerfile | 59 ------------------- ...24.0-4-linux-amd64-debian-12.tar.gz.sha256 | 1 - ...24.0-4-linux-arm64-debian-12.tar.gz.sha256 | 1 - .../opt/bitnami/licenses/licenses.txt | 2 - .../prebuildfs/usr/sbin/install_packages | 27 --------- .../debian-12/prebuildfs/usr/sbin/run-script | 24 -------- .../prebuildfs/usr/sbin/uninstall_packages | 26 -------- 7 files changed, 140 deletions(-) delete mode 100644 bitnami/grafana-operator/5.24/debian-12/Dockerfile delete mode 100644 bitnami/grafana-operator/5.24/debian-12/prebuildfs/opt/bitnami/checksums/grafana-operator-5.24.0-4-linux-amd64-debian-12.tar.gz.sha256 delete mode 100644 bitnami/grafana-operator/5.24/debian-12/prebuildfs/opt/bitnami/checksums/grafana-operator-5.24.0-4-linux-arm64-debian-12.tar.gz.sha256 delete mode 100644 bitnami/grafana-operator/5.24/debian-12/prebuildfs/opt/bitnami/licenses/licenses.txt delete mode 100755 bitnami/grafana-operator/5.24/debian-12/prebuildfs/usr/sbin/install_packages delete mode 100755 bitnami/grafana-operator/5.24/debian-12/prebuildfs/usr/sbin/run-script delete mode 100755 bitnami/grafana-operator/5.24/debian-12/prebuildfs/usr/sbin/uninstall_packages diff --git a/bitnami/grafana-operator/5.24/debian-12/Dockerfile b/bitnami/grafana-operator/5.24/debian-12/Dockerfile deleted file mode 100644 index 2e92d4f22055..000000000000 --- a/bitnami/grafana-operator/5.24/debian-12/Dockerfile +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright Broadcom, Inc. All Rights Reserved. -# SPDX-License-Identifier: APACHE-2.0 - -FROM docker.io/bitnami/minideb:bookworm - -ARG DOWNLOADS_URL="https://downloads.bitnami.com/files/stacksmith" -ARG TARGETARCH - -LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2026-08-19T20:44:15Z" \ - org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ - org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/grafana-operator/README.md" \ - org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/grafana-operator" \ - org.opencontainers.image.title="grafana-operator" \ - org.opencontainers.image.vendor="Broadcom, Inc." \ - org.opencontainers.image.version="5.24.0" - -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 procps -RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \ - DOWNLOADS_URL=${SECRET_DOWNLOADS_URL:-${DOWNLOADS_URL}} ; \ - mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \ - COMPONENTS=( \ - "grafana-operator-5.24.0-4-linux-${OS_ARCH}-debian-12" \ - ) ; \ - for COMPONENT in "${COMPONENTS[@]}"; do \ - if [ ! -f "${COMPONENT}.tar.gz" ]; then \ - curl -SsLf "${DOWNLOADS_URL}/${COMPONENT}.tar.gz" -O ; \ - fi ; \ - sha256sum -c "/opt/bitnami/checksums/${COMPONENT}.tar.gz.sha256" ; \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner ; \ - rm -rf "${COMPONENT}".tar.gz ; \ - done ; \ - rm -rf /opt/bitnami/checksums ; -RUN 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 find / -perm /6000 -type f -exec chmod a-s {} \; || true -RUN ln -sf /opt/bitnami/grafana-operator/bin/grafana-operator /usr/local/bin/grafana-operator -RUN mkdir -p /opt/jsonnet && ln -sf /opt/bitnami/grafonnet-lib/grafonnet /opt/jsonnet/grafonnet -RUN uninstall_packages curl - -ENV APP_VERSION="5.24.0" \ - BITNAMI_APP_NAME="grafana-operator" \ - IMAGE_REVISION="6" \ - PATH="/opt/bitnami/grafana-operator/bin:$PATH" - -EXPOSE 8080 - -WORKDIR /opt/bitnami/grafana-operator -USER 1001 -ENTRYPOINT [ "grafana-operator" ] diff --git a/bitnami/grafana-operator/5.24/debian-12/prebuildfs/opt/bitnami/checksums/grafana-operator-5.24.0-4-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/grafana-operator/5.24/debian-12/prebuildfs/opt/bitnami/checksums/grafana-operator-5.24.0-4-linux-amd64-debian-12.tar.gz.sha256 deleted file mode 100644 index ece361cb3cd2..000000000000 --- a/bitnami/grafana-operator/5.24/debian-12/prebuildfs/opt/bitnami/checksums/grafana-operator-5.24.0-4-linux-amd64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -abade48ddd33f943efc4b34d722fc56d60151dbf60f06e9e1a501993d25f2562 grafana-operator-5.24.0-4-linux-amd64-debian-12.tar.gz diff --git a/bitnami/grafana-operator/5.24/debian-12/prebuildfs/opt/bitnami/checksums/grafana-operator-5.24.0-4-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/grafana-operator/5.24/debian-12/prebuildfs/opt/bitnami/checksums/grafana-operator-5.24.0-4-linux-arm64-debian-12.tar.gz.sha256 deleted file mode 100644 index 7e6468837244..000000000000 --- a/bitnami/grafana-operator/5.24/debian-12/prebuildfs/opt/bitnami/checksums/grafana-operator-5.24.0-4-linux-arm64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -2d70bc86332ac274e1ae412f6d1280169c583628ca1b8d8553550e7649a56713 grafana-operator-5.24.0-4-linux-arm64-debian-12.tar.gz diff --git a/bitnami/grafana-operator/5.24/debian-12/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/grafana-operator/5.24/debian-12/prebuildfs/opt/bitnami/licenses/licenses.txt deleted file mode 100644 index 76956b38e82c..000000000000 --- a/bitnami/grafana-operator/5.24/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/grafana-operator/5.24/debian-12/prebuildfs/usr/sbin/install_packages b/bitnami/grafana-operator/5.24/debian-12/prebuildfs/usr/sbin/install_packages deleted file mode 100755 index ccce248b2d14..000000000000 --- a/bitnami/grafana-operator/5.24/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/grafana-operator/5.24/debian-12/prebuildfs/usr/sbin/run-script b/bitnami/grafana-operator/5.24/debian-12/prebuildfs/usr/sbin/run-script deleted file mode 100755 index 0e07c9038dfd..000000000000 --- a/bitnami/grafana-operator/5.24/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/grafana-operator/5.24/debian-12/prebuildfs/usr/sbin/uninstall_packages b/bitnami/grafana-operator/5.24/debian-12/prebuildfs/usr/sbin/uninstall_packages deleted file mode 100755 index 615c430e4e68..000000000000 --- a/bitnami/grafana-operator/5.24/debian-12/prebuildfs/usr/sbin/uninstall_packages +++ /dev/null @@ -1,26 +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 autoremove --purge -y "$@" - ) - 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