From 813c1700c46f8b1f313857ea2b989085dde9eb9a Mon Sep 17 00:00:00 2001 From: Omichi Kenichi Date: Wed, 8 Jul 2026 07:18:52 +0000 Subject: [PATCH 1/2] Use ghcr --- .github/workflows/pull-request.yml | 3 ++- .../apps/edge-app/application-description/margo.yaml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 2281d09..081ca8a 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -93,7 +93,8 @@ jobs: - name: Package and Push Helm Chart run: | OWNER=$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]') - helm package try-margo/plugfest202607/apps/edge-app/helm-chart + cd try-margo/plugfest202607/apps/edge-app/helm-chart + helm package . ls helm push *.tgz oci://ghcr.io/$OWNER diff --git a/try-margo/plugfest202607/apps/edge-app/application-description/margo.yaml b/try-margo/plugfest202607/apps/edge-app/application-description/margo.yaml index e2bce2b..b55850c 100644 --- a/try-margo/plugfest202607/apps/edge-app/application-description/margo.yaml +++ b/try-margo/plugfest202607/apps/edge-app/application-description/margo.yaml @@ -15,7 +15,7 @@ deploymentProfiles: components: - name: edge-app properties: - repository: oci://harbor.machine:8443/library/edge-app-chart + repository: oci://ghcr.io/oomichi-melco/edge-app-chart revision: 1.0.0 wait: true - type: compose From 452048d3e68818d5b0b281263420ebfc6d74c1e9 Mon Sep 17 00:00:00 2001 From: Omichi Kenichi Date: Wed, 8 Jul 2026 07:47:47 +0000 Subject: [PATCH 2/2] Upload application package to ghcr --- .github/workflows/pull-request.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 081ca8a..7b0625c 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -86,6 +86,14 @@ jobs: with: version: 'v3.14.0' # 任意のHelmバージョン + - name: Install oras + run: | + VERSION="1.3.2" + curl -LO "https://github.com/oras-project/oras/releases/download/v${VERSION}/oras_${VERSION}_linux_amd64.tar.gz" + mkdir -p oras-install/ + tar -zxf oras_${VERSION}_*.tar.gz -C oras-install/ + sudo mv oras-install/oras /usr/local/bin/ + - name: Log in to GHCR run: | echo "${{ secrets.GITHUB_TOKEN }}" | helm registry login ghcr.io -u ${{ github.actor }} --password-stdin @@ -98,6 +106,14 @@ jobs: ls helm push *.tgz oci://ghcr.io/$OWNER + - name: Push application package + run: | + OWNER=$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]') + cd try-margo/plugfest202607/apps/edge-app/application-description/ + oras push ghcr.io/$OWNER/edge-app-helm-app-package:latest \ + --artifact-type "application/vnd.margo.app.v1+json" \ + margo.yaml:application/vnd.margo.app.description.v1+yaml + k3s-tests: name: Test helm-chart on k3s runs-on: ubuntu-latest