Merge branch 'main' into bugfix/fix-orioledb-dependency

.github/localflows/cicd-local.yml

@@ -10,9 +10,6 @@ jobs:
       - uses: actions/checkout@v3
       - name: make test
         run:  |
-          mkdir -p ./bin
-          cp -r /go/bin/controller-gen ./bin/controller-gen
-          cp -r /go/bin/setup-envtest ./bin/setup-envtest
           make mod-vendor lint test
 
 

.github/workflows/cicd-pull-request.yml

@@ -94,9 +94,6 @@ jobs:
       - uses: actions/checkout@v3
       - name: make mod-vendor
         run: |
-          mkdir -p ./bin
-          cp -r /go/bin/controller-gen ./bin/controller-gen
-          cp -r /go/bin/setup-envtest ./bin/setup-envtest
           make mod-vendor
 
       - name: make lint
@@ -149,7 +146,7 @@ jobs:
     with:
       MAKE_OPS_PRE: "generate"
       IMG: "apecloud/kubeblocks"
-      GO_VERSION: "1.20.5"
+      GO_VERSION: "1.21"
       BUILDX_PLATFORMS: "linux/amd64"
       DOCKERFILE_PATH: "./docker/Dockerfile"
     secrets: inherit
@@ -159,9 +156,9 @@ jobs:
     if: contains(needs.trigger-mode.outputs.trigger-mode, '[docker]')
     uses: apecloud/apecloud-cd/.github/workflows/[email protected]
     with:
-      MAKE_OPS_PRE: "generate test-go-generate"
+      MAKE_OPS_PRE: "module generate test-go-generate"
       IMG: "apecloud/kubeblocks-tools"
-      GO_VERSION: "1.20.5"
+      GO_VERSION: "1.21"
       BUILDX_PLATFORMS: "linux/amd64"
       DOCKERFILE_PATH: "./docker/Dockerfile-tools"
     secrets: inherit

.github/workflows/cicd-push.yml

@@ -11,7 +11,7 @@ on:
 env:
   GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
   BASE_BRANCH: origin/main
-  GO_VERSION: "1.20.5"
+  GO_VERSION: "1.21"
 
 jobs:
   trigger-mode:
@@ -133,10 +133,6 @@ jobs:
       - uses: actions/checkout@v3
       - name: make manifests check
         run: |
-          mkdir -p ./bin
-          cp -r /go/bin/controller-gen ./bin/controller-gen
-          cp -r /go/bin/setup-envtest ./bin/setup-envtest
-
           make manifests
           FILE_CHANGES=`git diff --name-only ${{ github.sha }}`
           if [[ ! -z "$FILE_CHANGES" ]]; then
@@ -199,7 +195,7 @@ jobs:
     with:
       MAKE_OPS_PRE: "generate"
       IMG: "apecloud/kubeblocks"
-      GO_VERSION: "1.20.5"
+      GO_VERSION: "1.21"
       BUILDX_PLATFORMS: "linux/amd64"
       DOCKERFILE_PATH: "./docker/Dockerfile"
     secrets: inherit
@@ -209,9 +205,9 @@ jobs:
     if: ${{ contains(needs.trigger-mode.outputs.trigger-mode, '[docker]') }}
     uses: apecloud/apecloud-cd/.github/workflows/[email protected]
     with:
-      MAKE_OPS_PRE: "generate test-go-generate"
+      MAKE_OPS_PRE: "module generate test-go-generate"
       IMG: "apecloud/kubeblocks-tools"
-      GO_VERSION: "1.20.5"
+      GO_VERSION: "1.21"
       BUILDX_PLATFORMS: "linux/amd64"
       DOCKERFILE_PATH: "./docker/Dockerfile-tools"
     secrets: inherit

.github/workflows/codeql.yml

@@ -8,7 +8,7 @@ on:
 
 env:
   BASE_BRANCH: origin/main
-  GO_VERSION: "1.20.5"
+  GO_VERSION: "1.21"
 
 jobs:
   trigger-mode:

.github/workflows/e2e-kbcli.yml

@@ -12,7 +12,7 @@ on:
         required: false
         default: ''
       TEST_TYPE:
