Merge pull request #2747 from Icarus9913/main080

merge main to release-0.8 to publish v0.8.2
spidernet-io · Dec 6, 2023 · ba48168 · ba48168
2 parents 6c1b011 + e2ee37b
commit ba48168
Show file tree

Hide file tree

Showing 519 changed files with 5,581 additions and 4,877 deletions.
diff --git a/.github/ISSUE_TEMPLATE/doc.yaml b/.github/ISSUE_TEMPLATE/doc.yaml
@@ -22,11 +22,3 @@ body:
         the document is outdated
     validations:
       required: true
-  - type: input
-    id: doc-path
-    attributes:
-      label: Document Path Or Link
-      placeholder: |
-        https://github.com/spidernet-io/spiderpool/blob/main/README.md
-    validations:
-      required: true
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -25,18 +25,10 @@ body:
     attributes:
       label: How to implement it (if possible)?
     validations:
-      required: true
+      required: false
   - type: textarea
     attributes:
       label: Additional context
       description: Add any other context about the feature request here.
     validations:
       required: false
-  - type: checkboxes
-    attributes:
-      label: I've read and agree with the following
-      options:
-        - label: I've checked all open and closed issues and my request is not there.
-          required: true
-        - label: I've checked all open and closed pull requests and my request is not there.
-          required: true
diff --git a/.github/workflows/auto-nightly-ci.yaml b/.github/workflows/auto-nightly-ci.yaml
@@ -175,10 +175,22 @@ jobs:
       e2e_labels: ${{ needs.get_ref.outputs.e2e_labels }}
     secrets: inherit
 
+  call_low_kernel:
+    needs: [call_build_ci_image, get_ref, call_release_chart]
+    if: ${{ needs.get_ref.outputs.e2e_enabled == 'true' && needs.get_ref.outputs.ipfamily_dual_e2e == 'true' }}
+    uses: ./.github/workflows/e2e-init.yaml
+    with:
+      os: ubuntu-20.04
+      ip_family: dual
+      image_tag: ${{ needs.call_build_ci_image.outputs.imageTag }}
+      ref: ${{ needs.get_ref.outputs.ref }}
+      e2e_labels: ${{ needs.get_ref.outputs.e2e_labels }}
+    secrets: inherit
+
   creat_issue:
     runs-on: ubuntu-latest
-    needs: [call_e2e_dual, call_e2e_ipv4, call_e2e_ipv6, call_unitest, lint_chart_against_release_image]
-    if: ${{ always() && needs.call_e2e_dual.result == 'failure' || needs.call_e2e_ipv4.result == 'failure' || needs.call_e2e_ipv6.result == 'failure' || needs.call_unitest.result == 'failure' || needs.lint_chart_against_release_image.result == 'failure' }}
+    needs: [call_e2e_dual, call_e2e_ipv4, call_e2e_ipv6, call_unitest, lint_chart_against_release_image, call_low_kernel]
+    if: ${{ always() && needs.call_e2e_dual.result == 'failure' || needs.call_e2e_ipv4.result == 'failure' || needs.call_e2e_ipv6.result == 'failure' || needs.call_unitest.result == 'failure' || needs.lint_chart_against_release_image.result == 'failure' || needs.call_low_kernel.result == 'failure' }}
     steps:
       - name: echo
         run: |

diff --git a/.github/workflows/auto-pr-ci.yaml b/.github/workflows/auto-pr-ci.yaml
@@ -240,3 +240,15 @@ jobs:
       ref: ${{ needs.get_ref.outputs.ref }}
       e2e_labels: ${{ needs.get_ref.outputs.e2e_labels }}
     secrets: inherit
+
+  call_low_kernel:
+    needs: [call_build_ci_image, get_ref, call_release_chart]
+    if: ${{ needs.get_ref.outputs.e2e_enabled == 'true' && needs.get_ref.outputs.ipfamily_dual_e2e == 'true' }}
+    uses: ./.github/workflows/e2e-init.yaml
+    with:
+      os: ubuntu-20.04
+      ip_family: dual
+      image_tag: ${{ needs.call_build_ci_image.outputs.imageTag }}
+      ref: ${{ needs.get_ref.outputs.ref }}
+      e2e_labels: ${{ needs.get_ref.outputs.e2e_labels }}
+    secrets: inherit
diff --git a/.github/workflows/build-image-base.yaml b/.github/workflows/build-image-base.yaml
@@ -106,7 +106,7 @@ jobs:
 
       - name: Release build ${{ env.IMAGE_NAME }}
         if: ${{ steps.tag-in-repositories.outputs.exists == 'false' }}
