From 0c00b99f2be5e186c606657a74fea9f0f0b4f5f9 Mon Sep 17 00:00:00 2001 From: cuisongliu Date: Mon, 10 Jul 2023 11:58:39 +0800 Subject: [PATCH] build(main): dev to latest (#3482) Signed-off-by: cuisongliu --- .github/workflows/ci-patch-image.yml | 2 +- .github/workflows/cloud.yml | 4 ++-- .github/workflows/controllers.yml | 5 ++--- .github/workflows/frontend.yml | 5 ++--- .github/workflows/services.yml | 5 ++--- .github/workflows/webhooks.yml | 2 +- controllers/account/Makefile | 2 +- .../account/config/default/manager_auth_proxy_patch.yaml | 4 ++-- controllers/account/deploy/manifests/deploy.yaml | 2 +- controllers/app/Makefile | 2 +- controllers/app/deploy/manifests/deploy.yaml | 2 +- controllers/cloud/deploy/manifests/deploy.yaml.tmpl | 2 +- controllers/cluster/Makefile | 2 +- controllers/cluster/deploy/manifests/deploy.yaml | 2 +- controllers/db/adminer/Makefile | 2 +- controllers/db/adminer/deploy/README.md | 4 ++-- controllers/db/adminer/deploy/manifests/deploy.yaml.tmpl | 2 +- controllers/db/bytebase/deploy/README.md | 4 ++-- controllers/db/bytebase/deploy/manifests/deploy.yaml.tmpl | 2 +- controllers/imagehub/Makefile | 2 +- controllers/imagehub/deploy/manifests/deploy.yaml | 2 +- controllers/infra/Makefile | 2 +- controllers/infra/deploy/README.md | 2 +- controllers/infra/deploy/manifests/deploy.yaml | 2 +- controllers/metering/Makefile | 2 +- controllers/metering/deploy/manifests/deploy.yaml | 2 +- controllers/resources/Makefile | 2 +- controllers/resources/config/manager/manager.yaml | 2 +- controllers/resources/deploy/README.md | 4 ++-- controllers/resources/deploy/manifests/deploy-manager.yaml | 4 ++-- controllers/resources/metering/Makefile | 4 ++-- controllers/resources/metering/deploy/manifests/deploy.yaml | 4 ++-- controllers/terminal/Makefile | 2 +- controllers/terminal/deploy/README.md | 4 ++-- controllers/terminal/deploy/manifests/deploy.yaml.tmpl | 2 +- controllers/user/Makefile | 2 +- controllers/user/deploy/README.md | 4 ++-- controllers/user/deploy/manifests/deploy.yaml.tmpl | 2 +- deploy/cloud-deprecated/README.md | 4 ++-- deploy/cloud/README.md | 4 ++-- frontend/desktop/deploy/README.md | 6 +++--- frontend/desktop/deploy/manifests/deploy.yaml.tmpl | 4 ++-- frontend/providers/adminer/deploy/manifests/deploy.yaml | 4 ++-- .../applaunchpad/deploy/manifests/deploy.yaml.tmpl | 4 ++-- frontend/providers/bytebase/deploy/manifests/deploy.yaml | 4 ++-- .../providers/costcenter/deploy/manifests/deploy.yaml.tmpl | 4 ++-- .../providers/dbprovider/deploy/manifests/deploy.yaml.tmpl | 2 +- frontend/providers/imagehub/deploy/manifests/deploy.yaml | 4 ++-- .../providers/terminal/deploy/manifests/deploy.yaml.tmpl | 4 ++-- frontend/static-cdn/Makefile | 2 +- frontend/static-cdn/deploy/manifest.yaml | 4 ++-- service/auth/Makefile | 2 +- service/auth/deploy/README.md | 4 ++-- service/auth/deploy/manifests/deploy.yaml | 2 +- service/hub/Makefile | 4 ++-- service/hub/deploy/manifests/deploy.yaml | 4 ++-- service/payment/Makefile | 2 +- webhooks/whitelist/Makefile | 2 +- webhooks/whitelist/deploy/manifests/deploy.yaml | 2 +- 59 files changed, 87 insertions(+), 90 deletions(-) diff --git a/.github/workflows/ci-patch-image.yml b/.github/workflows/ci-patch-image.yml index e40570bace2..da65c6f31d8 100755 --- a/.github/workflows/ci-patch-image.yml +++ b/.github/workflows/ci-patch-image.yml @@ -172,7 +172,7 @@ jobs: - name: Prepare id: prepare run: | - TAG=dev + TAG=latest echo tag_name=${GIT_COMMIT_SHORT_SHA} >> $GITHUB_OUTPUT - name: Renew issue and Sync Images uses: labring/gh-rebot@v0.0.6 diff --git a/.github/workflows/cloud.yml b/.github/workflows/cloud.yml index 6472056707a..b2e97d47421 100644 --- a/.github/workflows/cloud.yml +++ b/.github/workflows/cloud.yml @@ -11,8 +11,8 @@ on: type: boolean default: false push_image_tag: - description: 'Push all-in-one image tag, default is dev' - default: 'dev' + description: 'Push all-in-one image tag, default is latest' + default: 'latest' required: false type: string build_from: diff --git a/.github/workflows/controllers.yml b/.github/workflows/controllers.yml index f1a7c4bf9c9..bfd744c97d1 100644 --- a/.github/workflows/controllers.yml +++ b/.github/workflows/controllers.yml @@ -12,7 +12,7 @@ on: default: false push_image_tag: description: "Push image tag" - default: "dev" + default: "latest" required: false type: string push: @@ -155,7 +155,6 @@ jobs: ghcr.io/${{ github.repository_owner }}/sealos-${{ matrix.module.name }}-controller tags: | type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }} - type=raw,value=dev,enable=true type=raw,value=${{ steps.prepare.outputs.tag_name }},enable=true - name: build (and publish) ${{ matrix.module.name }} main image @@ -229,7 +228,7 @@ jobs: - name: Mutate image tag in deploy files working-directory: controllers/${{ matrix.module.path }}/deploy run: | - OLD_DOCKER_IMAGE_NAME=${{ steps.prepare.outputs.old_docker_repo }}:dev + OLD_DOCKER_IMAGE_NAME=${{ steps.prepare.outputs.old_docker_repo }}:latest NEW_DOCKER_IMAGE_NAME=${{ steps.prepare.outputs.new_docker_repo }}:${{ steps.prepare.outputs.tag_name }} sudo sed -i "s;${OLD_DOCKER_IMAGE_NAME};${NEW_DOCKER_IMAGE_NAME};" manifests/* diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index 3851972baa5..543a2e45440 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -12,7 +12,7 @@ on: default: false push_image_tag: description: "Push image tag" - default: "dev" + default: "latest" required: false type: string push: @@ -87,7 +87,6 @@ jobs: ghcr.io/${{ github.repository_owner }}/sealos-${{ env.MODULE_NAME }}-frontend tags: | type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }} - type=raw,value=dev,enable=true type=raw,value=${{ steps.prepare.outputs.tag_name }},enable=true - name: Set up QEMU @@ -160,7 +159,7 @@ jobs: 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:dev >> $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 diff --git a/.github/workflows/services.yml b/.github/workflows/services.yml index 67b0016b4f8..6aa3c968ac1 100644 --- a/.github/workflows/services.yml +++ b/.github/workflows/services.yml @@ -13,7 +13,7 @@ on: default: false push_image_tag: description: 'Push image tag' - default: 'dev' + default: 'latest' required: false type: string push: @@ -144,7 +144,6 @@ jobs: ghcr.io/${{ github.repository_owner }}/sealos-${{ matrix.module }}-service tags: | type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }} - type=raw,value=dev,enable=true type=raw,value=${{ steps.prepare.outputs.tag_name }},enable=true - name: build (and publish) ${{ matrix.module }} main image @@ -212,7 +211,7 @@ jobs: - name: Mutate image tag in deploy files working-directory: service/${{ matrix.module }}/deploy run: | - OLD_DOCKER_IMAGE_NAME=${{ steps.prepare.outputs.old_docker_repo }}:dev + OLD_DOCKER_IMAGE_NAME=${{ steps.prepare.outputs.old_docker_repo }}:latest NEW_DOCKER_IMAGE_NAME=${{ steps.prepare.outputs.new_docker_repo }}:${{ steps.prepare.outputs.tag_name }} sed -i "s;${OLD_DOCKER_IMAGE_NAME};${NEW_DOCKER_IMAGE_NAME};" manifests/* diff --git a/.github/workflows/webhooks.yml b/.github/workflows/webhooks.yml index 9e05597eead..22abba8ce58 100644 --- a/.github/workflows/webhooks.yml +++ b/.github/workflows/webhooks.yml @@ -99,7 +99,7 @@ jobs: - name: Prepare id: prepare run: | - TAG=dev + TAG=latest echo tag_name=${TAG} >> $GITHUB_OUTPUT - # Add support for more platforms with QEMU (optional) diff --git a/controllers/account/Makefile b/controllers/account/Makefile index 911fbaa412a..664eeef941e 100644 --- a/controllers/account/Makefile +++ b/controllers/account/Makefile @@ -1,6 +1,6 @@ # Image URL to use all building/pushing image targets -IMG ?= ghcr.io/labring/sealos-account-controller:dev +IMG ?= ghcr.io/labring/sealos-account-controller:latest # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. ENVTEST_K8S_VERSION = 1.23 diff --git a/controllers/account/config/default/manager_auth_proxy_patch.yaml b/controllers/account/config/default/manager_auth_proxy_patch.yaml index 445e8c12e64..736f293b1f8 100644 --- a/controllers/account/config/default/manager_auth_proxy_patch.yaml +++ b/controllers/account/config/default/manager_auth_proxy_patch.yaml @@ -65,9 +65,9 @@ spec: value: "604800" - name: DebtDetectionCycleSeconds value: "300" - image: ghcr.io/labring/sealos-account-controller:dev + image: ghcr.io/labring/sealos-account-controller:latest imagePullPolicy: Always args: - "--health-probe-bind-address=:8081" - "--metrics-bind-address=127.0.0.1:8080" - - "--leader-elect" \ No newline at end of file + - "--leader-elect" diff --git a/controllers/account/deploy/manifests/deploy.yaml b/controllers/account/deploy/manifests/deploy.yaml index bbe9e710e15..6a16854344e 100644 --- a/controllers/account/deploy/manifests/deploy.yaml +++ b/controllers/account/deploy/manifests/deploy.yaml @@ -1156,7 +1156,7 @@ spec: envFrom: - secretRef: name: payment-secret - image: ghcr.io/labring/sealos-account-controller:dev + image: ghcr.io/labring/sealos-account-controller:latest imagePullPolicy: Always livenessProbe: httpGet: diff --git a/controllers/app/Makefile b/controllers/app/Makefile index f6c1fb43d8d..2b6fa300400 100644 --- a/controllers/app/Makefile +++ b/controllers/app/Makefile @@ -1,6 +1,6 @@ # Image URL to use all building/pushing image targets -IMG ?= ghcr.io/labring/sealos-app-controller:dev +IMG ?= ghcr.io/labring/sealos-app-controller:latest TARGETARCH ?= amd64 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. diff --git a/controllers/app/deploy/manifests/deploy.yaml b/controllers/app/deploy/manifests/deploy.yaml index d87ddef99fc..ccc5ee5cedf 100644 --- a/controllers/app/deploy/manifests/deploy.yaml +++ b/controllers/app/deploy/manifests/deploy.yaml @@ -406,7 +406,7 @@ spec: - --leader-elect command: - /manager - image: ghcr.io/labring/sealos-app-controller:dev + image: ghcr.io/labring/sealos-app-controller:latest livenessProbe: httpGet: path: /healthz diff --git a/controllers/cloud/deploy/manifests/deploy.yaml.tmpl b/controllers/cloud/deploy/manifests/deploy.yaml.tmpl index ffad23906f4..37cd3719580 100644 --- a/controllers/cloud/deploy/manifests/deploy.yaml.tmpl +++ b/controllers/cloud/deploy/manifests/deploy.yaml.tmpl @@ -601,7 +601,7 @@ spec: env: - name: CAN_CONNECT_TO_EXTERNAL_NETWORK value: '{{ .canConnectToExternalNetwork }}' - image: ghcr.io/labring/sealos-cloud-controller:dev + image: ghcr.io/labring/sealos-cloud-controller:latest livenessProbe: httpGet: path: /healthz diff --git a/controllers/cluster/Makefile b/controllers/cluster/Makefile index a6d19ee03f7..53c0ab9b558 100644 --- a/controllers/cluster/Makefile +++ b/controllers/cluster/Makefile @@ -1,6 +1,6 @@ # Image URL to use all building/pushing image targets -IMG ?= ghcr.io/labring/sealos-cluster-controller:dev +IMG ?= ghcr.io/labring/sealos-cluster-controller:latest # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. ENVTEST_K8S_VERSION = 1.24.2 diff --git a/controllers/cluster/deploy/manifests/deploy.yaml b/controllers/cluster/deploy/manifests/deploy.yaml index 9c4adf77d6d..09a8fad0144 100644 --- a/controllers/cluster/deploy/manifests/deploy.yaml +++ b/controllers/cluster/deploy/manifests/deploy.yaml @@ -443,7 +443,7 @@ spec: - --leader-elect command: - /manager - image: ghcr.io/labring/sealos-cluster-controller:dev + image: ghcr.io/labring/sealos-cluster-controller:latest imagePullPolicy: Always livenessProbe: httpGet: diff --git a/controllers/db/adminer/Makefile b/controllers/db/adminer/Makefile index 408d74bfc23..e737a02db07 100644 --- a/controllers/db/adminer/Makefile +++ b/controllers/db/adminer/Makefile @@ -1,6 +1,6 @@ # Image URL to use all building/pushing image targets -IMG ?= ghcr.io/labring/sealos-db-adminer-controller:dev +IMG ?= ghcr.io/labring/sealos-db-adminer-controller:latest # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. ENVTEST_K8S_VERSION = 1.24.1 diff --git a/controllers/db/adminer/deploy/README.md b/controllers/db/adminer/deploy/README.md index e859a7466d1..21d85ff0496 100644 --- a/controllers/db/adminer/deploy/README.md +++ b/controllers/db/adminer/deploy/README.md @@ -1,11 +1,11 @@ ### How to build image ```shell -sealos build -t docker.io/labring/sealos-db-adminer-controller:dev -f Dockerfile . +sealos build -t docker.io/labring/sealos-db-adminer-controller:latest -f Dockerfile . ``` ### How to run ```shell -sealos run docker.io/labring/sealos-db-adminer-controller:dev +sealos run docker.io/labring/sealos-db-adminer-controller:latest ``` diff --git a/controllers/db/adminer/deploy/manifests/deploy.yaml.tmpl b/controllers/db/adminer/deploy/manifests/deploy.yaml.tmpl index 789ee770435..f0ccd70157d 100644 --- a/controllers/db/adminer/deploy/manifests/deploy.yaml.tmpl +++ b/controllers/db/adminer/deploy/manifests/deploy.yaml.tmpl @@ -397,7 +397,7 @@ spec: value: {{ .wildcardCertSecretName }} - name: SECRET_NAMESPACE value: {{ .wildcardCertSecretNamespace }} - image: ghcr.io/labring/sealos-db-adminer-controller:dev + image: ghcr.io/labring/sealos-db-adminer-controller:latest imagePullPolicy: Always livenessProbe: httpGet: diff --git a/controllers/db/bytebase/deploy/README.md b/controllers/db/bytebase/deploy/README.md index 6273b4aa626..a276fca9668 100644 --- a/controllers/db/bytebase/deploy/README.md +++ b/controllers/db/bytebase/deploy/README.md @@ -1,11 +1,11 @@ ### How to build image ```shell -sealos build -t docker.io/labring/sealos-db-bytebase-controller:dev -f Dockerfile . +sealos build -t docker.io/labring/sealos-db-bytebase-controller:latest -f Dockerfile . ``` ### How to run ```shell -sealos run docker.io/labring/sealos-db-bytebase-controller:dev +sealos run docker.io/labring/sealos-db-bytebase-controller:latest ``` diff --git a/controllers/db/bytebase/deploy/manifests/deploy.yaml.tmpl b/controllers/db/bytebase/deploy/manifests/deploy.yaml.tmpl index 7fd784d18f1..cc677b5c65e 100644 --- a/controllers/db/bytebase/deploy/manifests/deploy.yaml.tmpl +++ b/controllers/db/bytebase/deploy/manifests/deploy.yaml.tmpl @@ -512,7 +512,7 @@ spec: - --leader-elect command: - /manager - image: ghcr.io/labring/sealos-db-bytebase-controller:dev + image: ghcr.io/labring/sealos-db-bytebase-controller:latest livenessProbe: httpGet: path: /healthz diff --git a/controllers/imagehub/Makefile b/controllers/imagehub/Makefile index 1d5211ae9f5..1845d085c06 100644 --- a/controllers/imagehub/Makefile +++ b/controllers/imagehub/Makefile @@ -1,6 +1,6 @@ # Image URL to use all building/pushing image targets -IMG ?= ghcr.io/labring/sealos-imagehub-controller:dev +IMG ?= ghcr.io/labring/sealos-imagehub-controller:latest TARGETARCH ?= amd64 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. diff --git a/controllers/imagehub/deploy/manifests/deploy.yaml b/controllers/imagehub/deploy/manifests/deploy.yaml index a31185e9af7..53436334fd3 100644 --- a/controllers/imagehub/deploy/manifests/deploy.yaml +++ b/controllers/imagehub/deploy/manifests/deploy.yaml @@ -867,7 +867,7 @@ spec: - --leader-elect command: - /manager - image: ghcr.io/labring/sealos-imagehub-controller:dev + image: ghcr.io/labring/sealos-imagehub-controller:latest imagePullPolicy: Always livenessProbe: httpGet: diff --git a/controllers/infra/Makefile b/controllers/infra/Makefile index 13104fc2aa8..2c3641867f7 100644 --- a/controllers/infra/Makefile +++ b/controllers/infra/Makefile @@ -1,6 +1,6 @@ # Image URL to use all building/pushing image targets -IMG ?= ghcr.io/labring/sealos-infra-controller:dev +IMG ?= ghcr.io/labring/sealos-infra-controller:latest # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. ENVTEST_K8S_VERSION = 1.24.1 diff --git a/controllers/infra/deploy/README.md b/controllers/infra/deploy/README.md index 31ff012b770..146f528b2e2 100644 --- a/controllers/infra/deploy/README.md +++ b/controllers/infra/deploy/README.md @@ -21,7 +21,7 @@ data: ### 部署方式 ``` -sealos run docker.io/labring/sealos-account-controller:dev +sealos run docker.io/labring/sealos-account-controller:latest ``` diff --git a/controllers/infra/deploy/manifests/deploy.yaml b/controllers/infra/deploy/manifests/deploy.yaml index 1e7b3bf03fa..d0e31481352 100644 --- a/controllers/infra/deploy/manifests/deploy.yaml +++ b/controllers/infra/deploy/manifests/deploy.yaml @@ -603,7 +603,7 @@ spec: envFrom: - secretRef: name: infra-secret - image: ghcr.io/labring/sealos-infra-controller:dev + image: ghcr.io/labring/sealos-infra-controller:latest imagePullPolicy: Always livenessProbe: httpGet: diff --git a/controllers/metering/Makefile b/controllers/metering/Makefile index d14891e2535..9de4a33417f 100644 --- a/controllers/metering/Makefile +++ b/controllers/metering/Makefile @@ -1,6 +1,6 @@ # Image URL to use all building/pushing image targets -IMG ?= ghcr.io/labring/sealos-metering-controller:dev +IMG ?= ghcr.io/labring/sealos-metering-controller:latest # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. ENVTEST_K8S_VERSION = 1.23 diff --git a/controllers/metering/deploy/manifests/deploy.yaml b/controllers/metering/deploy/manifests/deploy.yaml index 6705a62a5cd..4a06da73952 100644 --- a/controllers/metering/deploy/manifests/deploy.yaml +++ b/controllers/metering/deploy/manifests/deploy.yaml @@ -567,7 +567,7 @@ spec: envFrom: - configMapRef: name: metering-manager-configmap - image: ghcr.io/labring/sealos-metering-controller:dev + image: ghcr.io/labring/sealos-metering-controller:latest imagePullPolicy: Always livenessProbe: httpGet: diff --git a/controllers/resources/Makefile b/controllers/resources/Makefile index efe48ccc6e4..e269b09ed11 100644 --- a/controllers/resources/Makefile +++ b/controllers/resources/Makefile @@ -1,6 +1,6 @@ # Image URL to use all building/pushing image targets -IMG ?= ghcr.io/labring/sealos-resources-controller:dev +IMG ?= ghcr.io/labring/sealos-resources-controller:latest # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. ENVTEST_K8S_VERSION = 1.23 diff --git a/controllers/resources/config/manager/manager.yaml b/controllers/resources/config/manager/manager.yaml index f5a43fadc6d..15c51ae20ea 100644 --- a/controllers/resources/config/manager/manager.yaml +++ b/controllers/resources/config/manager/manager.yaml @@ -35,7 +35,7 @@ spec: secretKeyRef: name: mongo-secret key: MONGO_URI - image: ghcr.io/labring/sealos-resources-controller:dev + image: ghcr.io/labring/sealos-resources-controller:latest imagePullPolicy: Always name: manager securityContext: diff --git a/controllers/resources/deploy/README.md b/controllers/resources/deploy/README.md index 5795f2c734c..91839d26b2d 100644 --- a/controllers/resources/deploy/README.md +++ b/controllers/resources/deploy/README.md @@ -2,7 +2,7 @@ ```shell # 需要传入完整的包含username passwd的mongo uri来创建secret： -sealos run ghcr.io/labring/sealos-cloud-resources-controller:dev --env MONGO_URI="mongodb://username:passwd@ip:port/sealos-resources?authSource=admin" +sealos run ghcr.io/labring/sealos-cloud-resources-controller:latest --env MONGO_URI="mongodb://username:passwd@ip:port/sealos-resources?authSource=admin" ``` -> 目前默认使用mongodb作为存储: sealos-resources 为数据库名 \ No newline at end of file +> 目前默认使用mongodb作为存储: sealos-resources 为数据库名 diff --git a/controllers/resources/deploy/manifests/deploy-manager.yaml b/controllers/resources/deploy/manifests/deploy-manager.yaml index c833ff77e32..148e91c7b37 100644 --- a/controllers/resources/deploy/manifests/deploy-manager.yaml +++ b/controllers/resources/deploy/manifests/deploy-manager.yaml @@ -55,7 +55,7 @@ spec: secretKeyRef: key: MONGO_URI name: mongo-secret - image: ghcr.io/labring/sealos-resources-controller:dev + image: ghcr.io/labring/sealos-resources-controller:latest imagePullPolicy: Always livenessProbe: httpGet: @@ -82,4 +82,4 @@ spec: securityContext: runAsNonRoot: true serviceAccountName: resources-controller-manager - terminationGracePeriodSeconds: 10 \ No newline at end of file + terminationGracePeriodSeconds: 10 diff --git a/controllers/resources/metering/Makefile b/controllers/resources/metering/Makefile index 28050140de3..3b8f9bd0aad 100644 --- a/controllers/resources/metering/Makefile +++ b/controllers/resources/metering/Makefile @@ -1,6 +1,6 @@ # Image URL to use all building/pushing image targets -IMG ?= ghcr.io/labring/sealos-resources-controller:dev +IMG ?= ghcr.io/labring/sealos-resources-controller:latest # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. ENVTEST_K8S_VERSION = 1.23 @@ -47,4 +47,4 @@ endif ## Location to install dependencies to LOCALBIN ?= $(shell pwd)/bin $(LOCALBIN): - mkdir -p $(LOCALBIN) \ No newline at end of file + mkdir -p $(LOCALBIN) diff --git a/controllers/resources/metering/deploy/manifests/deploy.yaml b/controllers/resources/metering/deploy/manifests/deploy.yaml index 7cf4e6b6711..a0309b872e5 100644 --- a/controllers/resources/metering/deploy/manifests/deploy.yaml +++ b/controllers/resources/metering/deploy/manifests/deploy.yaml @@ -23,7 +23,7 @@ spec: control-plane: metering-manager spec: containers: - - image: ghcr.io/labring/sealos-resources-metering-controller:dev + - image: ghcr.io/labring/sealos-resources-metering-controller:latest name: resource-metering command: - "/manager" @@ -49,4 +49,4 @@ spec: secretKeyRef: name: mongo-secret key: MONGO_URI - imagePullPolicy: Always \ No newline at end of file + imagePullPolicy: Always diff --git a/controllers/terminal/Makefile b/controllers/terminal/Makefile index 0b1baddbf96..6b550bdaa42 100644 --- a/controllers/terminal/Makefile +++ b/controllers/terminal/Makefile @@ -1,6 +1,6 @@ # Image URL to use all building/pushing image targets -IMG ?= ghcr.io/labring/sealos-terminal-controller:dev +IMG ?= ghcr.io/labring/sealos-terminal-controller:latest # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. ENVTEST_K8S_VERSION = 1.24.1 diff --git a/controllers/terminal/deploy/README.md b/controllers/terminal/deploy/README.md index 567ca6f20c8..9353208a2bc 100644 --- a/controllers/terminal/deploy/README.md +++ b/controllers/terminal/deploy/README.md @@ -1,11 +1,11 @@ ### How to build image ```shell -sealos build -t docker.io/labring/sealos-terminal-controller:dev -f Dockerfile . +sealos build -t docker.io/labring/sealos-terminal-controller:latest -f Dockerfile . ``` ### How to run ```shell -sealos run docker.io/labring/sealos-terminal-controller:dev +sealos run docker.io/labring/sealos-terminal-controller:latest ``` diff --git a/controllers/terminal/deploy/manifests/deploy.yaml.tmpl b/controllers/terminal/deploy/manifests/deploy.yaml.tmpl index df2416ef551..5c09f55b04f 100644 --- a/controllers/terminal/deploy/manifests/deploy.yaml.tmpl +++ b/controllers/terminal/deploy/manifests/deploy.yaml.tmpl @@ -447,7 +447,7 @@ spec: value: {{ .wildcardCertSecretName }} - name: SECRET_NAMESPACE value: {{ .wildcardCertSecretNamespace }} - image: ghcr.io/labring/sealos-terminal-controller:dev + image: ghcr.io/labring/sealos-terminal-controller:latest imagePullPolicy: Always livenessProbe: httpGet: diff --git a/controllers/user/Makefile b/controllers/user/Makefile index e315fcecff2..26a51b48df2 100644 --- a/controllers/user/Makefile +++ b/controllers/user/Makefile @@ -1,6 +1,6 @@ # Image URL to use all building/pushing image targets -IMG ?= ghcr.io/labring/sealos-user-controller:dev +IMG ?= ghcr.io/labring/sealos-user-controller:latest # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. ENVTEST_K8S_VERSION = 1.24.1 diff --git a/controllers/user/deploy/README.md b/controllers/user/deploy/README.md index c859ddb81dd..f0851852963 100644 --- a/controllers/user/deploy/README.md +++ b/controllers/user/deploy/README.md @@ -1,11 +1,11 @@ ### How to build image ```shell -sealos build -t docker.io/labring/sealos-user-controller:dev -f Dockerfile . +sealos build -t docker.io/labring/sealos-user-controller:latest -f Dockerfile . ``` ### How to run ```shell -sealos run docker.io/labring/sealos-user-controller:dev +sealos run docker.io/labring/sealos-user-controller:latest ``` diff --git a/controllers/user/deploy/manifests/deploy.yaml.tmpl b/controllers/user/deploy/manifests/deploy.yaml.tmpl index d1c5599eee3..4f18a350a3d 100644 --- a/controllers/user/deploy/manifests/deploy.yaml.tmpl +++ b/controllers/user/deploy/manifests/deploy.yaml.tmpl @@ -341,7 +341,7 @@ spec: value: {{ .cloudDomain }} - name: SEALOS_CLOUD_PORT value: "{{ .cloudPort }}" - image: ghcr.io/labring/sealos-user-controller:dev + image: ghcr.io/labring/sealos-user-controller:latest imagePullPolicy: Always livenessProbe: httpGet: diff --git a/deploy/cloud-deprecated/README.md b/deploy/cloud-deprecated/README.md index 96b8d643140..e77ec3037f2 100644 --- a/deploy/cloud-deprecated/README.md +++ b/deploy/cloud-deprecated/README.md @@ -17,7 +17,7 @@ metadata: name: secret spec: path: manifests/tls-secret.yaml - match: ghcr.io/labring/sealos-cloud:dev + match: ghcr.io/labring/sealos-cloud:latest strategy: merge data: | data: @@ -27,5 +27,5 @@ spec: ### run sealos cloud cluster image ```shell -sealos run ghcr.io/labring/sealos-cloud:dev --config-file tls-secret.yaml --env cloudDomain="cloud.example.com" +sealos run ghcr.io/labring/sealos-cloud:latest --config-file tls-secret.yaml --env cloudDomain="cloud.example.com" ``` diff --git a/deploy/cloud/README.md b/deploy/cloud/README.md index 74e35265ad1..c7a7a8e9d03 100644 --- a/deploy/cloud/README.md +++ b/deploy/cloud/README.md @@ -80,7 +80,7 @@ metadata: name: secret spec: path: manifests/tls-secret.yaml - match: docker.io/labring/sealos-cloud:dev + match: docker.io/labring/sealos-cloud:latest strategy: merge data: | data: @@ -91,5 +91,5 @@ spec: ------ ## run sealos cloud cluster image ```shell -sealos run docker.io/labring/sealos-cloud:dev --env cloudDomain="cloud.example.com" --config-file tls-secret.yaml +sealos run docker.io/labring/sealos-cloud:latest --env cloudDomain="cloud.example.com" --config-file tls-secret.yaml ``` diff --git a/frontend/desktop/deploy/README.md b/frontend/desktop/deploy/README.md index f714da6ab89..21f386f4726 100644 --- a/frontend/desktop/deploy/README.md +++ b/frontend/desktop/deploy/README.md @@ -1,7 +1,7 @@ ### How to build image ```shell -sealos build -t docker.io/labring/sealos-cloud-desktop:dev -f Kubefile . +sealos build -t docker.io/labring/sealos-cloud-desktop:latest -f Kubefile . ``` ### Env @@ -30,7 +30,7 @@ metadata: name: secret spec: path: manifests/secret.yaml - match: docker.io/labring/sealos-cloud-desktop:dev + match: docker.io/labring/sealos-cloud-desktop:latest strategy: merge data: | data: @@ -48,6 +48,6 @@ sealos run \ --env cloudDomain="cloud.sealos.io" \ --env wildcardCertSecretName="wildcard-cert" \ --env passwordEnabled="true" \ - docker.io/labring/sealos-cloud-desktop:dev \ + docker.io/labring/sealos-cloud-desktop:latest \ --config-file desktop-config.yaml ``` diff --git a/frontend/desktop/deploy/manifests/deploy.yaml.tmpl b/frontend/desktop/deploy/manifests/deploy.yaml.tmpl index cfb4bba3467..95e73b1ebaf 100644 --- a/frontend/desktop/deploy/manifests/deploy.yaml.tmpl +++ b/frontend/desktop/deploy/manifests/deploy.yaml.tmpl @@ -155,7 +155,7 @@ spec: capabilities: drop: - "ALL" - image: ghcr.io/labring/sealos-desktop-frontend:dev + image: ghcr.io/labring/sealos-desktop-frontend:latest imagePullPolicy: IfNotPresent volumeMounts: - name: desktop-frontend-volume @@ -171,4 +171,4 @@ spec: volumes: - name: desktop-frontend-volume configMap: - name: desktop-frontend-config \ No newline at end of file + name: desktop-frontend-config diff --git a/frontend/providers/adminer/deploy/manifests/deploy.yaml b/frontend/providers/adminer/deploy/manifests/deploy.yaml index 6ed528b1959..951212c89f5 100644 --- a/frontend/providers/adminer/deploy/manifests/deploy.yaml +++ b/frontend/providers/adminer/deploy/manifests/deploy.yaml @@ -50,7 +50,7 @@ spec: drop: - "ALL" # do not modify this image, it is used for CI/CD - image: ghcr.io/labring/sealos-adminer-frontend:dev + image: ghcr.io/labring/sealos-adminer-frontend:latest imagePullPolicy: Always volumeMounts: - name: adminer-frontend-volume @@ -75,4 +75,4 @@ spec: protocol: TCP targetPort: 3000 selector: - app: adminer-frontend \ No newline at end of file + app: adminer-frontend diff --git a/frontend/providers/applaunchpad/deploy/manifests/deploy.yaml.tmpl b/frontend/providers/applaunchpad/deploy/manifests/deploy.yaml.tmpl index 9d68ef9dc2b..dd378e4ff85 100644 --- a/frontend/providers/applaunchpad/deploy/manifests/deploy.yaml.tmpl +++ b/frontend/providers/applaunchpad/deploy/manifests/deploy.yaml.tmpl @@ -57,7 +57,7 @@ spec: cpu: 10m memory: 128Mi # do not modify this image, it is used for CI/CD - image: ghcr.io/labring/sealos-applaunchpad-frontend:dev + image: ghcr.io/labring/sealos-applaunchpad-frontend:latest imagePullPolicy: Always volumeMounts: - name: applaunchpad-frontend-volume @@ -82,4 +82,4 @@ spec: protocol: TCP targetPort: 3000 selector: - app: applaunchpad-frontend \ No newline at end of file + app: applaunchpad-frontend diff --git a/frontend/providers/bytebase/deploy/manifests/deploy.yaml b/frontend/providers/bytebase/deploy/manifests/deploy.yaml index baaef4838dc..b4d962d9fd7 100644 --- a/frontend/providers/bytebase/deploy/manifests/deploy.yaml +++ b/frontend/providers/bytebase/deploy/manifests/deploy.yaml @@ -50,7 +50,7 @@ spec: drop: - "ALL" # do not modify this image, it is used for CI/CD - image: ghcr.io/labring/sealos-bytebase-frontend:dev + image: ghcr.io/labring/sealos-bytebase-frontend:latest imagePullPolicy: Always volumeMounts: - name: bytebase-frontend-volume @@ -75,4 +75,4 @@ spec: protocol: TCP targetPort: 3000 selector: - app: bytebase-frontend \ No newline at end of file + app: bytebase-frontend diff --git a/frontend/providers/costcenter/deploy/manifests/deploy.yaml.tmpl b/frontend/providers/costcenter/deploy/manifests/deploy.yaml.tmpl index 7c9077be1ec..a0b35cbf4d8 100644 --- a/frontend/providers/costcenter/deploy/manifests/deploy.yaml.tmpl +++ b/frontend/providers/costcenter/deploy/manifests/deploy.yaml.tmpl @@ -55,7 +55,7 @@ spec: drop: - "ALL" # do not modify this image, it is used for CI/CD - image: ghcr.io/labring/sealos-costcenter-frontend:dev + image: ghcr.io/labring/sealos-costcenter-frontend:latest imagePullPolicy: Always volumeMounts: - name: costcenter-frontend-volume @@ -80,4 +80,4 @@ spec: protocol: TCP targetPort: 3000 selector: - app: costcenter-frontend \ No newline at end of file + app: costcenter-frontend diff --git a/frontend/providers/dbprovider/deploy/manifests/deploy.yaml.tmpl b/frontend/providers/dbprovider/deploy/manifests/deploy.yaml.tmpl index d252cb25a7f..d0153f7fd5e 100644 --- a/frontend/providers/dbprovider/deploy/manifests/deploy.yaml.tmpl +++ b/frontend/providers/dbprovider/deploy/manifests/deploy.yaml.tmpl @@ -55,7 +55,7 @@ spec: cpu: 10m memory: 128Mi # do not modify this image, it is used for CI/CD - image: ghcr.io/labring/sealos-dbprovider-frontend:dev + image: ghcr.io/labring/sealos-dbprovider-frontend:latest imagePullPolicy: Always volumeMounts: - name: dbprovider-frontend-volume diff --git a/frontend/providers/imagehub/deploy/manifests/deploy.yaml b/frontend/providers/imagehub/deploy/manifests/deploy.yaml index 43af0377405..e2359bcfe97 100644 --- a/frontend/providers/imagehub/deploy/manifests/deploy.yaml +++ b/frontend/providers/imagehub/deploy/manifests/deploy.yaml @@ -52,7 +52,7 @@ spec: drop: - "ALL" # do not modify this image, it is used for CI/CD - image: ghcr.io/labring/sealos-imagehub-frontend:dev + image: ghcr.io/labring/sealos-imagehub-frontend:latest imagePullPolicy: Always volumeMounts: - name: imagehub-frontend-volume @@ -77,4 +77,4 @@ spec: protocol: TCP targetPort: 3000 selector: - app: imagehub-frontend \ No newline at end of file + app: imagehub-frontend diff --git a/frontend/providers/terminal/deploy/manifests/deploy.yaml.tmpl b/frontend/providers/terminal/deploy/manifests/deploy.yaml.tmpl index e9014b77ac1..1fdb72b0904 100644 --- a/frontend/providers/terminal/deploy/manifests/deploy.yaml.tmpl +++ b/frontend/providers/terminal/deploy/manifests/deploy.yaml.tmpl @@ -55,7 +55,7 @@ spec: - name: SITE value: {{ .cloudDomain }} # do not modify this image, it is used for CI/CD - image: ghcr.io/labring/sealos-terminal-frontend:dev + image: ghcr.io/labring/sealos-terminal-frontend:latest imagePullPolicy: Always volumeMounts: - name: terminal-frontend-volume @@ -80,4 +80,4 @@ spec: protocol: TCP targetPort: 3000 selector: - app: terminal-frontend \ No newline at end of file + app: terminal-frontend diff --git a/frontend/static-cdn/Makefile b/frontend/static-cdn/Makefile index fc5753ee65e..cb9efb48f6a 100644 --- a/frontend/static-cdn/Makefile +++ b/frontend/static-cdn/Makefile @@ -1,5 +1,5 @@ # Image URL to use all building/pushing image targets -# IMG ?= ghcr.io/labring/sealos-desktop-static-cdn:dev +# IMG ?= ghcr.io/labring/sealos-desktop-static-cdn:latest IMG ?= fanux/static-cdn:v0.0.1 ##@ General diff --git a/frontend/static-cdn/deploy/manifest.yaml b/frontend/static-cdn/deploy/manifest.yaml index 272312a2b57..b7834fc3819 100644 --- a/frontend/static-cdn/deploy/manifest.yaml +++ b/frontend/static-cdn/deploy/manifest.yaml @@ -55,7 +55,7 @@ spec: capabilities: drop: - "ALL" - # image: ghcr.io/labring/sealos-desktop-static-cdn:dev + # image: ghcr.io/labring/sealos-desktop-static-cdn:latest image: fanux/static-cdn:v0.0.1 ports: - containerPort: 8080 @@ -91,4 +91,4 @@ spec: tls: - hosts: - cdn.cloud.sealos.io - secretName: wildcard-cloud-sealos-io-cert \ No newline at end of file + secretName: wildcard-cloud-sealos-io-cert diff --git a/service/auth/Makefile b/service/auth/Makefile index 38e1e60103d..4d49233537c 100644 --- a/service/auth/Makefile +++ b/service/auth/Makefile @@ -1,5 +1,5 @@ # Image URL to use all building/pushing image targets -IMG ?= ghcr.io/labring/sealos-auth-service:dev +IMG ?= ghcr.io/labring/sealos-auth-service:latest # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set) ifeq (,$(shell go env GOBIN)) diff --git a/service/auth/deploy/README.md b/service/auth/deploy/README.md index 673e9a476c7..d42322478e1 100644 --- a/service/auth/deploy/README.md +++ b/service/auth/deploy/README.md @@ -1,7 +1,7 @@ ### How to build image ```shell -sealos build -t docker.io/labring/sealos-auth-service:dev -f Kubefile . +sealos build -t docker.io/labring/sealos-auth-service:latest -f Kubefile . ``` ### Env @@ -23,5 +23,5 @@ sealos run --env callbackUrl="https://cloud.sealos.io/login/callback" --env ssoEndpoint="https://login.cloud.sealos.io" --env casdoorMysqlRootPassword="c2VhbG9zcHdk" - docker.io/labring/sealos-auth-service:dev + docker.io/labring/sealos-auth-service:latest ``` diff --git a/service/auth/deploy/manifests/deploy.yaml b/service/auth/deploy/manifests/deploy.yaml index f9f34c38d5f..8204f838be7 100644 --- a/service/auth/deploy/manifests/deploy.yaml +++ b/service/auth/deploy/manifests/deploy.yaml @@ -274,7 +274,7 @@ spec: control-plane: service-manager spec: containers: - - image: ghcr.io/labring/sealos-auth-service:dev + - image: ghcr.io/labring/sealos-auth-service:latest imagePullPolicy: Always livenessProbe: initialDelaySeconds: 15 diff --git a/service/hub/Makefile b/service/hub/Makefile index 436533c0339..e7115d252d4 100644 --- a/service/hub/Makefile +++ b/service/hub/Makefile @@ -1,4 +1,4 @@ -IMG ?= labring/sealos-hub-service:dev +IMG ?= labring/sealos-hub-service:latest # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set) ifeq (,$(shell go env GOBIN)) @@ -52,4 +52,4 @@ docker-build: build .PHONY: docker-push docker-push: - docker push $(IMG) \ No newline at end of file + docker push $(IMG) diff --git a/service/hub/deploy/manifests/deploy.yaml b/service/hub/deploy/manifests/deploy.yaml index 45ef6b5570b..d9526240f41 100644 --- a/service/hub/deploy/manifests/deploy.yaml +++ b/service/hub/deploy/manifests/deploy.yaml @@ -156,7 +156,7 @@ spec: serviceAccountName: hub-service-anonymous containers: - name: hub-service-server - image: lingdie/sealos-hub-service:dev + image: lingdie/sealos-hub-service:latest ports: - containerPort: 5001 args: @@ -188,4 +188,4 @@ spec: protocol: TCP targetPort: 5001 selector: - app: hub-service \ No newline at end of file + app: hub-service diff --git a/service/payment/Makefile b/service/payment/Makefile index 6d896d9bc62..c659ba251c9 100644 --- a/service/payment/Makefile +++ b/service/payment/Makefile @@ -1,6 +1,6 @@ # Image URL to use all building/pushing image targets -IMG ?= ghcr.io/labring/sealos-payment-service:dev +IMG ?= ghcr.io/labring/sealos-payment-service:latest # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set) ifeq (,$(shell go env GOBIN)) diff --git a/webhooks/whitelist/Makefile b/webhooks/whitelist/Makefile index 9bf9e3acfb8..6e5d61ce970 100644 --- a/webhooks/whitelist/Makefile +++ b/webhooks/whitelist/Makefile @@ -1,6 +1,6 @@ # Image URL to use all building/pushing image targets -IMG ?= ghcr.io/labring/sealos-whitelist-webhook:dev +IMG ?= ghcr.io/labring/sealos-whitelist-webhook:latest # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. ENVTEST_K8S_VERSION = 1.24.2 diff --git a/webhooks/whitelist/deploy/manifests/deploy.yaml b/webhooks/whitelist/deploy/manifests/deploy.yaml index d57610497f0..01398682b70 100644 --- a/webhooks/whitelist/deploy/manifests/deploy.yaml +++ b/webhooks/whitelist/deploy/manifests/deploy.yaml @@ -303,7 +303,7 @@ spec: - --leader-elect command: - /manager - image: ghcr.io/labring/sealos-whitelist-webhook:dev + image: ghcr.io/labring/sealos-whitelist-webhook:latest livenessProbe: httpGet: path: /healthz