-        description: 'test type (e.g. mysql|postgres|redis|mongo|kafka|pulsar|weaviate|qdrant|smarte|scale|greptimedb|nebula|risingwave|starrocks|oceanbase|foxlake)'
+        description: 'test type (e.g. mysql|postgres|redis|mongo|kafka|pulsar|weaviate|qdrant|smarte|scale|greptimedb|nebula|risingwave|starrocks|oceanbase|foxlake|oracle-mysql|asmysql|openldap)'
         required: false
         default: ''
       CLOUD_PROVIDER:
@@ -87,7 +87,7 @@ jobs:
   e2e:
     name: ${{ inputs.CLOUD_PROVIDER }}
     needs: check
-    uses: apecloud/apecloud-cd/.github/workflows/kbcli-test-k8s.yml@v0.1.25
+    uses: apecloud/apecloud-cd/.github/workflows/kbcli-test-k8s.yml@main
     with:
       CLOUD_PROVIDER: "${{ inputs.CLOUD_PROVIDER }}"
       KB_VERSION: "${{ needs.check.outputs.release-version }}"
@@ -96,7 +96,7 @@ jobs:
       INSTANCE_TYPE: "${{ inputs.INSTANCE_TYPE }}"
       REGION: "${{ needs.check.outputs.cluster-region }}"
       BRANCH_NAME: "${{ inputs.BRANCH_NAME }}"
-      APECD_REF: "v0.1.25"
+      APECD_REF: "main"
       ARGS: "${{ inputs.ARGS }}"
       TEST_TYPE: "${{ inputs.TEST_TYPE }}"
     secrets: inherit

.github/workflows/e2e-performance.yml

@@ -68,7 +68,7 @@ jobs:
   performance:
     name: ${{ inputs.NODE_TYPE }} ${{ inputs.PERFORMANCE_TYPE }}
     needs: check
-    uses: apecloud/apecloud-cd/.github/workflows/performance-test-k8s.yaml@v0.1.23
+    uses: apecloud/apecloud-cd/.github/workflows/performance-test-k8s.yml@v0.1.30
     with:
       CLOUD_PROVIDER: "eks"
       CLUSTER_VERSION: "${{ inputs.K8S_VERSION }}"
@@ -80,5 +80,5 @@ jobs:
       BENCH_TABLES: "${{ inputs.BENCH_TABLES }}"
       CLUSTER_STORAGE: "${{ inputs.CLUSTER_STORAGE }}"
       REGION: "${{ vars.REGION_AWK_EKS }}"
-      APECD_REF: "v0.1.23"
+      APECD_REF: "v0.1.30"
     secrets: inherit

.github/workflows/milestone-set.yaml

@@ -0,0 +1,35 @@
+name: Set Milestone
+
+on:
+  workflow_dispatch:
+  issues:
+    types:
+      - opened
+      - closed
+  pull_request_target:
+    types:
+      - opened
+      - closed
+
+
+jobs:
+  issue-milestone:
+    if: ${{ github.event_name == 'issues' }}
+    uses: apecloud/apecloud-cd/.github/workflows/[email protected]
+    with:
+      APECD_REF: "v0.1.31"
+    secrets: inherit
+
+  pr-milestone:
+    if: ${{ github.event_name  == 'pull_request_target' }}
+    uses: apecloud/apecloud-cd/.github/workflows/[email protected]
+    with:
+      APECD_REF: "v0.1.31"
+    secrets: inherit
+
+  move_milestone:
+    if: ${{ github.event_name  == 'workflow_dispatch' }}
+    uses: apecloud/apecloud-cd/.github/workflows/[email protected]
+    with:
+      APECD_REF: "v0.1.31"
+    secrets: inherit

.github/workflows/milestoneclose.yml

@@ -12,7 +12,13 @@ env:
   PROJECT_NUMBER: 2
 
 jobs:
-   move_issues:
+  move_milestone:
+    uses: apecloud/apecloud-cd/.github/workflows/[email protected]
+    with:
+      APECD_REF: "v0.1.31"
+    secrets: inherit
+
+  move_issues:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo

.github/workflows/pull-request-label-size.yaml

