diff --git a/.github/workflows/helm.yml b/.github/workflows/helm.yml index e78438e47..0d9a62492 100644 --- a/.github/workflows/helm.yml +++ b/.github/workflows/helm.yml @@ -5,9 +5,6 @@ on: branches: - develop -env: - CHART_SUFFIX: "-chart" - jobs: package-helm-chart: name: Package helm chart @@ -46,7 +43,7 @@ jobs: current_version=$(grep '^version:' "$chart_path/Chart.yaml" | awk '{print $2}') # try to get current release version set +e - oras discover ghcr.io/${GITHUB_REPOSITORY@L}/${chart}${CHART_SUFFIX}:${current_version} + oras discover ghcr.io/${GITHUB_REPOSITORY@L}/${chart}:${current_version} oras_exit_code=$? set -e @@ -125,14 +122,14 @@ jobs: helm push ${chart_path} oci://ghcr.io/${GITHUB_REPOSITORY@L} |& tee helm-push-output.log chart_digest=$(awk -F "[, ]+" '/Digest/{print $NF}' < helm-push-output.log) # sign chart - cosign sign "ghcr.io/${GITHUB_REPOSITORY@L}/${chart}${CHART_SUFFIX}@${chart_digest}" + cosign sign "ghcr.io/${GITHUB_REPOSITORY@L}/${chart}@${chart_digest}" # push artifacthub-repo.yml to OCI oras push \ - ghcr.io/${GITHUB_REPOSITORY@L}/${chart}${CHART_SUFFIX}:artifacthub.io \ + ghcr.io/${GITHUB_REPOSITORY@L}/${chart}:artifacthub.io \ --config /dev/null:application/vnd.cncf.artifacthub.config.v1+yaml \ charts/$chart/artifacthub-repo.yml:application/vnd.cncf.artifacthub.repository-metadata.layer.v1.yaml \ |& tee oras-push-output.log artifacthub_digest=$(grep "Digest:" oras-push-output.log | awk '{print $2}') # sign artifacthub-repo.yml - cosign sign "ghcr.io/${GITHUB_REPOSITORY@L}/${chart}${CHART_SUFFIX}:artifacthub.io@${artifacthub_digest}" + cosign sign "ghcr.io/${GITHUB_REPOSITORY@L}/${chart}:artifacthub.io@${artifacthub_digest}" done diff --git a/charts/jellyseerr/Chart.yaml b/charts/jellyseerr/Chart.yaml index 8ae865ca6..48f3893d0 100644 --- a/charts/jellyseerr/Chart.yaml +++ b/charts/jellyseerr/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 kubeVersion: ">=1.23.0-0" -name: jellyseerr +name: jellyseerr-chart description: Jellyseerr helm chart for Kubernetes type: application version: 1.2.0