From d0314410f457f9492135012bba45f8efd3e9fbf3 Mon Sep 17 00:00:00 2001 From: Chris Burns <29541485+ChrisJBurns@users.noreply.github.com> Date: Thu, 30 May 2024 19:17:07 +0100 Subject: [PATCH] fix: move dependencies to OCI registry (#192) * fix: migrates to bitnami oci registry OCI is the Bitnami recommended registry to use as described in https://blog.bitnami.com/2023/04/httpsblog.bitnami.com202304bitnami-helm-charts-now-oci.html. Signed-off-by: ChrisJBurns <29541485+ChrisJBurns@users.noreply.github.com> * Removes remaining Chart references for Bitnami Signed-off-by: ChrisJBurns <29541485+ChrisJBurns@users.noreply.github.com> * JSON Schema updates Signed-off-by: ChrisJBurns <29541485+ChrisJBurns@users.noreply.github.com> --------- Signed-off-by: ChrisJBurns <29541485+ChrisJBurns@users.noreply.github.com> --- .github/workflows/release.yml | 4 ---- .github/workflows/test.yml | 1 - README.md | 1 - charts/backstage/Chart.lock | 8 ++++---- charts/backstage/Chart.yaml | 8 ++++---- charts/backstage/README.md | 5 ++--- charts/backstage/README.md.gotmpl | 1 - 7 files changed, 10 insertions(+), 18 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c10538b..7d41aff 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,10 +27,6 @@ jobs: git config user.name "$GITHUB_ACTOR" git config user.email "$GITHUB_ACTOR@users.noreply.github.com" - - name: Add dependencies - run: | - helm repo add bitnami https://charts.bitnami.com/bitnami - - name: Run chart-releaser uses: helm/chart-releaser-action@a917fd15b20e8b64b94d9158ad54cd6345335584 # pin@v1.6.0 with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b3015d6..a1ecb41 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -51,7 +51,6 @@ jobs: - name: "Add NGINX Ingress and Bitnami Repository" run: | helm repo add ingress-nginx "https://kubernetes.github.io/ingress-nginx" - helm repo add bitnami "https://charts.bitnami.com/bitnami" helm repo update - name: Run chart-testing (lint) diff --git a/README.md b/README.md index b18376d..ceaa540 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,6 @@ Charts are available in the following formats: The following command can be used to add the chart repository: ```console -helm repo add bitnami https://charts.bitnami.com/bitnami helm repo add backstage https://backstage.github.io/charts ``` diff --git a/charts/backstage/Chart.lock b/charts/backstage/Chart.lock index 7b3dd0b..b88bfa7 100644 --- a/charts/backstage/Chart.lock +++ b/charts/backstage/Chart.lock @@ -1,9 +1,9 @@ dependencies: - name: common - repository: https://charts.bitnami.com/bitnami + repository: oci://registry-1.docker.io/bitnamicharts version: 2.10.0 - name: postgresql - repository: https://charts.bitnami.com/bitnami + repository: oci://registry-1.docker.io/bitnamicharts version: 12.10.0 -digest: sha256:e50e9681e108218aed1e8acaf4877290278a857a785dcd0cd28b92a73f2e8b05 -generated: "2023-09-05T14:49:26.276046+02:00" +digest: sha256:77630aa988cef5e3a9f64a9fc3427345f451534e973dbece805850be587cb59e +generated: "2024-05-11T14:39:32.274594+01:00" diff --git a/charts/backstage/Chart.yaml b/charts/backstage/Chart.yaml index 787ed7d..480c8c0 100644 --- a/charts/backstage/Chart.yaml +++ b/charts/backstage/Chart.yaml @@ -12,14 +12,14 @@ apiVersion: v2 description: A Helm chart for deploying a Backstage application dependencies: - name: common - repository: https://charts.bitnami.com/bitnami + repository: oci://registry-1.docker.io/bitnamicharts tags: - bitnami-common - version: 2.x.x + version: 2.10.0 - condition: postgresql.enabled name: postgresql - repository: https://charts.bitnami.com/bitnami - version: 12.x.x + repository: oci://registry-1.docker.io/bitnamicharts + version: 12.10.0 home: https://backstage.io icon: https://raw.githubusercontent.com/cncf/artwork/master/projects/backstage/icon/color/backstage-icon-color.svg keywords: diff --git a/charts/backstage/README.md b/charts/backstage/README.md index 55e7e55..a56b9ad 100644 --- a/charts/backstage/README.md +++ b/charts/backstage/README.md @@ -31,7 +31,6 @@ Backstage unifies all your infrastructure tooling, services, and documentation t ## TL;DR ```console -helm repo add bitnami https://charts.bitnami.com/bitnami helm repo add backstage https://backstage.github.io/charts helm install my-release backstage/backstage @@ -106,8 +105,8 @@ Kubernetes: `>= 1.19.0-0` | Repository | Name | Version | |------------|------|---------| -| https://charts.bitnami.com/bitnami | common | 2.x.x | -| https://charts.bitnami.com/bitnami | postgresql | 12.x.x | +| oci://registry-1.docker.io/bitnamicharts | common | 2.10.0 | +| oci://registry-1.docker.io/bitnamicharts | postgresql | 12.10.0 | ## Values diff --git a/charts/backstage/README.md.gotmpl b/charts/backstage/README.md.gotmpl index 9111012..0340738 100644 --- a/charts/backstage/README.md.gotmpl +++ b/charts/backstage/README.md.gotmpl @@ -25,7 +25,6 @@ Backstage unifies all your infrastructure tooling, services, and documentation t ## TL;DR ```console -helm repo add bitnami https://charts.bitnami.com/bitnami helm repo add backstage https://backstage.github.io/charts helm install my-release backstage/backstage