@@ -4,16 +4,10 @@ on:
   pull_request_target:
     types: [ edited, opened, synchronize ]
 
-env:
-  GITHUB_TOKEN: ${{ github.token }}
 
 jobs:
   size-label:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: set size label
-        run: |
-          bash .github/utils/utils.sh --type 15 \
-              --github-token "${{ env.GITHUB_TOKEN }}" \
-              --pr-number ${{ github.event.pull_request.number }}
+    uses: apecloud/apecloud-cd/.github/workflows/[email protected]
+    with:
+      APECD_REF: "v0.1.30"
+    secrets: inherit

.github/workflows/release-delete.yml

@@ -15,15 +15,15 @@ run-name: Delete Release:${{ inputs.release-version }}
 jobs:
   delete-release:
     if: github.event_name != 'schedule'
-    uses: apecloud/apecloud-cd/.github/workflows/[email protected].25
+    uses: apecloud/apecloud-cd/.github/workflows/[email protected].29
     with:
       VERSION: "${{ inputs.release-version }}"
-      APECD_REF: "v0.1.25"
+      APECD_REF: "v0.1.29"
     secrets: inherit
 
   delete-release-schedule:
     if: github.event_name == 'schedule'
-    uses: apecloud/apecloud-cd/.github/workflows/[email protected].25
+    uses: apecloud/apecloud-cd/.github/workflows/[email protected].29
     with:
-      APECD_REF: "v0.1.25"
+      APECD_REF: "v0.1.29"
     secrets: inherit

.github/workflows/release-helm-chart.yml

@@ -37,14 +37,14 @@ jobs:
 
   release-chart:
     needs: chart-version
-    uses: apecloud/apecloud-cd/.github/workflows/[email protected].25
+    uses: apecloud/apecloud-cd/.github/workflows/[email protected].28
     with:
       MAKE_OPS: "bump-chart-ver"
       VERSION: "${{ needs.chart-version.outputs.chart-version }}"
       CHART_NAME: "kubeblocks"
       CHART_DIR: "deploy/helm"
       DEP_CHART_DIR: "deploy/helm/depend-charts"
-      APECD_REF: "v0.1.25"
+      APECD_REF: "v0.1.28"
     secrets: inherit
 
   release-charts-image:
@@ -54,7 +54,7 @@ jobs:
       MAKE_OPS_PRE: "helm-package VERSION=${{ needs.chart-version.outputs.chart-version-bump }}"
       IMG: "apecloud/kubeblocks-charts"
       VERSION: "${{ needs.chart-version.outputs.chart-version }}"
-      GO_VERSION: "1.20.5"
+      GO_VERSION: "1.21"
       APECD_REF: "v0.1.24"
       DOCKERFILE_PATH: "./docker/Dockerfile-charts"
     secrets: inherit

.github/workflows/release-image.yml

@@ -45,7 +45,7 @@ jobs:
       MAKE_OPS_PRE: "generate"
       IMG: "apecloud/kubeblocks"
       VERSION: "${{ needs.image-tag.outputs.tag-name }}"
-      GO_VERSION: "1.20.5"
+      GO_VERSION: "1.21"
       APECD_REF: "v0.1.24"
       DOCKERFILE_PATH: "./docker/Dockerfile"
     secrets: inherit
@@ -54,10 +54,10 @@ jobs:
     needs: image-tag
     uses: apecloud/apecloud-cd/.github/workflows/[email protected]
     with:
-      MAKE_OPS_PRE: "generate test-go-generate"
+      MAKE_OPS_PRE: "module generate test-go-generate"
       IMG: "apecloud/kubeblocks-tools"
       VERSION: "${{ needs.image-tag.outputs.tag-name }}"
-      GO_VERSION: "1.20.5"
+      GO_VERSION: "1.21"
       APECD_REF: "v0.1.24"
       DOCKERFILE_PATH: "./docker/Dockerfile-tools"
     secrets: inherit

.github/workflows/release-publish.yml

@@ -9,7 +9,7 @@ env:
   GH_TOKEN: ${{ github.token }}
   GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
   TAG_NAME: ${{ github.ref_name }}
