diff --git a/.github/workflows/e2e-ci.yaml b/.github/workflows/e2e-ci.yaml index 094f2f6..56074d5 100644 --- a/.github/workflows/e2e-ci.yaml +++ b/.github/workflows/e2e-ci.yaml @@ -11,14 +11,14 @@ on: # Environment variables available to all jobs and steps in this workflow. env: REGION_ID: cn-zhangjiakou - REGISTRY: registry.cn-zhangjiakou.aliyuncs.com + REGISTRY: polardbx-ci-registry.cn-zhangjiakou.cr.aliyuncs.com NAMESPACE: polardbx-ci TAG: ${{ github.sha }} ACK_CLUSTER_ID: c5ef7e2fffca74f4286bd91d6a9a47b2f jobs: build: - runs-on: ubuntu-latest + runs-on: self-hosted steps: - name: Checkout uses: actions/checkout@v3 @@ -27,7 +27,7 @@ jobs: - name: Setup go environment uses: actions/setup-go@v3 with: - go-version: '1.18' + go-version: '1.21' # 2 Set ACK context - name: Set K8s context @@ -41,7 +41,7 @@ jobs: - name: Login to ACR with the AccessKey pair uses: aliyun/acr-login@v1 with: - login-server: https://registry.cn-zhangjiakou.aliyuncs.com + login-server: https://polardbx-ci-registry.cn-zhangjiakou.cr.aliyuncs.com username: "${{ secrets.ACR_USERNAME }}" password: "${{ secrets.ACR_PASSWORD }}" region-id: "${{ env.REGION_ID }}" diff --git a/.github/workflows/images-ci.yaml b/.github/workflows/images-ci.yaml index e31f723..dca05b0 100644 --- a/.github/workflows/images-ci.yaml +++ b/.github/workflows/images-ci.yaml @@ -22,7 +22,7 @@ jobs: - name: Setup go environment uses: actions/setup-go@v3 with: - go-version: '1.18' + go-version: '1.21' # 2 Build images - name: Build images diff --git a/pkg/operator/v1/xstore/controllers/xstore_controller.go b/pkg/operator/v1/xstore/controllers/xstore_controller.go index be10db9..1c5bb1f 100644 --- a/pkg/operator/v1/xstore/controllers/xstore_controller.go +++ b/pkg/operator/v1/xstore/controllers/xstore_controller.go @@ -38,6 +38,7 @@ import ( "github.com/alibaba/polardbx-operator/pkg/k8s/control" "github.com/alibaba/polardbx-operator/pkg/operator/v1/config" "github.com/alibaba/polardbx-operator/pkg/operator/v1/xstore/plugin" + _ "github.com/alibaba/polardbx-operator/pkg/operator/v1/xstore/plugin/engines" xstorev1reconcile "github.com/alibaba/polardbx-operator/pkg/operator/v1/xstore/reconcile" ) diff --git a/test/e2e/polardbxcluster/lifecycle/upgrade.go b/test/e2e/polardbxcluster/lifecycle/upgrade.go index 70b2aef..c920228 100644 --- a/test/e2e/polardbxcluster/lifecycle/upgrade.go +++ b/test/e2e/polardbxcluster/lifecycle/upgrade.go @@ -283,7 +283,7 @@ var _ = ginkgo.Describe("[PolarDBXCluster] [Lifecycle:Upgrade]", func() { obj.Spec.Topology.Nodes.Columnar = &polardbxv1polardbx.TopologyNodeColumnar{ Replicas: 1, Template: polardbxv1polardbx.ColumnarTemplate{ - Image: "registry.cn-zhangjiakou.aliyuncs.com/drds_pre/polardbx-columnar:v1", + Image: "pxc-registry.cn-shanghai.cr.aliyuncs.com/polardbx/polardbx-columnar:v1test", }, } err := f.Client.Update(f.Ctx, obj)