-        uses: docker/build-push-action@v5.0.0
+        uses: docker/build-push-action@v5.1.0
         continue-on-error: false
         id: docker_build_release
         with:

diff --git a/.github/workflows/build-image-ci.yaml b/.github/workflows/build-image-ci.yaml
@@ -131,7 +131,7 @@ jobs:
 
       # Import GitHub's cache build to docker cache
       - name: Copy ${{ matrix.name }} Golang cache to docker cache
-        uses: docker/build-push-action@v5.0.0
+        uses: docker/build-push-action@v5.1.0
         with:
           context: /tmp/.cache/${{ matrix.name }}
           file: ./images/cache/Dockerfile
@@ -144,7 +144,7 @@ jobs:
       # build normal image
       - name: CI Build ${{ matrix.name }}
         if: ${{ github.event_name != 'pull_request_target' }}
-        uses: docker/build-push-action@v5.0.0
+        uses: docker/build-push-action@v5.1.0
         continue-on-error: false
         id: docker_build_ci_master
         with:
@@ -167,7 +167,7 @@ jobs:
       # build debug image who turn on race and deadlock detection
       - name: CI race detection Build ${{ matrix.name }}
         if: ${{ github.event_name != 'pull_request_target' }}
-        uses: docker/build-push-action@v5.0.0
+        uses: docker/build-push-action@v5.1.0
         continue-on-error: false
         id: docker_build_ci_master_detect_race_condition
         with:
@@ -199,7 +199,7 @@ jobs:
       # =========== trigger by PR updates , build 2 images
       - name: CI Build ${{ matrix.name }}
         if: ${{ github.event_name == 'pull_request_target' }}
-        uses: docker/build-push-action@v5.0.0
+        uses: docker/build-push-action@v5.1.0
         continue-on-error: false
         id: docker_build_ci_pr
         with:
@@ -218,7 +218,7 @@ jobs:
 
       - name: CI race detection Build ${{ matrix.name }}
         if: ${{ github.event_name == 'pull_request_target' }}
-        uses: docker/build-push-action@v5.0.0
+        uses: docker/build-push-action@v5.1.0
         continue-on-error: false
         id: docker_build_ci_pr_detect_race_condition
         with:
@@ -264,7 +264,7 @@ jobs:
       # Store docker's golang's cache build locally only on the main branch
       - name: Store ${{ matrix.name }} Golang cache build locally
         if: ${{ github.event_name != 'pull_request_target' && steps.cache.outputs.cache-hit != 'true' }}
-        uses: docker/build-push-action@v5.0.0
+        uses: docker/build-push-action@v5.1.0
         with:
           context: .
           file: ./images/cache/Dockerfile

diff --git a/.github/workflows/build-image-plugins.yaml b/.github/workflows/build-image-plugins.yaml
@@ -175,7 +175,7 @@ jobs:
 
       - name: Release build ${{ env.IMAGE_NAME }}
         if: ${{ steps.tag-in-repositories.outputs.exists == 'false' }}
-        uses: docker/build-push-action@v5.0.0
+        uses: docker/build-push-action@v5.1.0
         continue-on-error: false
         id: docker_build_release
         with:

diff --git a/.github/workflows/call-release-doc.yaml b/.github/workflows/call-release-doc.yaml
@@ -19,6 +19,7 @@ permissions: write-all
 
 env:
   MERGE_BRANCH: github_pages
+  DEV_DOC_DIRECTORY: dev
   PR_LABEL: pr/release/robot_update_githubpage
   PR_REVIWER: ty-dc
 
@@ -27,7 +28,8 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       ref: ${{ env.REF }}
-      skip_all_job: ${{ env.SKIP_ALL_JOB }}
+      publish_docs_to_dev: ${{ env.PUBLISH_DOCS_TO_DEV }}
+      doc_tag: ${{ env.DOCS_TAG }}
     steps:
       - name: Get Ref
         id: get_ref
@@ -55,26 +57,27 @@ jobs:
         id: main_docs
         if: ${{ env.REF == 'main' }}
         run: |
+          echo "DOCS_TAG=${{ env.REF }}" >> $GITHUB_ENV
           pip install mkdocs==1.5.2 mike==1.1.2 mkdocs-material==8.5.11
           git config user.email "robot@example.com"
           git config user.name "robot"
           cp ./docs/mkdocs.yml ./