-  GO_VERSION: "1.20.5"
+  GO_VERSION: "1.21"
   CLI_NAME: 'kbcli'
   CLI_REPO: 'apecloud/kbcli'
   GITLAB_KBCLI_PROJECT_ID: 85948

.goreleaser.yaml

@@ -28,7 +28,7 @@ builds:
       - amd64
       - arm64
     env:
-      - ASSUME_NO_MOVING_GC_UNSAFE_RISK_IT_WITH=go1.20
+      - ASSUME_NO_MOVING_GC_UNSAFE_RISK_IT_WITH=go1.21
       - CGO_ENABLED=0
     tags:
       - containers_image_openpgp

Makefile

@@ -477,8 +477,8 @@ CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
 ENVTEST ?= $(LOCALBIN)/setup-envtest
 
 ## Tool Versions
-KUSTOMIZE_VERSION ?= v4.5.7
-CONTROLLER_TOOLS_VERSION ?= v0.9.0
+KUSTOMIZE_VERSION ?= v5.1.1
+CONTROLLER_TOOLS_VERSION ?= v0.12.1
 CUE_VERSION ?= v0.4.3
 
 KUSTOMIZE_INSTALL_SCRIPT ?= "$(GITHUB_PROXY)https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
@@ -646,8 +646,24 @@ else ifeq ($(TEST_TYPE), kafka)
 	$(HELM) template kafka-cluster deploy/kafka-cluster > test/e2e/testdata/smoketest/kafka/00_kafkacluster.yaml
 else ifeq ($(TEST_TYPE), foxlake)
 	$(HELM) dependency build deploy/foxlake-cluster --skip-refresh
-	$(HELM) upgrade --install etcd deploy/foxlake
+	$(HELM) upgrade --install foxlake deploy/foxlake
 	$(HELM) template foxlake-cluster deploy/foxlake-cluster > test/e2e/testdata/smoketest/foxlake/00_foxlakecluster.yaml
+else ifeq ($(TEST_TYPE), oceanbase)
+	$(HELM) dependency build deploy/oceanbase-cluster --skip-refresh
+	$(HELM) upgrade --install oceanbase deploy/oceanbase
+	$(HELM) template oceanbase-cluster deploy/oceanbase-cluster > test/e2e/testdata/smoketest/oceanbase/00_oceanbasecluster.yaml
+else ifeq ($(TEST_TYPE), official-postgresql)
+	$(HELM) dependency build deploy/official-postgresql-cluster --skip-refresh
+	$(HELM) upgrade --install official-postgresql deploy/official-postgresql
+	$(HELM) template official-pg deploy/official-postgresql-cluster > test/e2e/testdata/smoketest/official-postgresql/00_official_pgcluster.yaml
+else ifeq ($(TEST_TYPE), openldap)
+	$(HELM) dependency build deploy/openldap-cluster --skip-refresh
+	$(HELM) upgrade --install openldap deploy/openldap
+	$(HELM) template openldap-cluster deploy/openldap-cluster > test/e2e/testdata/smoketest/openldap/00_openldapcluster.yaml
+else ifeq ($(TEST_TYPE), orioledb)
+	$(HELM) dependency build deploy/orioledb-cluster --skip-refresh
+	$(HELM) upgrade --install orioledb deploy/orioledb
+	$(HELM) template oriole-cluster deploy/orioledb-cluster > test/e2e/testdata/smoketest/orioledb/00_orioledbcluster.yaml
 else
 	$(error "test type does not exist")
 endif
@@ -685,6 +701,12 @@ else ifeq ($(TEST_TYPE), kafka)
 	$(HELM) upgrade --install kafka deploy/kafka
 else ifeq ($(TEST_TYPE), foxlake)
 	$(HELM) upgrade --install foxlake deploy/foxlake
+else ifeq ($(TEST_TYPE), oceanbase)
+	$(HELM) upgrade --install oceanbase deploy/oceanbase
+else ifeq ($(TEST_TYPE), oceanbase)
+	$(HELM) upgrade --install official-postgresql deploy/official-postgresql
+else ifeq ($(TEST_TYPE), openldap)
+	$(HELM) upgrade --install openldap deploy/openldap
 else
 	$(error "test type does not exist")
 endif