From b6c93c20c2de7debf183f22a7a596ef10a28b19d Mon Sep 17 00:00:00 2001 From: yy Date: Thu, 16 Nov 2023 15:08:27 +0800 Subject: [PATCH] pref: offline tar support arm64. Signed-off-by: yy --- .github/workflows/cloud-release.yml | 30 +++++++++++++++++++++++++---- controllers/admission/go.mod | 1 + controllers/admission/go.sum | 2 ++ scripts/cloud/build-offline-tar.sh | 7 ++++--- 4 files changed, 33 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cloud-release.yml b/.github/workflows/cloud-release.yml index 13f6b707c..6fc8bf2b9 100644 --- a/.github/workflows/cloud-release.yml +++ b/.github/workflows/cloud-release.yml @@ -49,7 +49,7 @@ jobs: build_from: ${{ github.event.release.tag_name }} secrets: inherit - release-offline-tar: + release-amd-offline-tar: needs: - release-cloud runs-on: ubuntu-latest @@ -57,7 +57,7 @@ jobs: - name: Checkout uses: actions/checkout@v3 - name: Build - run: export CLOUD_VERSION=${{ github.event.release.tag_name }} && bash ./scripts/cloud/build-offline-tar.sh + run: export CLOUD_VERSION=${{ github.event.release.tag_name }} && export ARCH=amd64 && bash ./scripts/cloud/build-offline-tar.sh - name: Setup ossutil uses: manyuanrong/setup-ossutil@v2.0 with: @@ -68,5 +68,27 @@ jobs: run: cat ./sealos-cloud.tar.gz.md5 - name: Upload run: | - ossutil cp ./sealos-cloud.tar.gz oss://${{ secrets.OSS_BUCKET }}/cloud/sealos-cloud-${{ github.event.release.tag_name }}.tar.gz - ossutil cp ./sealos-cloud.tar.gz.md5 oss://${{ secrets.OSS_BUCKET }}/cloud/sealos-cloud-${{ github.event.release.tag_name }}.tar.gz.md5 \ No newline at end of file + ossutil cp ./sealos-cloud.tar.gz oss://${{ secrets.OSS_BUCKET }}/cloud/sealos-cloud-${{ github.event.release.tag_name }}-amd64.tar.gz + ossutil cp ./sealos-cloud.tar.gz.md5 oss://${{ secrets.OSS_BUCKET }}/cloud/sealos-cloud-${{ github.event.release.tag_name }}-amd64.tar.gz.md5 + + release-arm-offline-tar: + needs: + - release-cloud + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Build + run: export CLOUD_VERSION=${{ github.event.release.tag_name }} && export ARCH=arm64 && bash ./scripts/cloud/build-offline-tar.sh + - name: Setup ossutil + uses: manyuanrong/setup-ossutil@v2.0 + with: + endpoint: ${{ secrets.OSS_ENDPOINT }} + access-key-id: ${{ secrets.OSS_ACCESS_KEY_ID }} + access-key-secret: ${{ secrets.OSS_ACCESS_KEY_SECRET }} + - name: Cat md5sum + run: cat ./sealos-cloud.tar.gz.md5 + - name: Upload + run: | + ossutil cp ./sealos-cloud.tar.gz oss://${{ secrets.OSS_BUCKET }}/cloud/sealos-cloud-${{ github.event.release.tag_name }}-arm64.tar.gz + ossutil cp ./sealos-cloud.tar.gz.md5 oss://${{ secrets.OSS_BUCKET }}/cloud/sealos-cloud-${{ github.event.release.tag_name }}-arm64.tar.gz.md5 \ No newline at end of file diff --git a/controllers/admission/go.mod b/controllers/admission/go.mod index cf6646854..72ec33ad0 100644 --- a/controllers/admission/go.mod +++ b/controllers/admission/go.mod @@ -24,6 +24,7 @@ require ( github.com/Azure/go-autorest/tracing v0.6.0 // indirect github.com/Masterminds/goutils v1.1.1 // indirect github.com/Masterminds/semver v1.5.0 // indirect + github.com/baidubce/bce-cfc-go v1.3.1 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect diff --git a/controllers/admission/go.sum b/controllers/admission/go.sum index fc66b39f1..e1117f0ff 100644 --- a/controllers/admission/go.sum +++ b/controllers/admission/go.sum @@ -25,6 +25,8 @@ github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3Q github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= +github.com/baidubce/bce-cfc-go v1.3.1 h1:Qxja6IS+AL4XgmzhEDywARtVLOWGK06DkkYB3rvTgGI= +github.com/baidubce/bce-cfc-go v1.3.1/go.mod h1:GguoKxacfoTZVkm+AVZRrZH2m2izs06BPGbcO1rTKPI= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= diff --git a/scripts/cloud/build-offline-tar.sh b/scripts/cloud/build-offline-tar.sh index d368a53c7..289ee9390 100644 --- a/scripts/cloud/build-offline-tar.sh +++ b/scripts/cloud/build-offline-tar.sh @@ -1,6 +1,7 @@ #!/bin/bash set -x +ARCH=${ARCH:-"amd64"} CLOUD_VERSION="latest" # pull and save images @@ -20,7 +21,7 @@ images=( ) for image in "${images[@]}"; do - sealos pull "$image" + sealos pull --platform "linux/$ARCH" "$image" filename=$(echo "$image" | cut -d':' -f1 | tr / -) if [[ ! -f "output/tars/${filename}.tar" ]]; then sealos save -o "output/tars/${filename}.tar" "$image" @@ -33,8 +34,8 @@ mkdir -p output/cli VERSION="v4.3.5" -wget https://github.com/labring/sealos/releases/download/${VERSION}/sealos_${VERSION#v}_linux_amd64.tar.gz \ - && tar zxvf sealos_${VERSION#v}_linux_amd64.tar.gz sealos && chmod +x sealos && mv sealos output/cli +wget https://github.com/labring/sealos/releases/download/${VERSION}/sealos_${VERSION#v}_linux_${ARCH}.tar.gz \ + && tar zxvf sealos_${VERSION#v}_linux_${ARCH}.tar.gz sealos && chmod +x sealos && mv sealos output/cli # get and save install scripts echo "