-          mike deploy --rebase -b ${{ env.MERGE_BRANCH }} dev -t "dev (${{ env.REF }})"
+          mike deploy --rebase -b ${{ env.MERGE_BRANCH }} ${{ env.DEV_DOC_DIRECTORY }} -t "${{ env.DEV_DOC_DIRECTORY }} (${{ env.REF }})"
           rm -rf ./site && rm -rf ./mkdocs.yml
           git checkout -f ${{ env.MERGE_BRANCH }}
           rm -rf ./charts && rm -rf ./index.yaml && rm -rf ./changelogs
           tar -czvf ./site.tar.gz *
           ls
-          echo "push document version `dev` from branch ${{ env.REF }}."
+          echo "push document version ${{ env.DEV_DOC_DIRECTORY }} from branch ${{ env.REF }}."
 
       - name: Extract Version
         id: extract
         if: ${{ env.REF != 'main' }}
         run: |
           if ! grep -E "^[[:space:]]*v[0-9]+.[0-9]+.[0-9]+[[:space:]]*$" VERSION &>/dev/null ; then
-            echo "not a release version, skip generating doc."
+            echo "It is not a release version. docs for the corresponding version will not be generated. The documents will be published to 'dev' ."
             cat VERSION
-            echo "SKIP_ALL_JOB=true" >> $GITHUB_ENV
+            echo "PUBLISH_DOCS_TO_DEV=true" >> $GITHUB_ENV
             exit 0
           fi
           # for example v0.6.1, the build's documentation version is v0.6
@@ -87,7 +90,7 @@ jobs:
           git checkout -f ${{ env.MERGE_BRANCH }}
           echo "Switch to the branch:${{ env.MERGE_BRANCH }} where the document is located"
           ls
-          if [ -e "docs/${docVersion}" ]; then
+          if [ -e "${docVersion}" ]; then
               echo "doc version:${docVersion} already exists, just update it."
               echo "SET_LATEST=false" >> $GITHUB_ENV
           else
@@ -99,7 +102,7 @@ jobs:
 
       - name: build doc
         id: build_doc
-        if: ${{ env.SKIP_ALL_JOB != 'true' && env.REF != 'main' }}
+        if: ${{ env.REF != 'main' }}
         run: |
           git checkout ${{ env.REF }}
           ls
@@ -108,7 +111,11 @@ jobs:
           git config user.email "robot@example.com"
           git config user.name "robot"
           cp ./docs/mkdocs.yml ./
-          if ${{ env.SET_LATEST == 'true' }} ;then
+          if ${{ env.PUBLISH_DOCS_TO_DEV == 'true' }} ; then
+              echo "publish non-release version of documentation to dev:${{ env.DEV_DOC_DIRECTORY }}"
+              echo "DOCS_TAG=${{ env.DEV_DOC_DIRECTORY }}" >> $GITHUB_ENV
+              mike deploy --rebase -b ${{ env.MERGE_BRANCH }} ${{ env.DEV_DOC_DIRECTORY }} -t "${{ env.DEV_DOC_DIRECTORY }} (${{ env.REF }})"
+          elif ${{ env.SET_LATEST == 'true' }} ; then
               echo "generate doc version:${{ env.DOCS_TAG }} and set to latest."
               mike deploy --rebase -b ${{ env.MERGE_BRANCH }} --update-aliases ${{env.DOCS_TAG }} latest
               mike set-default -b ${{ env.MERGE_BRANCH }} latest
@@ -127,7 +134,6 @@ jobs:
 
       - name: Upload Artifact
         uses: actions/upload-artifact@v3.1.3
-        if: ${{ env.SKIP_ALL_JOB != 'true' }}
         with:
           name: website_package_artifact
           path: site.tar.gz
@@ -137,7 +143,6 @@ jobs:
   create_pr:
     name: Create PR
     needs: [release_doc]
