opensource/sealos
3
0
Fork 0
mirror of https://github.com/labring/sealos.git synced 2026-09-01 04:58:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: update objectstorage cloud image and fix workflow error (#5497)

Browse Source 
* update controller version

* add sh

* mv sh

* add sh

* mv docker sh

* update controller cloud image version

* update controller deploy.yaml

* 1

* 2

* change https to http

* 1

* test

* fix

* rm

* 1

* 1

* 1

* 1

* add sh to scripts directory

* fix ci 1

* fix ci 2
This commit is contained in:
xzy
2025-03-21 20:13:54 +08:00
committed by GitHub
parent 1da1c86f95
commit b83dca6b03
12 changed files with 141 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/bot-cherry-pick.yml
+1 -1
View File
@@ -38,7 +38,7 @@ jobs:
git config --global --add safe.directory /github/workspace
git config --global user.email "sealos-ci-robot"
git config --global user.name "sealos-ci-robot@sealos.io"
bash ./scripts/cherry-pick.sh
bash ./${{ env.PROJECT_PATH }}/scripts/cherry-pick.sh
- uses: peter-evans/create-pull-request@v5
with:
title: 'docs: Automated CherryPick Update for ${{ steps.set-target.outputs.target }} '
.github/workflows/ci-patch-image.yml
+2 -2
View File
@@ -177,7 +177,7 @@ jobs:
sudo sealos load -i /tmp/sealos/images/patch-arm64.tar
sudo sealos load -i /tmp/sealos/images/patch-amd64.tar
sudo sealos images
bash docker/patch/manifest-cluster-images.sh
bash scripts/manifest-cluster-images.sh
env:
OWNER: ${{ github.repository_owner }}
- name: Manifest Cluster Images for latest
@@ -185,7 +185,7 @@ jobs:
sudo sealos tag ghcr.io/${{ github.repository_owner }}/sealos-patch:"$GIT_COMMIT_SHORT_SHA"-amd64 ghcr.io/${{ github.repository_owner }}/sealos-patch:latest-amd64
sudo sealos tag ghcr.io/${{ github.repository_owner }}/sealos-patch:"$GIT_COMMIT_SHORT_SHA"-arm64 ghcr.io/${{ github.repository_owner }}/sealos-patch:latest-arm64
sudo sealos images
bash docker/patch/manifest-cluster-images.sh ghcr.io/${{ github.repository_owner }}/sealos-patch:latest
bash scripts/manifest-cluster-images.sh ghcr.io/${{ github.repository_owner }}/sealos-patch:latest
env:
OWNER: ${{ github.repository_owner }}
- name: Renew issue and Sync Images
.github/workflows/cloud.yml
+13 -6
View File
@@ -83,9 +83,14 @@ jobs:
fi
- name: Prepare
id: prepare
env:
PUSH_IMAGE: ${{ inputs.push_image }}
IS_TAG: ${{ steps.check_tag.outputs.isTag }}
PUSH_IMAGE_TAG: ${{ inputs.push_image_tag }}
REPO_OWNER: ${{ github.repository_owner }}
run: |
bash ./scripts/resolve-tag-image.sh "${{ inputs.push_image }}" "${{ steps.check_tag.outputs.isTag }}" "${{ inputs.push_image_tag }}"
echo repo=ghcr.io/${{ github.repository_owner }}/sealos-cloud >> $GITHUB_OUTPUT
bash scripts/resolve-tag-image.sh "$PUSH_IMAGE" "$IS_TAG" "$PUSH_IMAGE_TAG"
echo "repo=ghcr.io/$REPO_OWNER/sealos-cloud" >> $GITHUB_OUTPUT
- name: Download sealos
uses: actions/download-artifact@v4
with:
@@ -125,12 +130,14 @@ jobs:
- name: Manifest Cluster Images
# if push to master, then patch images to ghcr.io
run: |
sudo sealos images
bash docker/patch/manifest-cluster-images.sh ${{ steps.prepare.outputs.repo }}:${{ steps.prepare.outputs.tag_name }}
bash docker/patch/manifest-cluster-images.sh ${{ steps.prepare.outputs.repo }}:latest
env:
OWNER: ${{ github.repository_owner }}
REPO: ${{ steps.prepare.outputs.repo }}
TAG_NAME: ${{ steps.prepare.outputs.tag_name }}
run: |
sudo sealos images
bash scripts/manifest-cluster-images.sh "$REPO:$TAG_NAME"
bash scripts/manifest-cluster-images.sh "$REPO:latest"
# todo: build multi-arch images
.github/workflows/controllers.yml
+27 -13
View File
@@ -59,7 +59,7 @@ jobs:
- name: Resolve Modules
id: set-matrix
run: bash ./scripts/resolve-modules.sh ./controllers
run: bash scripts/resolve-modules.sh ./controllers
golangci-lint:
if: ${{ github.event_name }} == 'push' || ${{ github.event_name }} == 'pull_request'
@@ -142,9 +142,15 @@ jobs:
fi
- name: Prepare
id: prepare
env:
PUSH_IMAGE: ${{ inputs.push_image }}
IS_TAG: ${{ steps.check_tag.outputs.isTag }}
PUSH_IMAGE_TAG: ${{ inputs.push_image_tag }}
REPO_OWNER: ${{ github.repository_owner }}
MODULE_NAME: ${{ matrix.module.name }}
run: |
bash ./scripts/resolve-tag-image.sh "${{ inputs.push_image }}" "${{ steps.check_tag.outputs.isTag }}" "${{ inputs.push_image_tag }}"
echo docker_repo=ghcr.io/${{ github.repository_owner }}/sealos-${{ matrix.module.name }}-controller >> $GITHUB_OUTPUT
bash scripts/resolve-tag-image.sh "$PUSH_IMAGE" "$IS_TAG" "$PUSH_IMAGE_TAG"
echo "docker_repo=ghcr.io/$REPO_OWNER/sealos-$MODULE_NAME-controller" >> $GITHUB_OUTPUT
- # Add support for more platforms with QEMU (optional)
# https://github.com/docker/setup-qemu-action
@@ -225,13 +231,19 @@ jobs:
fi
- name: Prepare
id: prepare
env:
PUSH_IMAGE: ${{ inputs.push_image }}
IS_TAG: ${{ steps.check_tag.outputs.isTag }}
PUSH_IMAGE_TAG: ${{ inputs.push_image_tag }}
REPO_OWNER: ${{ github.repository_owner }}
MODULE_NAME: ${{ matrix.module.name }}
run: |
tag_name=$(bash ./scripts/resolve-tag-image.sh "${{ inputs.push_image }}" "${{ steps.check_tag.outputs.isTag }}" "${{ inputs.push_image_tag }}")
echo old_docker_repo=ghcr.io/labring/sealos-${{ matrix.module.name }}-controller >> $GITHUB_OUTPUT
echo new_docker_repo=ghcr.io/${{ github.repository_owner }}/sealos-${{ matrix.module.name }}-controller >> $GITHUB_OUTPUT
echo cluster_repo=ghcr.io/${{ github.repository_owner }}/sealos-cloud-${{ matrix.module.name }}-controller >> $GITHUB_OUTPUT
echo cluster_image=ghcr.io/${{ github.repository_owner }}/sealos-cloud-${{ matrix.module.name }}-controller:${tag_name} >> $GITHUB_OUTPUT
echo latest_cluster_image=ghcr.io/${{ github.repository_owner }}/sealos-cloud-${{ matrix.module.name }}-controller:latest >> $GITHUB_OUTPUT
tag_name=$(bash scripts/resolve-tag-image.sh "$PUSH_IMAGE" "$IS_TAG" "$PUSH_IMAGE_TAG")
echo "old_docker_repo=ghcr.io/labring/sealos-$MODULE_NAME-controller" >> $GITHUB_OUTPUT
echo "new_docker_repo=ghcr.io/$REPO_OWNER/sealos-$MODULE_NAME-controller" >> $GITHUB_OUTPUT
echo "cluster_repo=ghcr.io/$REPO_OWNER/sealos-cloud-$MODULE_NAME-controller" >> $GITHUB_OUTPUT
echo "cluster_image=ghcr.io/$REPO_OWNER/sealos-cloud-$MODULE_NAME-controller:$tag_name" >> $GITHUB_OUTPUT
echo "latest_cluster_image=ghcr.io/$REPO_OWNER/sealos-cloud-$MODULE_NAME-controller:latest" >> $GITHUB_OUTPUT
- name: Download sealos
uses: actions/download-artifact@v4
@@ -267,12 +279,14 @@ jobs:
- name: Manifest Cluster Images
# if push to master, then patch images to ghcr.io
run: |
sudo sealos images
bash docker/patch/manifest-cluster-images.sh ${{ steps.prepare.outputs.cluster_image }}
bash docker/patch/manifest-cluster-images.sh ${{ steps.prepare.outputs.latest_cluster_image }}
env:
OWNER: ${{ github.repository_owner }}
REPO: ${{ steps.prepare.outputs.repo }}
TAG_NAME: ${{ steps.prepare.outputs.tag_name }}
run: |
sudo sealos images
bash scripts/manifest-cluster-images.sh "$REPO:$TAG_NAME"
bash scripts/manifest-cluster-images.sh "$REPO:latest"
- name: Renew issue and Sync Images for ${{ steps.prepare.outputs.cluster_image }}
uses: labring/gh-rebot@v0.0.6
.github/workflows/frontend.yml
+26 -14
View File
@@ -137,8 +137,12 @@ jobs:
- name: Prepare
id: prepare
env:
PUSH_IMAGE: ${{ inputs.push_image }}
ISTAG: ${{ steps.check_tag.outputs.isTag }}
PUSH_IMAGE_TAG: ${{ inputs.push_image_tag }}
run: |
bash ./scripts/resolve-tag-image.sh "${{ inputs.push_image }}" "${{ steps.check_tag.outputs.isTag }}" "${{ inputs.push_image_tag }}"
bash scripts/resolve-tag-image.sh "$PUSH_IMAGE" "$IS_TAG" "$PUSH_IMAGE_TAG"
- name: Docker meta
id: meta
@@ -189,15 +193,21 @@ jobs:
fi
- name: Prepare
id: prepare
env:
PUSH_IMAGE: ${{ inputs.push_image }}
IS_TAG: ${{ steps.check_tag.outputs.isTag }}
PUSH_IMAGE_TAG: ${{ inputs.push_image_tag }}
REPO_OWNER: ${{ github.repository_owner }}
MODULE_NAME: ${{ env.MODULE_NAME }}
run: |
tag_name=$(bash ./scripts/resolve-tag-image.sh "${{ inputs.push_image }}" "${{ steps.check_tag.outputs.isTag }}" "${{ inputs.push_image_tag }}")
echo old_docker_repo=ghcr.io/labring/sealos-${{ env.MODULE_NAME }}-frontend >> $GITHUB_OUTPUT
echo old_docker_image=ghcr.io/labring/sealos-${{ env.MODULE_NAME }}-frontend:latest >> $GITHUB_OUTPUT
echo new_docker_repo=ghcr.io/${{ github.repository_owner }}/sealos-${{ env.MODULE_NAME }}-frontend >> $GITHUB_OUTPUT
echo new_docker_image=ghcr.io/${{ github.repository_owner }}/sealos-${{ env.MODULE_NAME }}-frontend:${tag_name} >> $GITHUB_OUTPUT
echo cluster_repo=ghcr.io/${{ github.repository_owner }}/sealos-cloud-${{ env.MODULE_NAME }}-frontend >> $GITHUB_OUTPUT
echo cluster_image=ghcr.io/${{ github.repository_owner }}/sealos-cloud-${{ env.MODULE_NAME }}-frontend:${tag_name} >> $GITHUB_OUTPUT
echo latest_cluster_image=ghcr.io/${{ github.repository_owner }}/sealos-cloud-${{ env.MODULE_NAME }}-frontend:latest >> $GITHUB_OUTPUT
tag_name=$(bash scripts/resolve-tag-image.sh "$PUSH_IMAGE" "$IS_TAG" "$PUSH_IMAGE_TAG")
echo "old_docker_repo=ghcr.io/labring/sealos-$MODULE_NAME-frontend" >> $GITHUB_OUTPUT
echo "old_docker_image=ghcr.io/labring/sealos-$MODULE_NAME-frontend:latest" >> $GITHUB_OUTPUT
echo "new_docker_repo=ghcr.io/$REPO_OWNER/sealos-$MODULE_NAME-frontend" >> $GITHUB_OUTPUT
echo "new_docker_image=ghcr.io/$REPO_OWNER/sealos-$MODULE_NAME-frontend:$tag_name" >> $GITHUB_OUTPUT
echo "cluster_repo=ghcr.io/$REPO_OWNER/sealos-cloud-$MODULE_NAME-frontend" >> $GITHUB_OUTPUT
echo "cluster_image=ghcr.io/$REPO_OWNER/sealos-cloud-$MODULE_NAME-frontend:$tag_name" >> $GITHUB_OUTPUT
echo "latest_cluster_image=ghcr.io/$REPO_OWNER/sealos-cloud-$MODULE_NAME-frontend:latest" >> $GITHUB_OUTPUT
- name: Download sealos
uses: actions/download-artifact@v4
@@ -225,13 +235,15 @@ jobs:
sudo sealos build -t ${{ steps.prepare.outputs.cluster_image }}-arm64 --platform linux/arm64 -f Kubefile
sudo sealos build -t ${{ steps.prepare.outputs.latest_cluster_image }}-arm64 --platform linux/arm64 -f Kubefile
- name: Manifest Cluster Images
run: |
sudo sealos images
bash docker/patch/manifest-cluster-images.sh ${{ steps.prepare.outputs.cluster_image }}
bash docker/patch/manifest-cluster-images.sh ${{ steps.prepare.outputs.latest_cluster_image }}
- name: Manifest Cluster Images'
env:
OWNER: ${{ github.repository_owner }}
CLUSTER_IMAGE: ${{ steps.prepare.outputs.cluster_image }}
LATEST_CLUSTER_IMAGE: ${{ steps.prepare.outputs.latest_cluster_image }}
run: |
sudo sealos images
bash scripts/manifest-cluster-images.sh "$CLUSTER_IMAGE"
bash scripts/manifest-cluster-images.sh "$LATEST_CLUSTER_IMAGE"
- name: Renew issue and Sync Images for ${{ steps.prepare.outputs.cluster_image }}
uses: labring/gh-rebot@v0.0.6
.github/workflows/objectstorage.yaml
+13 -6
View File
@@ -85,9 +85,14 @@ jobs:
fi
- name: Prepare
id: prepare
env:
PUSH_IMAGE: ${{ inputs.push_image }}
IS_TAG: ${{ steps.check_tag.outputs.isTag }}
PUSH_IMAGE_TAG: ${{ inputs.push_image_tag }}
REPO_OWNER: ${{ github.repository_owner }}
run: |
bash ./scripts/resolve-tag-image.sh "${{ inputs.push_image }}" "${{ steps.check_tag.outputs.isTag }}" "${{ inputs.push_image_tag }}"
echo repo=ghcr.io/${{ github.repository_owner }}/sealos-cloud-objectstorage >> $GITHUB_OUTPUT
bash scripts/resolve-tag-image.sh "$PUSH_IMAGE" "$IS_TAG" "$PUSH_IMAGE_TAG"
echo "repo=ghcr.io/$REPO_OWNER/sealos-cloud-objectstorage" >> $GITHUB_OUTPUT
- name: Download sealos
uses: actions/download-artifact@v4
with:
@@ -128,12 +133,14 @@ jobs:
- name: Manifest Cluster Images
# if push to master, then patch images to ghcr.io
run: |
sudo sealos images
bash docker/patch/manifest-cluster-images.sh ${{ steps.prepare.outputs.repo }}:${{ steps.prepare.outputs.tag_name }}
bash docker/patch/manifest-cluster-images.sh ${{ steps.prepare.outputs.repo }}:latest
env:
OWNER: ${{ github.repository_owner }}
REPO: ${{ steps.prepare.outputs.repo }}
TAG_NAME: ${{ steps.prepare.outputs.tag_name }}
run: |
sudo sealos images
bash scripts/manifest-cluster-images.sh "$REPO:$TAG_NAME"
bash scripts/manifest-cluster-images.sh "$REPO:latest"
- name: Renew issue and Sync Images
uses: labring/gh-rebot@v0.0.6
.github/workflows/services.yml
+28 -13
View File
@@ -59,7 +59,7 @@ jobs:
- name: Resolve Modules
id: set-matrix
run: bash ./scripts/resolve-modules.sh ./service
run: bash scripts/resolve-modules.sh ./service
golangci-lint:
needs: [ resolve-modules ]
@@ -130,9 +130,15 @@ jobs:
fi
- name: Prepare
id: prepare
env:
PUSH_IMAGE: ${{ inputs.push_image }}
IS_TAG: ${{ steps.check_tag.outputs.isTag }}
PUSH_IMAGE_TAG: ${{ inputs.push_image_tag }}
REPO_OWNER: ${{ github.repository_owner }}
MODULE: ${{ matrix.module }}
run: |
bash ./scripts/resolve-tag-image.sh "${{ inputs.push_image }}" "${{ steps.check_tag.outputs.isTag }}" "${{ inputs.push_image_tag }}"
echo docker_repo=ghcr.io/${{ github.repository_owner }}/sealos-${{ matrix.module }}-service >> $GITHUB_OUTPUT
bash scripts/resolve-tag-image.sh "$PUSH_IMAGE" "$IS_TAG" "$PUSH_IMAGE_TAG"
echo "docker_repo=ghcr.io/$REPO_OWNER/sealos-$MODULE-service" >> $GITHUB_OUTPUT
- # Add support for more platforms with QEMU (optional)
# https://github.com/docker/setup-qemu-action
@@ -204,11 +210,17 @@ jobs:
fi
- name: Prepare
id: prepare
env:
PUSH_IMAGE: ${{ inputs.push_image }}
IS_TAG: ${{ steps.check_tag.outputs.isTag }}
PUSH_IMAGE_TAG: ${{ inputs.push_image_tag }}
REPO_OWNER: ${{ github.repository_owner }}
MODULE: ${{ matrix.module }}
run: |
bash ./scripts/resolve-tag-image.sh "${{ inputs.push_image }}" "${{ steps.check_tag.outputs.isTag }}" "${{ inputs.push_image_tag }}"
echo old_docker_repo=ghcr.io/labring/sealos-${{ matrix.module }}-service >> $GITHUB_OUTPUT
echo new_docker_repo=ghcr.io/${{ github.repository_owner }}/sealos-${{ matrix.module }}-service >> $GITHUB_OUTPUT
echo cluster_repo=ghcr.io/${{ github.repository_owner }}/sealos-cloud-${{ matrix.module }}-service >> $GITHUB_OUTPUT
bash scripts/resolve-tag-image.sh "$PUSH_IMAGE" "$IS_TAG" "$PUSH_IMAGE_TAG"
echo "old_docker_repo=ghcr.io/labring/sealos-$MODULE-service" >> $GITHUB_OUTPUT
echo "new_docker_repo=ghcr.io/$REPO_OWNER/sealos-$MODULE-service" >> $GITHUB_OUTPUT
echo "cluster_repo=ghcr.io/$REPO_OWNER/sealos-cloud-$MODULE-service" >> $GITHUB_OUTPUT
- name: Download sealos
uses: actions/download-artifact@v4
@@ -242,14 +254,17 @@ jobs:
sudo sealos build -t ${CLUSTER_IMAGE_NAME}-arm64 --platform linux/arm64 -f Kubefile
sudo sealos images
- name: Build ${{ matrix.module }}-service cluster image for latest
env:
CLUSTER_REPO: ${{ steps.prepare.outputs.cluster_repo }}
TAG_NAME: ${{ steps.prepare.outputs.tag_name }}
run: |
CLUSTER_IMAGE_NAME=${{ steps.prepare.outputs.cluster_repo }}:${{ steps.prepare.outputs.tag_name }}
CLUSTER_IMAGE_NAME_LATEST=${{ steps.prepare.outputs.cluster_repo }}:latest
sudo sealos tag ${CLUSTER_IMAGE_NAME}-amd64 ${CLUSTER_IMAGE_NAME_LATEST}-amd64
sudo sealos tag ${CLUSTER_IMAGE_NAME}-arm64 ${CLUSTER_IMAGE_NAME_LATEST}-arm64
CLUSTER_IMAGE_NAME="$CLUSTER_REPO:$TAG_NAME"
CLUSTER_IMAGE_NAME_LATEST="$CLUSTER_REPO:latest"
sudo sealos tag "$CLUSTER_IMAGE_NAME-amd64" "$CLUSTER_IMAGE_NAME_LATEST-amd64"
sudo sealos tag "$CLUSTER_IMAGE_NAME-arm64" "$CLUSTER_IMAGE_NAME_LATEST-arm64"
sudo sealos images
bash docker/patch/manifest-cluster-images.sh $CLUSTER_IMAGE_NAME
bash docker/patch/manifest-cluster-images.sh $CLUSTER_IMAGE_NAME_LATEST
bash scripts/manifest-cluster-images.sh "$CLUSTER_IMAGE_NAME"
bash scripts/manifest-cluster-images.sh "$CLUSTER_IMAGE_NAME_LATEST"
- name: Renew issue and Sync Images
uses: labring/gh-rebot@v0.0.6
if: ${{ github.repository_owner == env.DEFAULT_OWNER }}
controllers/objectstorage/deploy/manifests/deploy.yaml.tmpl
+13 -4
View File
@@ -74,8 +74,8 @@ status:
acceptedNames:
kind: ""
plural: ""
conditions: [ ]
storedVersions: [ ]
conditions: []
storedVersions: []
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
@@ -112,6 +112,11 @@ spec:
type: object
spec:
description: ObjectStorageUserSpec defines the desired state of ObjectStorageUser
properties:
secretKeyVersion:
default: 0
format: int64
type: integer
type: object
status:
description: ObjectStorageUserStatus defines the observed state of ObjectStorageUser
@@ -130,6 +135,10 @@ spec:
type: integer
secretKey:
type: string
secretKeyVersion:
default: 0
format: int64
type: integer
size:
description: unit is byte
format: int64
@@ -144,8 +153,8 @@ status:
acceptedNames:
kind: ""
plural: ""
conditions: [ ]
storedVersions: [ ]
conditions: []
storedVersions: []
---
apiVersion: v1
kind: ServiceAccount
deploy/objectstorage/README.md
+4
View File
@@ -18,6 +18,10 @@ log: add resourcequota/status role to objectstorage-manager-role clusterrole
log: add resourcequota & resourcequota/statuc role to objectstorage-manager-role clusterrole
### date 2025.3.19
log: update controller version
## components
1. minio
deploy/objectstorage/images/shim/imageList
-1
View File
@@ -1,2 +1 @@
quay.io/prometheus/prometheus:v2.45.0
minio/minio:RELEASE.2023-11-11T08-14-41Z
frontend/providers/objectstorage/deploy/manifests/deploy.yaml.tmpl
+3 -1
View File
@@ -34,7 +34,9 @@ spec:
protocol: TCP
env:
- name: MONITOR_URL
value: https://object-storage-monitor.{{ .cloudDomain }}/q
value: http://object-storage-monitor.objectstorage-system.svc.cluster.local:9090/q
- name: APP_LAUNCHPAD_URL
value: http://applaunchpad-frontend.applaunchpad-frontend.svc.cluster.local:3000/api/v1alpha
resources:
limits:
cpu: 2000m
scripts/manifest-cluster-images.sh
+11
View File
@@ -0,0 +1,11 @@
#!/bin/bash
DEFAULT_REPO_NAME="sealos-patch"
IMAGE_NAME=${1:-"ghcr.io/${OWNER}/${DEFAULT_REPO_NAME}:$GIT_COMMIT_SHORT_SHA"}
sudo sealos push "${IMAGE_NAME}"-amd64
sudo sealos push "${IMAGE_NAME}"-arm64
sudo sealos images
sudo sealos manifest create "${IMAGE_NAME}"
sudo sealos manifest add "$IMAGE_NAME" docker://"$IMAGE_NAME-amd64"
sudo sealos manifest add "$IMAGE_NAME" docker://"$IMAGE_NAME-arm64"
sudo sealos manifest push --all "$IMAGE_NAME" docker://"$IMAGE_NAME" && echo "$IMAGE_NAME push success"
sudo sealos images