From 753824a0acf4677e114e44566625234aa1ed75f1 Mon Sep 17 00:00:00 2001 From: Harry Waye Date: Tue, 20 Dec 2022 11:41:10 +0000 Subject: [PATCH] chore(bitnami): use the pre-2022 bitnami repo index.yaml Bitnami did a bit of a size reduction of their index.yaml for their Helm repo in the last day or so: https://github.com/bitnami/charts/pull/14024 We previously changed to using pre-2022 for other charts that fell out of the [6 month retention policy](https://github.com/bitnami/charts/issues/10539) but not for all. Looks like a few more have now dropped on of the main index so I'm changing all to use the github hosted pre-2022 index. We should actually update these charts at some point, but given these will likely be major upgrades I'm not doing it for now. My main aim is to get back to a point where we can release our chart, currently CI chart-releaser is failing. --- .github/workflows/release-chart.yml | 1 - charts/posthog/Chart.lock | 10 +++++----- charts/posthog/Chart.yaml | 6 +++--- ci/kubetest/helpers/utils.py | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release-chart.yml b/.github/workflows/release-chart.yml index 5134748db..9e89e1738 100644 --- a/.github/workflows/release-chart.yml +++ b/.github/workflows/release-chart.yml @@ -38,7 +38,6 @@ jobs: - name: Add helm repositories run: | - helm repo add bitnami https://charts.bitnami.com/bitnami helm repo add bitnami-pre-2022 https://raw.githubusercontent.com/bitnami/charts/pre-2022/bitnami helm repo add kubernetes https://kubernetes.github.io/ingress-nginx helm repo add jetstack https://charts.jetstack.io diff --git a/charts/posthog/Chart.lock b/charts/posthog/Chart.lock index 61cf91937..6b3d8db6b 100644 --- a/charts/posthog/Chart.lock +++ b/charts/posthog/Chart.lock @@ -6,16 +6,16 @@ dependencies: repository: https://kubernetes.github.io/ingress-nginx version: 4.0.13 - name: kafka - repository: https://charts.bitnami.com/bitnami + repository: https://raw.githubusercontent.com/bitnami/charts/pre-2022/bitnami version: 14.9.3 - name: minio - repository: https://charts.bitnami.com/bitnami + repository: https://raw.githubusercontent.com/bitnami/charts/pre-2022/bitnami version: 11.3.5 - name: postgresql repository: https://raw.githubusercontent.com/bitnami/charts/pre-2022/bitnami version: 8.6.1 - name: redis - repository: https://charts.bitnami.com/bitnami + repository: https://raw.githubusercontent.com/bitnami/charts/pre-2022/bitnami version: 16.8.9 - name: zookeeper repository: https://raw.githubusercontent.com/bitnami/charts/pre-2022/bitnami @@ -44,5 +44,5 @@ dependencies: - name: prometheus-statsd-exporter repository: https://prometheus-community.github.io/helm-charts version: 0.3.1 -digest: sha256:2cfffe0d2d6df0b3c43983b18ecd517ba71ff31bab91901037b51d64dee74eb0 -generated: "2022-11-15T10:43:43.316599+01:00" +digest: sha256:5ac223659ced28c44ff2c89963e0268427f848b5d4db98df9b8f1010f22f8207 +generated: "2022-12-20T11:35:36.888806538Z" diff --git a/charts/posthog/Chart.yaml b/charts/posthog/Chart.yaml index baa4d0771..622f2585e 100644 --- a/charts/posthog/Chart.yaml +++ b/charts/posthog/Chart.yaml @@ -30,12 +30,12 @@ dependencies: - name: kafka version: 14.9.3 - repository: https://charts.bitnami.com/bitnami + repository: https://raw.githubusercontent.com/bitnami/charts/pre-2022/bitnami condition: kafka.enabled - name: minio version: 11.3.5 - repository: https://charts.bitnami.com/bitnami + repository: https://raw.githubusercontent.com/bitnami/charts/pre-2022/bitnami condition: minio.enabled - name: postgresql @@ -45,7 +45,7 @@ dependencies: - name: redis version: 16.8.9 - repository: https://charts.bitnami.com/bitnami + repository: https://raw.githubusercontent.com/bitnami/charts/pre-2022/bitnami condition: redis.enabled - name: zookeeper diff --git a/ci/kubetest/helpers/utils.py b/ci/kubetest/helpers/utils.py index a34def7da..cfe72dcb8 100644 --- a/ci/kubetest/helpers/utils.py +++ b/ci/kubetest/helpers/utils.py @@ -255,7 +255,7 @@ def exec_subprocess(cmd, ignore_errors=False): def install_external_kafka(namespace=NAMESPACE): log.debug("🔄 Setting up external Kafka...") cmd = """ - helm repo add bitnami https://charts.bitnami.com/bitnami && \ + helm repo add bitnami https://raw.githubusercontent.com/bitnami/charts/pre-2022/bitnami && \ helm upgrade --install \ --namespace {namespace} \ kafka bitnami/kafka \