-    if: ${{ needs.release_doc.outputs.skip_all_job != 'true' }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
@@ -161,8 +166,8 @@ jobs:
         id: create_pr
         uses: peter-evans/create-pull-request@v5.0.2
         with:
-          title: "robot update website from ${{ needs.release_doc.outputs.ref }} to branch ${{ env.MERGE_BRANCH }} "
-          commit-message: "robot update website from ${{ needs.release_doc.outputs.ref }} to branch ${{ env.MERGE_BRANCH }} "
+          title: "robot update website from ${{ needs.release_doc.outputs.ref }} to branch ${{ env.MERGE_BRANCH }} with tag ${{ needs.release_doc.outputs.doc_tag }}"
+          commit-message: "robot update website from ${{ needs.release_doc.outputs.ref }} to branch ${{ env.MERGE_BRANCH }} with tag ${{ needs.release_doc.outputs.doc_tag }}"
           branch-suffix: timestamp
           branch: robot/update_doc
           delete-branch: true

diff --git a/.github/workflows/call-release-image.yaml b/.github/workflows/call-release-image.yaml
@@ -95,7 +95,7 @@ jobs:
           echo ::set-output name=committime::${GIT_COMMIT_TIME}
 
       - name: Build Image ${{ matrix.name }}
-        uses: docker/build-push-action@v5.0.0
+        uses: docker/build-push-action@v5.1.0
         id: docker_build_release
         with:
           context: ${{ matrix.context }}

diff --git a/.github/workflows/e2e-init.yaml b/.github/workflows/e2e-init.yaml
@@ -27,10 +27,14 @@ on:
       e2e_labels:
         required: false
         type: string
+      os:
+        required: false
+        type: string
+        default: ubuntu-latest
 
 jobs:
   call_e2e:
-    runs-on: ubuntu-latest
+    runs-on: ${{ inputs.os }}
     strategy:
       fail-fast: false
       matrix:
@@ -44,6 +48,13 @@ jobs:
           - e2e_init_mode: e2e_init_cilium
             e2e_test_mode: e2e_test_cilium
     steps:
+      - name: Show system kernel
+        run: |
+          echo "=========Current os version================="
+          echo ${{ inputs.os }}
+          echo "=========Current system kernel================="
+          uname -r
+
       - name: Free disk space
         # https://github.com/actions/virtual-environments/issues/709
         run: |
@@ -114,20 +125,33 @@ jobs:
           done
 
       # test against commit version
+      # https://github.com/kubernetes-sigs/kind/issues/2863
       - name: Setup Kind Cluster
         uses: nick-invision/retry@v2
         with:
           timeout_minutes: 20
           max_attempts: 3
-          shell: bash
           command: |
+            INSTALL_OVS_VALUE=true
+            MINIMAL_VERSION=1.24.3
+            K8S_VERSION=$(echo ${{ inputs.k8s_version }} | grep -Eo "([0-9]+\.[0-9]+)")
+            if [ -z ${K8S_VERSION} ]; then
+              K8S_VERSION=1.27.1
+            fi
+            if [[ "${K8S_VERSION}" < "${MINIMAL_VERSION}" ]]; then
+              echo "The current kubernetes version is ${{ inputs.k8s_version }} , ignore to install openvswitch due to Kind base image outdated"
+              INSTALL_OVS_VALUE=false;
+            fi
             make ${{ matrix.e2e_init_mode }} -e E2E_CLUSTER_NAME=${{ env.E2E_CLUSTER_NAME }} \
                 -e E2E_SPIDERPOOL_TAG=${{ inputs.image_tag }} \
-                -e SPIDERPOOL_AGENT_IMAGE_NAME=spiderpool-agent-race   \
+                -e SPIDERPOOL_AGENT_IMAGE_NAME=spiderpool-agent-race \
                 -e SPIDERPOOL_CONTROLLER_IMAGE_NAME=spiderpool-controller-race \
                 -e E2E_IP_FAMILY=${{ inputs.ip_family }} -e PYROSCOPE_LOCAL_PORT="" \
                 -e E2E_KIND_IMAGE_TAG=${{ inputs.k8s_version }} \
-                -e INSTALL_KUBEVIRT=true
+                -e INSTALL_KUBEVIRT=true \
+                -e INSTALL_KRUISE=true \
+                -e INSTALL_KDOCTOR=true \
+                -e INSTALL_OVS=${INSTALL_OVS_VALUE}
 
       - name: Run e2e Test
         id: run_e2e
@@ -140,7 +164,6 @@ jobs:
           make ${{ matrix.e2e_test_mode }} -e E2E_CLUSTER_NAME=${{ env.E2E_CLUSTER_NAME }}  \
               -e E2E_GINKGO_LABELS=${E2E_LABELS} \
               -e E2E_TIMEOUT=${{ env.E2E_TIME_OUT }} \
-              -e INSTALL_MULTUS=true \
               -e E2E_IP_FAMILY=${{ inputs.ip_family }} || RESULT=1
           if ((RESULT==0)) ; then
               echo "RUN_E2E_PASS=true" >> $GITHUB_ENV

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v0.8.1
+v0.8.2
diff --git a/api/v1/agent/client/connectivity/get_ipam_healthy_responses.go b/api/v1/agent/client/connectivity/get_ipam_healthy_responses.go
diff --git a/api/v1/agent/client/daemonset/delete_ipam_ip_responses.go b/api/v1/agent/client/daemonset/delete_ipam_ip_responses.go