Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release/v1.6.0 #37

Merged
merged 6 commits into from
Apr 24, 2024
Merged

Release/v1.6.0 #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5a07e7c
update e2e
dingfeng Apr 23, 2024
6b608d0
update e2e
dingfeng Apr 23, 2024
5485271
run on self-hosted
dingfeng Apr 23, 2024
4b5553c
update registry address
dingfeng Apr 24, 2024
a0496fa
add engines to import plugin
dingfeng Apr 24, 2024
374d850
update columnar image in the testcase
dingfeng Apr 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/e2e-ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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 }}"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/images-ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions pkg/operator/v1/xstore/controllers/xstore_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion test/e2e/polardbxcluster/lifecycle/upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading