Merge branch 'main' into support/hscale-in-its

Author: leon-inf

.github/workflows/code-assistant.yml

@@ -19,7 +19,7 @@ permissions:
 
 jobs:
   code-assistant:
-    uses: All-Hands-AI/OpenHands/.github/workflows/openhands-resolver.yml@main
+    uses: OpenHands/OpenHands/.github/workflows/openhands-resolver.yml@main
     with:
       macro: ${{ vars.MACRO || '@openhands-agent' }}
       target_branch: ${{ vars.TARGET_BRANCH || 'main' }}

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

@@ -129,6 +129,62 @@ jobs:
       APECD_REF: "v0.1.86"
     secrets: inherit
 
+  release-result:
+    if: github.event.action == 'published'
+    needs: [ release-message ]
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        type: [image, chart]
+    steps:
+      - name: Restore ${{ matrix.type }} Artifact
+        id: cache-artifact-restore
+        uses: actions/cache/restore@v3
+        with:
+          path: |
+            ${{ env.RELEASE_VERSION }}-${{ matrix.type }}
+          key: ${{ env.RELEASE_VERSION }}-${{ matrix.type }}
+
+      - name: check release result
+        run: |
+          release_result=$( cat ${{ env.RELEASE_VERSION }}-${{ matrix.type }} )
+          if [[ "$release_result" != "success" ]]; then
+              exit 1
+          fi
+
+  e2e-kbcli:
+    needs: [ release-message, release-result ]
+    uses: apecloud/apecloud-cd/.github/workflows/[email protected]
+    strategy:
+      fail-fast: false
+      matrix:
+        test-type: [ apecloud-mysql|asmysql|asmysql-proxy|asmysql-orc|asmysql-orc-proxy|kafka|mongodb|mongodb-shard|postgresql|postgresql-etcd|redis|redis-cluster,
+                     damengdb|gaussdb|goldendb|greatdb|kingbase|mssql|oceanbase-ent|oracle|starrocks-ent|tdsql|vastbase|oceanbase-proxy,
+                     clickhouse|elasticsearch|etcd|nebula|qdrant|rocketmqe|greptimedb|polardbx|starrocks|vanilla-pg,
+                     mariadb|mogdb|oceanbase|opensearch|orioledb|orchestrator|risingwave|weaviate|yashandb|doris,
+                     influxdb|loki|minio|milvus|rabbitmq|tdengine|tidb|victoria-metrics|zookeeper|hadoop|hive ]
+    with:
+      GITHUB_REPO: "apecloud/kubeblocks"
+      BRANCH_NAME: "main"
+      WORKFLOW_ID: "e2e-kbcli.yml"
+      APECD_REF: "v0.1.35"
+      VERSION: "${{ needs.release-message.outputs.release-version }}"
+      EXTRA_ARGS: "TEST_TYPE=${{ matrix.test-type }}#CLOUD_PROVIDER=${{ vars.CLOUD_PROVIDER }}"
+    secrets: inherit
+
+  delete-cache:
+    needs: [ e2e-kbcli ]
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        type: [image, chart]
+    steps:
+      - uses: actions/checkout@v4
+      - name: delete ${{ matrix.type }} cache
+        continue-on-error: true
+        run: |
+          bash .github/utils/utils.sh --type 17 --tag-name "${{ env.RELEASE_VERSION }}-${{ matrix.type }}"
+
   get-addons-chart-dir:
     runs-on: ubuntu-latest
     outputs:
@@ -169,55 +225,86 @@ jobs:
       APECD_REF: "v0.1.96"
     secrets: inherit
 
-#  release-addons-chart-ent:
-#    needs: [ release-chart ]
-#    uses: apecloud/apecloud-cd/.github/workflows/[email protected]
-#    with:
-#      GITHUB_REPO: "apecloud/apecloud-addons"
-#      GITHUB_REF: "${{ github.ref_name }}"
-#      CHART_DIR: "addons"
-#      APECD_REF: "v0.1.96"
-#      ENABLE_JIHU: false
-#    secrets: inherit
-#
-#  get-addons-chart-dir-ent:
-#    runs-on: ubuntu-latest
-#    outputs:
-#      matrix: ${{ steps.get_addons_chart_dir.outputs.matrix }}
-#    steps:
-#      - name: Checkout apecloud-addons Code
-#        uses: actions/checkout@v4
-#        with:
-#          repository: apecloud/apecloud-addons
-#          path: apecloud-addons
-#          ref: "${{ github.ref_name }}"
-#          token: ${{ env.GITHUB_TOKEN }}
-#
-#      - name: get addons chart dir
-#        id: get_addons_chart_dir
-#        run: |
-#          addons_list=$(ls apecloud-addons/addons)
-#          ADDONS_DIR=""
-#          for addons_name in $( echo "$addons_list" ); do
-#              if [[ -z "$ADDONS_DIR" ]]; then
-#                  ADDONS_DIR="{\"addon-name\":\"$addons_name\"}"
-#              else
-#                  ADDONS_DIR="$ADDONS_DIR,{\"addon-name\":\"$addons_name\"}"
-#              fi
-#          done
-#          echo "$ADDONS_DIR"
-#          echo "matrix={\"include\":[$ADDONS_DIR]}" >> $GITHUB_OUTPUT
-#
-#  release-addons-chart-jihu-ent:
-#    needs: [ get-addons-chart-dir-ent ]
-#    strategy:
-#      fail-fast: false
-#      matrix: ${{ fromJSON(needs.get-addons-chart-dir-ent.outputs.matrix) }}
-#    uses: apecloud/apecloud-cd/.github/workflows/[email protected]
-#    with:
-#      GITHUB_REPO: "apecloud/apecloud-addons"
-#      GITHUB_REF: "${{ github.ref_name }}"
-#      CHART_DIR: "addons"
-#      SPECIFY_CHART: "${{ matrix.addon-name }}"
-#      APECD_REF: "v0.1.96"
-#    secrets: inherit
+  release-addons-chart-ent:
+    needs: [ release-chart ]
+    uses: apecloud/apecloud-cd/.github/workflows/[email protected]
+    with:
+      GITHUB_REPO: "apecloud/apecloud-addons"
+      GITHUB_REF: "${{ github.ref_name }}"
+      CHART_DIR: "addons"
+      APECD_REF: "v0.1.96"
+      ENABLE_JIHU: false
+    secrets: inherit
+
+  get-addons-chart-dir-ent:
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.get_addons_chart_dir.outputs.matrix }}
+    steps:
+      - name: Checkout apecloud-addons Code
+        uses: actions/checkout@v4
+        with:
+          repository: apecloud/apecloud-addons
+          path: apecloud-addons
+          ref: "${{ github.ref_name }}"
+          token: ${{ env.GITHUB_TOKEN }}
+
+      - name: get addons chart dir
+        id: get_addons_chart_dir
+        run: |
+          addons_list=$(ls apecloud-addons/addons)
+          ADDONS_DIR=""
+          for addons_name in $( echo "$addons_list" ); do
+              if [[ -z "$ADDONS_DIR" ]]; then
+                  ADDONS_DIR="{\"addon-name\":\"$addons_name\"}"
+              else
+                  ADDONS_DIR="$ADDONS_DIR,{\"addon-name\":\"$addons_name\"}"
+              fi
+          done
+          echo "$ADDONS_DIR"
+          echo "matrix={\"include\":[$ADDONS_DIR]}" >> $GITHUB_OUTPUT
+
+  release-addons-chart-jihu-ent:
+    needs: [ get-addons-chart-dir-ent ]
+    strategy:
+      fail-fast: false
+      matrix: ${{ fromJSON(needs.get-addons-chart-dir-ent.outputs.matrix) }}
+    uses: apecloud/apecloud-cd/.github/workflows/[email protected]
+    with:
+      GITHUB_REPO: "apecloud/apecloud-addons"
+      GITHUB_REF: "${{ github.ref_name }}"
+      CHART_DIR: "addons"
+      SPECIFY_CHART: "${{ matrix.addon-name }}"
+      APECD_REF: "v0.1.96"
+    secrets: inherit
+
+  release-branch:
+    needs: [ release-message, release-result ]
+    uses: apecloud/apecloud-cd/.github/workflows/[email protected]
+    with:
+      RELEASE_VERSION: "${{ needs.release-message.outputs.release-version }}"
+      RELEASE_BRANCH: "default"
+      APECD_REF: "v0.1.96"
+    secrets: inherit
+
+  update-addons-release-notes:
+    needs: [ release-message, release-branch ]
+    uses: apecloud/apecloud-cd/.github/workflows/[email protected]
+    with:
+      GITHUB_REPO: "apecloud/kubeblocks-addons"
+      BRANCH_NAME: "${{ needs.release-branch.outputs.release-branch }}"
+      WORKFLOW_ID: "update-release-notes.yml"
+      APECD_REF: "v0.1.96"
+      VERSION: "${{ needs.release-message.outputs.release-version }}"
+    secrets: inherit
+
+  update-addons-release-notes-ent:
+    needs: [ release-message, release-branch ]
+    uses: apecloud/apecloud-cd/.github/workflows/[email protected]
+    with:
+      GITHUB_REPO: "apecloud/apecloud-addons"
+      BRANCH_NAME: "${{ needs.release-branch.outputs.release-branch }}"
+      WORKFLOW_ID: "update-release-notes.yml"
+      APECD_REF: "v0.1.96"
+      VERSION: "${{ needs.release-message.outputs.release-version }}"
+    secrets: inherit

.github/workflows/release-image.yml

@@ -21,6 +21,7 @@ on:
           - Dockerfile-dataprotection
           - Dockerfile-dev
           - Dockerfile-tools
+          - Dockerfile-redhat
   release:
     types:
       - published
@@ -104,7 +105,7 @@ jobs:
     secrets: inherit
 
   release-charts-image:
-    if: ${{ inputs.dockerfile == '' || inputs.dockerfile == 'Dockerfile-charts' }}
+    if: ${{ github.event_name  == 'workflow_dispatch' && (inputs.dockerfile == '' || inputs.dockerfile == 'Dockerfile-charts') }}
     needs: release-version
     uses: apecloud/apecloud-cd/.github/workflows/[email protected]
     with:
@@ -128,6 +129,23 @@ jobs:
       CONTEXT: "./docker"
     secrets: inherit
 
+  release-redhat-image:
+    if: ${{ github.event_name  == 'workflow_dispatch' && (inputs.dockerfile == '' || inputs.dockerfile == 'Dockerfile-redhat') }}
+    needs: release-version
+    uses: apecloud/apecloud-cd/.github/workflows/[email protected]
+    with:
+      MAKE_OPS_PRE: "generate"
+      IMG: "apecloud/kubeblocks"
+      VERSION: "${{ needs.release-version.outputs.release-version }}-certified"
+      GO_VERSION: "1.23"
+      APECD_REF: "v0.1.64"
+      DOCKERFILE_PATH: "./docker/Dockerfile-redhat"
+      BUILDX_ARGS: |
+        VERSION=${{ needs.release-version.outputs.release-version }}
+        GIT_COMMIT=${{ needs.release-version.outputs.git-commit }}
+        GIT_VERSION=${{ needs.release-version.outputs.git-version }}
+    secrets: inherit
+
   release-message:
     runs-on: ubuntu-latest
     needs: [ release-image, release-tools-image, release-dataprotection-image ]
@@ -176,90 +194,3 @@ jobs:
       CONTENT: "release image ${{ needs.release-message.outputs.release-version }} ${{ needs.release-message.outputs.content-result }}"
       APECD_REF: "v0.1.38"
     secrets: inherit
-
-  release-result:
-    if: github.event.action == 'published'
-    needs: [ release-message ]
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        type: [image, chart]
-    steps:
-      - name: Restore ${{ matrix.type }} Artifact
-        id: cache-artifact-restore
-        uses: actions/cache/restore@v3
-        with:
-          path: |
-            ${{ env.RELEASE_VERSION }}-${{ matrix.type }}
-          key: ${{ env.RELEASE_VERSION }}-${{ matrix.type }}
-
-      - name: check release result
-        run: |
-          release_result=$( cat ${{ env.RELEASE_VERSION }}-${{ matrix.type }} )
-          if [[ "$release_result" != "success" ]]; then
-              exit 1
-          fi
-
-  e2e-kbcli:
-    needs: [ release-message, release-result ]
-    uses: apecloud/apecloud-cd/.github/workflows/[email protected]
-    strategy:
-      fail-fast: false
-      matrix:
-        test-type: [ apecloud-mysql|postgresql|redis|mongodb|kafka|asmysql|asmysql-proxy|asmysql-orc|asmysql-orc-proxy,
-                     elasticsearch|oceanbase|starrocks|mysqlscale|weaviate|qdrant|smartengine|greptimedb|nebula|risingwave,
-                     zookeeper|etcd|orioledb|vanilla-pg|polardbx|opensearch|tdengine|milvus|clickhouse,
-                     mariadb|tidb|influxdb|mogdb|yashandb|redis-cluster|minio|orchestrator|rabbitmq ]
-    with:
-      GITHUB_REPO: "apecloud/kubeblocks"
-      BRANCH_NAME: "main"
-      WORKFLOW_ID: "e2e-kbcli.yml"
-      APECD_REF: "v0.1.35"
-      VERSION: "${{ needs.release-message.outputs.release-version }}"
-      EXTRA_ARGS: "TEST_TYPE=${{ matrix.test-type }}#CLOUD_PROVIDER=${{ vars.CLOUD_PROVIDER }}"
-    secrets: inherit
-
-  release-branch:
-    needs: [ release-message, release-result ]
-    uses: apecloud/apecloud-cd/.github/workflows/[email protected]
-    with:
-      RELEASE_VERSION: "${{ needs.release-message.outputs.release-version }}"
-      RELEASE_BRANCH: "default"
-      APECD_REF: "v0.1.96"
-    secrets: inherit
-
-  update-addons-release-notes:
-    needs: [ release-message, release-branch ]
-    uses: apecloud/apecloud-cd/.github/workflows/[email protected]
-    with:
-      GITHUB_REPO: "apecloud/kubeblocks-addons"
-      BRANCH_NAME: "${{ needs.release-branch.outputs.release-branch }}"
-      WORKFLOW_ID: "update-release-notes.yml"
-      APECD_REF: "v0.1.96"
-      VERSION: "${{ needs.release-message.outputs.release-version }}"
-    secrets: inherit
-
-  update-addons-release-notes-ent:
-    needs: [ release-message, release-branch ]
-    uses: apecloud/apecloud-cd/.github/workflows/[email protected]
-    with:
-      GITHUB_REPO: "apecloud/apecloud-addons"
-      BRANCH_NAME: "${{ needs.release-branch.outputs.release-branch }}"
-      WORKFLOW_ID: "update-release-notes.yml"
-      APECD_REF: "v0.1.96"
-      VERSION: "${{ needs.release-message.outputs.release-version }}"
-    secrets: inherit
-
-  delete-cache:
-    needs: e2e-kbcli
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        type: [image, chart]
-    steps:
-      - uses: actions/checkout@v4
-      - name: delete ${{ matrix.type }} cache
-        continue-on-error: true
-        run: |
-          bash .github/utils/utils.sh --type 17 --tag-name "${{ env.RELEASE_VERSION }}-${{ matrix.type }}"
-

.gitignore

@@ -4,7 +4,6 @@
 # ignore go generate code files
 pkg/testutil/k8s/mocks/*_mocks.go
 pkg/configuration/proto/mocks/*_mocks.go
-pkg/configuration/container/mocks/*_mocks.go
 # pkg/configuration/proto/*.pb.go
 
 # ignore go mock temporary files

Makefile

@@ -134,7 +134,6 @@ endif
 .PHONY: test-go-generate
 test-go-generate: ## Run go generate against test code.
 	$(GO) generate -x ./pkg/testutil/k8s/mocks/...
-	$(GO) generate -x ./pkg/configuration/container/mocks/...
 	$(GO) generate -x ./pkg/configuration/proto/mocks/...
 
 .PHONY: fmt

apis/parameters/v1alpha1/types.go

@@ -173,8 +173,6 @@ type ReloadPolicy string
 const (
 	NonePolicy                    ReloadPolicy = "none"
 	RestartPolicy                 ReloadPolicy = "restart"
-	RestartContainerPolicy        ReloadPolicy = "restartContainer"
-	RollingPolicy                 ReloadPolicy = "rolling"
 	AsyncDynamicReloadPolicy      ReloadPolicy = "asyncReload"
 	SyncDynamicReloadPolicy       ReloadPolicy = "syncReload"
 	DynamicReloadAndRestartPolicy ReloadPolicy = "dynamicReloadBeginRestart"

cmd/reloader/README.md

@@ -33,24 +33,21 @@ Usage:
   reloader [flags]
 
 Flags:
-      --container-runtime string   the config set cri runtime type. (default "auto")
       --debug                      the config set debug.
-      --disable-runtime            the config set disable runtime.
   -h, --help                       help for reloader
       --log-level string           the config set log level. enum: [error, info, debug] (default "info")
       --notify-type notifyType     the config describe how to process notification messages. (default signal)
       --pod-ip string              the config set pod ip address. (default "127.0.0.1")
       --process string             the config describe what is db program.
       --regex string               the config set filter config file.
-      --runtime-endpoint string    the config set cri runtime endpoint.
       --signal string              the config describe reload unix signal. (default "SIGHUP")
       --tcp int                    the config set service port. (default 9901)
       --volume-dir stringArray     the config map volume directory to watch for updates; may be used multiple times.
 
 ```
 
 ```shell
-./bin/reloader --disable-runtime --log-level debug --process mysqld --signal SIGHUP --volume-dir /opt/mysql --volume-dir /etc/mysql
+./bin/reloader --log-level debug --process mysqld --signal SIGHUP --volume-dir /opt/mysql --volume-dir /etc/mysql
 
 ```