From acf245b03a3acca60796d6976515b5fef58f5d13 Mon Sep 17 00:00:00 2001 From: reggie-k Date: Sun, 10 Aug 2025 16:13:40 +0300 Subject: [PATCH 1/4] removed references from all the images except for astra healthcheck Signed-off-by: reggie-k --- .../testdata/helm-with-local-dependency/.argocd-helm-dep-up | 1 + .../RabbitmqCluster/testdata/degraded_badconfig.yaml | 2 +- .../RabbitmqCluster/testdata/degraded_cluster_unknown.yaml | 2 +- .../RabbitmqCluster/testdata/degraded_replicas_unknown.yaml | 2 +- .../rabbitmq.com/RabbitmqCluster/testdata/healthy.yaml | 2 +- .../testdata/progressing_cluster_unavailable.yaml | 2 +- .../RabbitmqCluster/testdata/progressing_no_status.yaml | 2 +- .../RabbitmqCluster/testdata/progressing_pods_not_ready.yaml | 2 +- test/container/Dockerfile | 2 +- util/helm/testdata/dependency/values.yaml | 2 +- util/helm/testdata/redis/README.md | 4 ++-- util/helm/testdata/redis/values-production.yaml | 2 +- util/helm/testdata/redis/values.yaml | 2 +- 13 files changed, 14 insertions(+), 13 deletions(-) create mode 100644 reposerver/repository/testdata/helm-with-local-dependency/.argocd-helm-dep-up diff --git a/reposerver/repository/testdata/helm-with-local-dependency/.argocd-helm-dep-up b/reposerver/repository/testdata/helm-with-local-dependency/.argocd-helm-dep-up new file mode 100644 index 0000000000000..ae5cd50af9a31 --- /dev/null +++ b/reposerver/repository/testdata/helm-with-local-dependency/.argocd-helm-dep-up @@ -0,0 +1 @@ +marker \ No newline at end of file diff --git a/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/degraded_badconfig.yaml b/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/degraded_badconfig.yaml index 29b03cb406ccb..034efd6b49411 100644 --- a/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/degraded_badconfig.yaml +++ b/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/degraded_badconfig.yaml @@ -6,7 +6,7 @@ metadata: name: example-rabbitmq namespace: example spec: - image: docker.io/bitnami/rabbitmq:3.10.7-debian-11-r8 + image: docker.io/bitnamilegacy/rabbitmq:3.10.7-debian-11-r8 persistence: storage: 32Gi storageClassName: default diff --git a/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/degraded_cluster_unknown.yaml b/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/degraded_cluster_unknown.yaml index 86b7be4bd468b..b5b224f8d962c 100644 --- a/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/degraded_cluster_unknown.yaml +++ b/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/degraded_cluster_unknown.yaml @@ -6,7 +6,7 @@ metadata: name: example-rabbitmq namespace: example spec: - image: docker.io/bitnami/rabbitmq:3.10.7-debian-11-r8 + image: docker.io/bitnamilegacy/rabbitmq:3.10.7-debian-11-r8 persistence: storage: 32Gi storageClassName: default diff --git a/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/degraded_replicas_unknown.yaml b/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/degraded_replicas_unknown.yaml index f92f5afd66d17..0b43a9d7c49ed 100644 --- a/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/degraded_replicas_unknown.yaml +++ b/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/degraded_replicas_unknown.yaml @@ -6,7 +6,7 @@ metadata: name: example-rabbitmq namespace: example spec: - image: docker.io/bitnami/rabbitmq:3.10.7-debian-11-r8 + image: docker.io/bitnamilegacy/rabbitmq:3.10.7-debian-11-r8 persistence: storage: 32Gi storageClassName: default diff --git a/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/healthy.yaml b/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/healthy.yaml index b436fba2bce26..c8d97a02cb7f0 100644 --- a/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/healthy.yaml +++ b/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/healthy.yaml @@ -6,7 +6,7 @@ metadata: name: example-rabbitmq namespace: example spec: - image: docker.io/bitnami/rabbitmq:3.10.7-debian-11-r8 + image: docker.io/bitnamilegacy/rabbitmq:3.10.7-debian-11-r8 persistence: storage: 32Gi storageClassName: default diff --git a/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/progressing_cluster_unavailable.yaml b/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/progressing_cluster_unavailable.yaml index b01d9f52e2874..0c9fc617c9377 100644 --- a/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/progressing_cluster_unavailable.yaml +++ b/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/progressing_cluster_unavailable.yaml @@ -6,7 +6,7 @@ metadata: name: example-rabbitmq namespace: example spec: - image: docker.io/bitnami/rabbitmq:3.10.7-debian-11-r8 + image: docker.io/bitnamilegacy/rabbitmq:3.10.7-debian-11-r8 persistence: storage: 32Gi storageClassName: default diff --git a/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/progressing_no_status.yaml b/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/progressing_no_status.yaml index b1ef1afe03562..14e6b8505e6fd 100644 --- a/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/progressing_no_status.yaml +++ b/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/progressing_no_status.yaml @@ -6,7 +6,7 @@ metadata: name: example-rabbitmq namespace: example spec: - image: docker.io/bitnami/rabbitmq:3.10.7-debian-11-r8 + image: docker.io/bitnamilegacy/rabbitmq:3.10.7-debian-11-r8 persistence: storage: 32Gi storageClassName: default diff --git a/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/progressing_pods_not_ready.yaml b/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/progressing_pods_not_ready.yaml index 0cbbb2d050250..296c365be7f68 100644 --- a/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/progressing_pods_not_ready.yaml +++ b/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/progressing_pods_not_ready.yaml @@ -6,7 +6,7 @@ metadata: name: example-rabbitmq namespace: example spec: - image: docker.io/bitnami/rabbitmq:3.10.7-debian-11-r8 + image: docker.io/bitnamilegacy/rabbitmq:3.10.7-debian-11-r8 persistence: storage: 32Gi storageClassName: default diff --git a/test/container/Dockerfile b/test/container/Dockerfile index 14d5e5e8e4c1c..1ca2d21e52183 100644 --- a/test/container/Dockerfile +++ b/test/container/Dockerfile @@ -12,7 +12,7 @@ FROM docker.io/library/golang:1.24.1@sha256:c5adecdb7b3f8c5ca3c88648a861882849cc FROM docker.io/library/registry:2.8@sha256:543dade69668e02e5768d7ea2b0aa4fae6aa7384c9a5a8dbecc2be5136079ddb AS registry -FROM docker.io/bitnami/kubectl:1.32@sha256:493d1b871556d48d6b25d471f192c2427571cd6f78523eebcaf4d263353c7487 AS kubectl +FROM docker.io/bitnamilegacy/kubectl:1.32@sha256:493d1b871556d48d6b25d471f192c2427571cd6f78523eebcaf4d263353c7487 AS kubectl FROM docker.io/library/ubuntu:25.04@sha256:10bb10bb062de665d4dc3e0ea36715270ead632cfcb74d08ca2273712a0dfb42 diff --git a/util/helm/testdata/dependency/values.yaml b/util/helm/testdata/dependency/values.yaml index 9f7f1e8b3cccb..8f59d97ba1e02 100644 --- a/util/helm/testdata/dependency/values.yaml +++ b/util/helm/testdata/dependency/values.yaml @@ -3,7 +3,7 @@ ## image: registry: docker.io - repository: bitnami/wordpress + repository: bitnamilegacy/wordpress tag: 4.9.8-debian-9 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' diff --git a/util/helm/testdata/redis/README.md b/util/helm/testdata/redis/README.md index a17fb83b2e619..4de556ccc367c 100644 --- a/util/helm/testdata/redis/README.md +++ b/util/helm/testdata/redis/README.md @@ -52,7 +52,7 @@ The following table lists the configurable parameters of the Redis chart and the | Parameter | Description | Default | |--------------------------------------------|----------------------------------------------------------------------------------------------------------------|--------------------------------------| | `image.registry` | Redis Image registry | `docker.io` | -| `image.repository` | Redis Image name | `bitnami/redis` | +| `image.repository` | Redis Image name | `bitnamilegacy/redis` | | `image.tag` | Redis Image tag | `{VERSION}` | | `image.pullPolicy` | Image pull policy | `Always` | | `image.pullSecrets` | Specify docker-registry secret names as an array | `nil` | @@ -69,7 +69,7 @@ The following table lists the configurable parameters of the Redis chart and the | `rbac.role.rules` | Rules to create | `[]` | | `metrics.enabled` | Start a side-car prometheus exporter | `false` | | `metrics.image.registry` | Redis exporter image registry | `docker.io` | -| `metrics.image.repository` | Redis exporter image name | `bitnami/redis` | +| `metrics.image.repository` | Redis exporter image name | `bitnamilegacy/redis` | | `metrics.image.tag` | Redis exporter image tag | `v0.20.2` | | `metrics.image.pullPolicy` | Image pull policy | `IfNotPresent` | | `metrics.image.pullSecrets` | Specify docker-registry secret names as an array | `nil` | diff --git a/util/helm/testdata/redis/values-production.yaml b/util/helm/testdata/redis/values-production.yaml index 07a108153380c..ec30c0f7f9b0c 100644 --- a/util/helm/testdata/redis/values-production.yaml +++ b/util/helm/testdata/redis/values-production.yaml @@ -3,7 +3,7 @@ ## image: registry: docker.io - repository: bitnami/redis + repository: bitnamilegacy/redis tag: 4.0.10-debian-9 pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. diff --git a/util/helm/testdata/redis/values.yaml b/util/helm/testdata/redis/values.yaml index 9ec7bce636ad1..0097453e8e385 100644 --- a/util/helm/testdata/redis/values.yaml +++ b/util/helm/testdata/redis/values.yaml @@ -3,7 +3,7 @@ ## image: registry: docker.io - repository: bitnami/redis + repository: bitnamilegacy/redis tag: 4.0.10-debian-9 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' From 306dd0b937c8cc2c5e7f667bd18e90df7e79c2da Mon Sep 17 00:00:00 2001 From: reggie-k Date: Sun, 10 Aug 2025 16:30:57 +0300 Subject: [PATCH 2/4] removed reposerver/repository/testdata/helm-with-local-dependency/.argocd-helm-dep-up Signed-off-by: reggie-k --- .../testdata/helm-with-local-dependency/.argocd-helm-dep-up | 1 - 1 file changed, 1 deletion(-) delete mode 100644 reposerver/repository/testdata/helm-with-local-dependency/.argocd-helm-dep-up diff --git a/reposerver/repository/testdata/helm-with-local-dependency/.argocd-helm-dep-up b/reposerver/repository/testdata/helm-with-local-dependency/.argocd-helm-dep-up deleted file mode 100644 index ae5cd50af9a31..0000000000000 --- a/reposerver/repository/testdata/helm-with-local-dependency/.argocd-helm-dep-up +++ /dev/null @@ -1 +0,0 @@ -marker \ No newline at end of file From dd2d5e613f7c58bfc550618a5fdfb1d7a310e083 Mon Sep 17 00:00:00 2001 From: reggie-k Date: Sun, 10 Aug 2025 16:55:34 +0300 Subject: [PATCH 3/4] reverted health check references since they are treated as text Signed-off-by: reggie-k --- .../RabbitmqCluster/testdata/degraded_badconfig.yaml | 2 +- .../RabbitmqCluster/testdata/degraded_cluster_unknown.yaml | 2 +- .../RabbitmqCluster/testdata/degraded_replicas_unknown.yaml | 2 +- .../rabbitmq.com/RabbitmqCluster/testdata/healthy.yaml | 2 +- .../testdata/progressing_cluster_unavailable.yaml | 2 +- .../RabbitmqCluster/testdata/progressing_no_status.yaml | 2 +- .../RabbitmqCluster/testdata/progressing_pods_not_ready.yaml | 2 +- util/helm/testdata/redis/Chart.yaml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/degraded_badconfig.yaml b/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/degraded_badconfig.yaml index 034efd6b49411..29b03cb406ccb 100644 --- a/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/degraded_badconfig.yaml +++ b/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/degraded_badconfig.yaml @@ -6,7 +6,7 @@ metadata: name: example-rabbitmq namespace: example spec: - image: docker.io/bitnamilegacy/rabbitmq:3.10.7-debian-11-r8 + image: docker.io/bitnami/rabbitmq:3.10.7-debian-11-r8 persistence: storage: 32Gi storageClassName: default diff --git a/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/degraded_cluster_unknown.yaml b/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/degraded_cluster_unknown.yaml index b5b224f8d962c..86b7be4bd468b 100644 --- a/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/degraded_cluster_unknown.yaml +++ b/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/degraded_cluster_unknown.yaml @@ -6,7 +6,7 @@ metadata: name: example-rabbitmq namespace: example spec: - image: docker.io/bitnamilegacy/rabbitmq:3.10.7-debian-11-r8 + image: docker.io/bitnami/rabbitmq:3.10.7-debian-11-r8 persistence: storage: 32Gi storageClassName: default diff --git a/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/degraded_replicas_unknown.yaml b/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/degraded_replicas_unknown.yaml index 0b43a9d7c49ed..f92f5afd66d17 100644 --- a/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/degraded_replicas_unknown.yaml +++ b/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/degraded_replicas_unknown.yaml @@ -6,7 +6,7 @@ metadata: name: example-rabbitmq namespace: example spec: - image: docker.io/bitnamilegacy/rabbitmq:3.10.7-debian-11-r8 + image: docker.io/bitnami/rabbitmq:3.10.7-debian-11-r8 persistence: storage: 32Gi storageClassName: default diff --git a/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/healthy.yaml b/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/healthy.yaml index c8d97a02cb7f0..b436fba2bce26 100644 --- a/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/healthy.yaml +++ b/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/healthy.yaml @@ -6,7 +6,7 @@ metadata: name: example-rabbitmq namespace: example spec: - image: docker.io/bitnamilegacy/rabbitmq:3.10.7-debian-11-r8 + image: docker.io/bitnami/rabbitmq:3.10.7-debian-11-r8 persistence: storage: 32Gi storageClassName: default diff --git a/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/progressing_cluster_unavailable.yaml b/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/progressing_cluster_unavailable.yaml index 0c9fc617c9377..b01d9f52e2874 100644 --- a/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/progressing_cluster_unavailable.yaml +++ b/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/progressing_cluster_unavailable.yaml @@ -6,7 +6,7 @@ metadata: name: example-rabbitmq namespace: example spec: - image: docker.io/bitnamilegacy/rabbitmq:3.10.7-debian-11-r8 + image: docker.io/bitnami/rabbitmq:3.10.7-debian-11-r8 persistence: storage: 32Gi storageClassName: default diff --git a/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/progressing_no_status.yaml b/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/progressing_no_status.yaml index 14e6b8505e6fd..b1ef1afe03562 100644 --- a/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/progressing_no_status.yaml +++ b/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/progressing_no_status.yaml @@ -6,7 +6,7 @@ metadata: name: example-rabbitmq namespace: example spec: - image: docker.io/bitnamilegacy/rabbitmq:3.10.7-debian-11-r8 + image: docker.io/bitnami/rabbitmq:3.10.7-debian-11-r8 persistence: storage: 32Gi storageClassName: default diff --git a/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/progressing_pods_not_ready.yaml b/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/progressing_pods_not_ready.yaml index 296c365be7f68..0cbbb2d050250 100644 --- a/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/progressing_pods_not_ready.yaml +++ b/resource_customizations/rabbitmq.com/RabbitmqCluster/testdata/progressing_pods_not_ready.yaml @@ -6,7 +6,7 @@ metadata: name: example-rabbitmq namespace: example spec: - image: docker.io/bitnamilegacy/rabbitmq:3.10.7-debian-11-r8 + image: docker.io/bitnami/rabbitmq:3.10.7-debian-11-r8 persistence: storage: 32Gi storageClassName: default diff --git a/util/helm/testdata/redis/Chart.yaml b/util/helm/testdata/redis/Chart.yaml index 4da50281f7a3e..b67292266e759 100644 --- a/util/helm/testdata/redis/Chart.yaml +++ b/util/helm/testdata/redis/Chart.yaml @@ -10,7 +10,7 @@ keywords: home: http://redis.io/ icon: https://bitnami.com/assets/stacks/redis/img/redis-stack-220x234.png sources: -- https://github.com/bitnami/bitnami-docker-redis +- 12311212121212https://github.com/bitnami/bitnami-docker-redis maintainers: - name: bitnami-bot email: containers@bitnami.com From 5fdcf96ee3681bf5d27354b746d21fc0b69e2bba Mon Sep 17 00:00:00 2001 From: reggie-k Date: Mon, 11 Aug 2025 13:04:18 +0300 Subject: [PATCH 4/4] reverted health check references since they are treated as text Signed-off-by: reggie-k --- util/helm/testdata/redis/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/helm/testdata/redis/Chart.yaml b/util/helm/testdata/redis/Chart.yaml index b67292266e759..4da50281f7a3e 100644 --- a/util/helm/testdata/redis/Chart.yaml +++ b/util/helm/testdata/redis/Chart.yaml @@ -10,7 +10,7 @@ keywords: home: http://redis.io/ icon: https://bitnami.com/assets/stacks/redis/img/redis-stack-220x234.png sources: -- 12311212121212https://github.com/bitnami/bitnami-docker-redis +- https://github.com/bitnami/bitnami-docker-redis maintainers: - name: bitnami-bot email: containers@bitnami.com