From beb212c443152fd5cc9901fd86d65df03582b20c Mon Sep 17 00:00:00 2001 From: warjiang <1096409085@qq.com> Date: Wed, 12 Jun 2024 15:32:08 +0800 Subject: [PATCH] chore: remove personal prefix Signed-off-by: warjiang <1096409085@qq.com> --- .github/workflows/push-image.yml | 14 +++++++------- artifacts/dashboard/karmada-dashboard-api.yaml | 2 +- artifacts/dashboard/karmada-dashboard-web.yaml | 2 +- pkg/client/init.go | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/push-image.yml b/.github/workflows/push-image.yml index 0756c6cd..8aa903c8 100644 --- a/.github/workflows/push-image.yml +++ b/.github/workflows/push-image.yml @@ -4,7 +4,6 @@ on: push: branches: - main - - refactor/dashboard - feature/* jobs: @@ -37,7 +36,7 @@ jobs: runs-on: ubuntu-latest needs: [ "build-fronted" ] env: - IMAGE_NAME: warjiang/karmada-dashboard-web + IMAGE_NAME: karmada/karmada-dashboard-web BINARY_NAME: karmada-dashboard-web steps: - name: Checkout @@ -52,10 +51,10 @@ jobs: echo "arch=$(go env GOHOSTARCH)" >> $GITHUB_OUTPUT echo "image_name=$IMAGE_NAME" >> $GITHUB_OUTPUT echo "binary_name=$BINARY_NAME" >> $GITHUB_OUTPUT - - name: Login to Docker Hub + - name: Login to DockerHub uses: docker/login-action@v3 with: - username: ${{ secrets.DOCKERHUB_USERNAME }} + username: ${{ secrets.DOCKERHUB_USER_NAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build karmada-dashboard-web binary run: make bin-karmada-dashboard-web @@ -88,10 +87,11 @@ jobs: BUILD_PLATFORMS=${{ steps.misc.outputs.os }}/${{ steps.misc.outputs.arch }} + build-and-push-api: runs-on: ubuntu-latest env: - IMAGE_NAME: warjiang/karmada-dashboard-api + IMAGE_NAME: karmada/karmada-dashboard-api BINARY_NAME: karmada-dashboard-api steps: - name: Checkout @@ -106,10 +106,10 @@ jobs: echo "arch=$(go env GOHOSTARCH)" >> $GITHUB_OUTPUT echo "image_name=$IMAGE_NAME" >> $GITHUB_OUTPUT echo "binary_name=$BINARY_NAME" >> $GITHUB_OUTPUT - - name: Login to Docker Hub + - name: Login to DockerHub uses: docker/login-action@v3 with: - username: ${{ secrets.DOCKERHUB_USERNAME }} + username: ${{ secrets.DOCKERHUB_USER_NAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Extract metadata for the Docker image id: meta diff --git a/artifacts/dashboard/karmada-dashboard-api.yaml b/artifacts/dashboard/karmada-dashboard-api.yaml index 3f805c00..ecb1ed18 100644 --- a/artifacts/dashboard/karmada-dashboard-api.yaml +++ b/artifacts/dashboard/karmada-dashboard-api.yaml @@ -32,7 +32,7 @@ spec: - --insecure-bind-address=0.0.0.0 - --bind-address=0.0.0.0 name: karmada-dashboard-api - image: warjiang/karmada-dashboard-api:refactor-dashboard + image: karmada/karmada-dashboard-api:refactor-dashboard imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 8 diff --git a/artifacts/dashboard/karmada-dashboard-web.yaml b/artifacts/dashboard/karmada-dashboard-web.yaml index 5662228b..5f285772 100644 --- a/artifacts/dashboard/karmada-dashboard-web.yaml +++ b/artifacts/dashboard/karmada-dashboard-web.yaml @@ -28,7 +28,7 @@ spec: - --insecure-bind-address=0.0.0.0 - --bind-address=0.0.0.0 name: karmada-dashboard-web - image: warjiang/karmada-dashboard-web:refactor-dashboard + image: karmada/karmada-dashboard-web:refactor-dashboard imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 8 diff --git a/pkg/client/init.go b/pkg/client/init.go index b71d702e..2065e278 100644 --- a/pkg/client/init.go +++ b/pkg/client/init.go @@ -98,7 +98,7 @@ func (in *configBuilder) buildApiConfig() (*clientcmdapi.Config, error) { func isKubeInitialized() bool { if kubernetesRestConfig == nil || kubernetesApiConfig == nil { - klog.Errorf(`warjiang/karmada-dashboard/client' package has not been initialized properly. Run 'client.InitKubeConfig(...)' to initialize it. `) + klog.Errorf(`karmada/karmada-dashboard/client' package has not been initialized properly. Run 'client.InitKubeConfig(...)' to initialize it. `) return false } return true @@ -164,7 +164,7 @@ func GetKubeConfig() (*rest.Config, *clientcmdapi.Config, error) { func isKarmadaInitialized() bool { if karmadaRestConfig == nil || karmadaApiConfig == nil { - klog.Errorf(`warjiang/karmada-dashboard/client' package has not been initialized properly. Run 'client.InitKarmadaConfig(...)' to initialize it. `) + klog.Errorf(`karmada/karmada-dashboard/client' package has not been initialized properly. Run 'client.InitKarmadaConfig(...)' to initialize it. `) return false } return true