Skip to content

Commit b7e40d1

Browse files
committed
correct chart name to "chart" consistently
On-behalf-of: Gerald Morrison (SAP) <gerald.morrison@sap.com> Signed-off-by: Gerald Morrison (SAP) <gerald.morrison@sap.com>
1 parent 15144bf commit b7e40d1

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

.github/workflows/controller-release.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ jobs:
148148
body_path: ${{ runner.temp }}/CHANGELOG.md
149149
fail_on_unmatched_files: true
150150
prerelease: true
151-
files: ${{ runner.temp }}/assets/ocm-k8s-toolkit-*.tgz
151+
files: ${{ runner.temp }}/assets/chart-*.tgz
152152

153153
- name: Summarize RC release
154154
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
@@ -224,7 +224,7 @@ jobs:
224224
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
225225
CHART_DIGEST: ${{ needs.build.outputs.chart_digest }}
226226
run: |
227-
CHART_REPO="${{ env.REGISTRY }}/${{ github.repository_owner }}/kubernetes/controller/chart/ocm-k8s-toolkit"
227+
CHART_REPO="${{ env.REGISTRY }}/${{ github.repository_owner }}/kubernetes/controller/chart"
228228
gh attestation verify "oci://${CHART_REPO}@${CHART_DIGEST}" --repo "${{ github.repository }}"
229229
230230
# ---------------------------------------------------------------------------
@@ -346,22 +346,22 @@ jobs:
346346
IMAGE_DIGEST: ${{ needs.build.outputs.image_digest }}
347347
run: |
348348
task helm/package VERSION="${VERSION}" APP_VERSION="${VERSION}" IMAGE_DIGEST="${IMAGE_DIGEST}"
349-
helm push dist/ocm-k8s-toolkit-${VERSION}.tgz oci://${{ env.REGISTRY }}/${{ github.repository_owner }}/kubernetes/controller/chart
349+
helm push dist/chart-${VERSION}.tgz oci://${{ env.REGISTRY }}/${{ github.repository_owner }}/kubernetes/controller
350350
351351
- name: Resolve chart digest
352352
id: chart-digest
353353
env:
354354
VERSION: ${{ needs.prepare.outputs.base_version }}
355355
run: |
356-
CHART_REPO="${{ env.REGISTRY }}/${{ github.repository_owner }}/kubernetes/controller/chart/ocm-k8s-toolkit"
356+
CHART_REPO="${{ env.REGISTRY }}/${{ github.repository_owner }}/kubernetes/controller/chart"
357357
echo "digest=$(oras resolve ${CHART_REPO}:${VERSION})" >> "$GITHUB_OUTPUT"
358358
359359
- name: Attest final chart
360360
uses: actions/attest-build-provenance@977bb373ede98d70efdf65b84cb5f73e068dcc2a # v3
361361
with:
362362
github-token: ${{ secrets.GITHUB_TOKEN }}
363363
subject-digest: ${{ steps.chart-digest.outputs.digest }}
364-
subject-name: ${{ env.REGISTRY }}/${{ github.repository_owner }}/kubernetes/controller/chart/ocm-k8s-toolkit
364+
subject-name: ${{ env.REGISTRY }}/${{ github.repository_owner }}/kubernetes/controller/chart
365365
push-to-registry: true
366366

367367
- name: Get RC release notes
@@ -378,7 +378,7 @@ jobs:
378378
FINAL_TAG: ${{ needs.prepare.outputs.promotion_tag }}
379379
FINAL_VERSION: ${{ needs.prepare.outputs.base_version }}
380380
IMAGE_REPO: ${{ env.REGISTRY }}/${{ github.repository_owner }}/kubernetes/controller
381-
CHART_REPO: ${{ env.REGISTRY }}/${{ github.repository_owner }}/kubernetes/controller/chart/ocm-k8s-toolkit
381+
CHART_REPO: ${{ env.REGISTRY }}/${{ github.repository_owner }}/kubernetes/controller/chart
382382
IMAGE_DIGEST: ${{ needs.build.outputs.image_digest }}
383383
CHART_DIR: ${{ env.COMPONENT_PATH }}/dist
384384
NOTES_FILE: ${{ runner.temp }}/CHANGELOG.md

.github/workflows/kubernetes-controller.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -365,29 +365,29 @@ jobs:
365365
IMAGE_DIGEST: ${{ steps.image-digest.outputs.digest }}
366366
run: |
367367
task helm/package VERSION="${VERSION}" APP_VERSION="${VERSION}" IMAGE_DIGEST="${IMAGE_DIGEST}"
368-
helm push dist/ocm-k8s-toolkit-${VERSION}.tgz oci://${{ env.REGISTRY }}/${{ github.repository_owner }}/kubernetes/controller/chart
368+
helm push dist/chart-${VERSION}.tgz oci://${{ env.REGISTRY }}/${{ github.repository_owner }}/kubernetes/controller
369369
370370
- name: Resolve chart digest
371371
id: chart-digest
372372
env:
373373
VERSION: ${{ needs.build.outputs.version }}
374374
run: |
375-
CHART_REPO="${{ env.REGISTRY }}/${{ github.repository_owner }}/kubernetes/controller/chart/ocm-k8s-toolkit"
375+
CHART_REPO="${{ env.REGISTRY }}/${{ github.repository_owner }}/kubernetes/controller/chart"
376376
echo "digest=$(oras resolve ${CHART_REPO}:${VERSION})" >> "$GITHUB_OUTPUT"
377377
378378
- name: Attest chart
379379
uses: actions/attest-build-provenance@977bb373ede98d70efdf65b84cb5f73e068dcc2a # v3
380380
with:
381381
github-token: ${{ secrets.GITHUB_TOKEN }}
382382
subject-digest: ${{ steps.chart-digest.outputs.digest }}
383-
subject-name: ${{ env.REGISTRY }}/${{ github.repository_owner }}/kubernetes/controller/chart/ocm-k8s-toolkit
383+
subject-name: ${{ env.REGISTRY }}/${{ github.repository_owner }}/kubernetes/controller/chart
384384
push-to-registry: true
385385

386386
- name: Upload chart artifact
387387
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
388388
with:
389389
name: controller-chart-${{ needs.build.outputs.version }}
390-
path: ${{ env.LOCATION }}/dist/ocm-k8s-toolkit-*.tgz
390+
path: ${{ env.LOCATION }}/dist/chart-*.tgz
391391
if-no-files-found: error
392392

393393
- name: Generate OCM component constructor
@@ -416,7 +416,7 @@ jobs:
416416
type: helmChart
417417
access:
418418
type: ociArtifact
419-
imageReference: ${REGISTRY}/${GITHUB_REPOSITORY_OWNER}/kubernetes/controller/chart/ocm-k8s-toolkit:${VERSION}
419+
imageReference: ${REGISTRY}/${GITHUB_REPOSITORY_OWNER}/kubernetes/controller/chart:${VERSION}
420420
EOF
421421
422422
- name: Upload OCM publish artifacts

0 commit comments

Comments
 (0)