merge

.github/.spelling

@@ -157,7 +157,6 @@ ovs
 kube-ovn
 subent
 roadmap
-Icarus9913
 iiiceoo
 excludeIPs
 replicaset

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -1,7 +1,7 @@
 name: Bug Report
 description: Report a bug that you encountered
 labels: ["kind/bug"]
-assignees: ["Icarus9913", "cyclinder"]
+assignees: ["cyclinder"]
 body:
  - type: markdown
  attributes:

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -1,7 +1,7 @@
 name: Feature Request
 description: Provide supporting details for a feature in development Spiderpool
 labels: ["kind/feature"]
-assignees: ["Icarus9913", "cyclinder"]
+assignees: ["cyclinder"]
 body:
  - type: markdown
  attributes:

.github/workflows/auto-diff-k8s-ci.yaml

@@ -145,7 +145,7 @@ jobs:
  body: |
  action url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
  labels: "kind/ci-bug"
- assignees: "Icarus9913,ty-dc"
+ assignees: "ty-dc"
 
  call_inputs_k8s:
  # workflow_dispatch event flow triggered by running the input k8s version

.github/workflows/auto-nightly-ci.yaml

@@ -206,4 +206,4 @@ jobs:
  body: |
  action url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
  labels: "kind/ci-bug"
- assignees: "Icarus9913,ty-dc"
+ assignees: "ty-dc"

.github/workflows/auto-pr-ci.yaml

@@ -252,3 +252,15 @@ jobs:
  ref: ${{ needs.get_ref.outputs.ref }}
  e2e_labels: ${{ needs.get_ref.outputs.e2e_labels }}
  secrets: inherit
+
+ call_e2e_dual_for_low_k8s:
+ 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:
+ 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 }}
+ k8s_version: v1.27.1
+ secrets: inherit

.github/workflows/auto-upgrade-ci.yaml

@@ -0,0 +1,288 @@
+name: Auto Upgrade Test
+
+permissions: write-all
+
+env:
+ CLUSTER_NAME: spider
+ E2E_TIME_OUT: 60m
+ KUBECONFIG_PATH: /home/runner/work/spiderpool/spiderpool/test/.cluster
+on:
+ schedule:
+ - cron: "0 20 * * *"
+
+ workflow_dispatch:
+ inputs:
+ ref:
+ description: 'sha, tag, branch. also this is the version you will upgrade to.'
+ required: true
+ default: main
+ old_version:
+ description: 'specify your old version, for example: v0.9.2; if not set, the default version set will be run.'
+ required: false
+ type: string
+ default: v0.9.0
+ e2e_enabled:
+ description: 'run e2e test'
+ required: false
+ type: choice
+ default: "false"
+ options:
+ - "true"
+ - "false"
+
+jobs:
+ get_ref:
+ runs-on: ubuntu-latest
+ outputs:
+ ref: ${{ env.RUN_REF }}
+ old_version: ${{ env.OLD_VERSION }}
+ e2e_enabled: ${{ env.RUN_E2E_ENABLED }}
+
+ steps:
+ - name: Get Ref
+ id: get_ref
+ run: |
+ if ${{ github.event_name == 'workflow_dispatch' }} ; then
+ echo "call by self workflow_dispatch"
+ echo "RUN_TAG=${{ github.event.inputs.ref }}" >> $GITHUB_ENV
+ echo "OLD_VERSION=${{ github.event.inputs.old_version }}" >> $GITHUB_ENV
+ if ${{ github.event.inputs.e2e_enabled == 'true' }}; then
+ echo "RUN_E2E_ENABLED=true" >> $GITHUB_ENV
+ else
+ echo "RUN_E2E_ENABLED=false" >> $GITHUB_ENV
+ fi
+ else
+ # schedule event
+ # use main sha for ci image tag
+ echo "trigger by schedule"
+ echo "RUN_TAG=main" >> $GITHUB_ENV
+ LATEST_RELEASE_VERISON=$(curl -s https://api.github.com/repos/spidernet-io/spiderpool/releases | grep '"tag_name":' | grep -Eo "v([0-9]+\.[0-9]+\.[0-9])" | sort -r | head -n 1)
+ echo "OLD_VERSION=${LATEST_RELEASE_VERISON}" >> $GITHUB_ENV
+ echo "RUN_E2E_ENABLED=true" >> $GITHUB_ENV
+ fi
+
+ - name: Checkout code
+ uses: actions/checkout@v4
+ with:
+ persist-credentials: false
+ ref: ${{ env.RUN_TAG }}
+
+ - name: Result Ref
+ id: result
+ run: |
+ ref=$( git show -s --format='format:%H')
+ echo "RUN_REF=${ref}" >> $GITHUB_ENV
+
+ call_build_ci_image:
+ needs: [get_ref]
+ uses: ./.github/workflows/build-image-ci.yaml
+ with:
+ ref: ${{ needs.get_ref.outputs.ref }}
+ push: false
+ secrets: inherit
+
+ lint_chart_against_release_image:
+ needs: get_ref
+ uses: ./.github/workflows/call-lint-chart.yaml
+ with:
+ ref: ${{ needs.get_ref.outputs.ref }}
+ secrets: inherit
+
+ trivy_scan_images:
+ needs: [call_build_ci_image, get_ref]
+ uses: ./.github/workflows/trivy-scan-image.yaml
+ with:
+ image_tag: ${{ needs.call_build_ci_image.outputs.imageTag }}
+ ref: ${{ needs.get_ref.outputs.ref }}
+ secrets: inherit
+
+ run_upgrade_tests_on_release_version:
+ needs: [call_build_ci_image, get_ref]
+ runs-on: ubuntu-latest
+ steps:
+ - name: Free Disk Space (Ubuntu)
+ uses: jlumbroso/free-disk-space@main
+ with:
+ tool-cache: false
+ android: true
+ dotnet: true
+ haskell: true
+ large-packages: true
+ docker-images: true
+ swap-storage: true
+
+ - name: Checkout code
+ uses: actions/checkout@v4
+ with:
+ persist-credentials: false
+ ref: ${{ needs.get_ref.outputs.old_version }}
+
+ - name: Prepare
+ id: prepare
+ run: |
+ echo "ref: ${{ inputs.ref }} "
+ echo "===== image "
+ echo "ci image tag: ghcr.io/${{ github.repository }}/spiderpool-controller:${{ needs.get_ref.outputs.old_version }}"
+ TMP=` date +%m%d%H%M%S `
+ E2E_CLUSTER_NAME="spiderpool${TMP}"
+ echo "E2E_CLUSTER_NAME=${E2E_CLUSTER_NAME}" >> $GITHUB_ENV
+
+ - name: Setup Golang
+ uses: actions/setup-go@v5
+ with:
+ go-version: 1.21.4
+
+ - name: Install Kind Bin
+ uses: helm/kind-action@v1.8.0
+ with:
+ install_only: true
+
+ - name: Install Tools
+ run: |
+ bash ./test/scripts/install-tools.sh
+
+ - name: Setup Kind Cluster on oldVersion ${{ needs.get_ref.outputs.old_version }}
+ uses: nick-invision/retry@v2
+ with:
+ timeout_minutes: 20
+ max_attempts: 3
+ on_retry_command: |
+ echo "debug"
+ systemctl status docker
+ journalctl -xeu docker
+ echo "restart docker before trying again"
+ systemctl restart docker
+ command: |
+ make e2e_init_calico -e E2E_CLUSTER_NAME=${{ env.E2E_CLUSTER_NAME }} \
+ -e E2E_SPIDERPOOL_TAG=${{ needs.get_ref.outputs.old_version }} \
+ -e PYROSCOPE_LOCAL_PORT=""
+
+ - name: backup kubeconfig from olderVersion ${{ needs.get_ref.outputs.old_version }}
+ run: |
+ cp -r ${{ env.KUBECONFIG_PATH }}/${{ env.E2E_CLUSTER_NAME }}/.kube/config /tmp
+
+ - name: Checkout code
+ uses: actions/checkout@v4
+ with:
+ persist-credentials: false
+ ref: ${{ needs.get_ref.outputs.ref }}
+ fetch-depth: 0
+
+ - name: Move kubeconfig from oldVersion ${{ needs.get_ref.outputs.old_version }} to the upgradeVersion ${{ needs.get_ref.outputs.ref }}
+ run: |
+ mkdir -p ${{ env.KUBECONFIG_PATH }}/${{ env.E2E_CLUSTER_NAME }}/.kube/
+ cp -r /tmp/config ${{ env.KUBECONFIG_PATH }}/${{ env.E2E_CLUSTER_NAME }}/.kube/config
+
+ - name: Download spiderpool-agent image
+ uses: actions/download-artifact@v3
+ with:
+ name: image-tar-spiderpool-agent
+ path: test/.download
+
+ - name: Download spiderpool-controller image
+ uses: actions/download-artifact@v3
+ with:
+ name: image-tar-spiderpool-controller
+ path: test/.download
+
+ - name: Load Images
+ run: |
+ TAR_FILES=` ls test/.download `
+ echo $TAR_FILES
+ for ITEM in $TAR_FILES ; do
+ IMAGE_NAME=${ITEM%*.tar}
+ echo ${IMAGE_NAME}
+ cat test/.download/${ITEM} | docker import - ${IMAGE_NAME}:${{ needs.call_build_ci_image.outputs.imageTag }}
+ done
+
+ - name: Upgrade to version ${{ needs.get_ref.outputs.ref }}
+ id: upgrade
+ continue-on-error: true
+ run: |
+ make upgrade_e2e_spiderpool -e E2E_SPIDERPOOL_TAG=${{ needs.call_build_ci_image.outputs.imageTag }} \
+ -e SPIDERPOOL_AGENT_IMAGE_NAME=spiderpool-agent-race \
+ -e SPIDERPOOL_CONTROLLER_IMAGE_NAME=spiderpool-controller-race \
+
+ - name: Run e2e Test on ${{ needs.get_ref.outputs.ref }}
+ id: run_e2e
+ continue-on-error: true
+ if: ${{ needs.get_ref.outputs.e2e_enabled == 'true' }}
+ run: |
+ RESULT=0
+ export KUBECONFIG=${{ env.KUBECONFIG_PATH }}/${{ env.E2E_CLUSTER_NAME }}/.kube/config
+ export DEBUG_ENV_PATH=${{ env.KUBECONFIG_PATH }}/../scripts/debugEnv.sh
+ RESULT=$(kubectl get po -A | grep "spiderpool" | grep -Ev "Running|Completed" | wc -l )
+ if ((RESULT!=0)) ; then
+ sleep 120
+ RESULT=$(kubectl get po -A | grep "spiderpool" | grep -Ev "Running|Completed" | wc -l )
+ fi
+ kubectl get po -A | grep "spiderpool"
+ kubectl get network-attachment-definitions.k8s.cni.cncf.io -A
+ if ((RESULT==0)) ; then
+ kubectl get po -l app=test-pod -oyaml
+ echo "after the upgrade is completed, restart the Pod. The Pod will run normally on the new version."
+ kubectl delete po -l app=test-pod
+ if kubectl wait --for=condition=ready -l app=test-pod --timeout=300s pod; then
+ kubectl get po -l app=test-pod -owide
+ kubectl get po -l app=test-pod -oyaml
+ echo "RUN_E2E_PASS=true" >> $GITHUB_ENV
+ else
+ kubectl get po -l app=test-pod -owide
+ kubectl describe po -l app=test-pod
+ KIND_CLUSTER_NAME=${{ env.E2E_CLUSTER_NAME }}
+ ./${DEBUG_ENV_PATH} ${KUBECONFIG} "detail"
+ echo "RUN_E2E_PASS=false" >> $GITHUB_ENV
+ fi
+ else
+ KIND_CLUSTER_NAME=${{ env.E2E_CLUSTER_NAME }}
+ ./${DEBUG_ENV_PATH} ${KUBECONFIG} "detail"
+ kubectl describe po -n kube-system -l app.kubernetes.io/instance=spiderpool
+ kubectl logs -n kube-system -l app.kubernetes.io/instance=spiderpool
+ echo "RUN_E2E_PASS=false" >> $GITHUB_ENV
+ fi
+
+ - name: Upload e2e log
+ if: ${{ needs.get_ref.outputs.e2e_enabled == 'true' }}
+ uses: actions/upload-artifact@v3.1.3
+ with:
+ name: ${{ needs.get_ref.outputs.old_version }}-debuglog.txt
+ path: test/e2edebugLog.txt
+ retention-days: 7
+
+ - name: Upload e2e report
+ if: ${{ env.UPLOAD_E2E_REPORT == 'true' }}
+ uses: actions/upload-artifact@v3.1.3
+ with:
+ name: ${{ needs.get_ref.outputs.old_version }}-e2ereport.json
+ path: e2ereport.json
+ retention-days: 1
+
+ - name: Show e2e Result
+ if: ${{ needs.get_ref.outputs.e2e_enabled == 'true' }}
+ run: |
+ if ${{ env.RUN_E2E_PASS == 'true' }} ;then
+ exit 0
+ else
+ exit 1
+ fi
+
+ creat_issue:
+ runs-on: ubuntu-latest
+ needs: [run_upgrade_tests_on_release_version, trivy_scan_images]
+ if: ${{ always() && needs.run_upgrade_tests_on_release_version.result == 'failure' }}
+ steps:
+ - name: echo
+ run: |
+ echo ${{ github.repository }}
+ echo ${{ github.repository_owner }}
+ echo "TIMESTAMP=`date +%Y-%m-%d`" >> $GITHUB_ENV
+
+ - name: create an issue
+ uses: dacbd/create-issue-action@v1.2.1
+ with:
+ token: ${{ secrets.GITHUB_TOKEN }}
+ title: "upgrade CI ${{ ENV.TIMESTAMP }}: Failed"
+ body: |
+ action url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+ labels: "kind/ci-bug"
+ assignees: "ty-dc"

.github/workflows/auto-version-release.yaml

@@ -117,6 +117,13 @@ jobs:
  dest_tag: ${{ needs.get-tag.outputs.tag }}
  secrets: inherit
 
+ update-release-version:
+ needs: [build-release-image, get-tag]
+ uses: ./.github/workflows/call-release-version.yaml
+ with:
+ dest_tag: ${{ needs.get-tag.outputs.tag }}
+ secrets: inherit
+
  create-release:
  needs: [release-chart, release-changelog, get-tag]
  name: create release

.github/workflows/build-image-base.yaml

@@ -88,7 +88,7 @@ jobs:
  id: tag-in-repositories
  shell: bash
  run: |
- if docker buildx imagetools inspect ${{ env.ONLINE_REGISTER }}/${{ env.IMAGE_REPO }}/${{ env.IMAGE_NAME }}:${{  steps.base_tag.outputs.tag }} &>/dev/null; then
+ if docker buildx imagetools inspect ${{ env.ONLINE_REGISTER }}/${{ env.IMAGE_REPO }}/${{ env.IMAGE_NAME }}:${{ env.tag }} &>/dev/null; then
  echo "exists=true" >> $GITHUB_ENV
  echo "the target base image exist , no need to build it "
  else
@@ -117,7 +117,7 @@ jobs:
  github-token: ${{ secrets.WELAN_PAT }}
  platforms: ${{ env.BUILD_PLATFORM }}
  tags: |
- ${{ env.ONLINE_REGISTER }}/${{ env.IMAGE_REPO }}/${{ env.IMAGE_NAME }}:${{ steps.base_tag.outputs.tag }}
+ ${{ env.ONLINE_REGISTER }}/${{ env.IMAGE_REPO }}/${{ env.IMAGE_NAME }}:${{ env.tag }}
 
  - name: Image Release Digest
  if: ${{ env.exists == 'false' }}
@@ -126,7 +126,7 @@ jobs:
  mkdir -p image-digest/
  echo "## ${{ env.IMAGE_NAME }}" > image-digest/${{ env.IMAGE_NAME }}.txt
  echo "" >> image-digest/${{ env.IMAGE_NAME }}.txt
- echo "\`${{ env.ONLINE_REGISTER }}/${{ env.IMAGE_REPO }}/${{ env.IMAGE_NAME }}:${{ steps.base_tag.outputs.tag }}@${{ steps.docker_build_release.outputs.digest }}\`" >> image-digest/${{ env.IMAGE_NAME }}.txt
+ echo "\`${{ env.ONLINE_REGISTER }}/${{ env.IMAGE_REPO }}/${{ env.IMAGE_NAME }}:${{ env.tag }}@${{ steps.docker_build_release.outputs.digest }}\`" >> image-digest/${{ env.IMAGE_NAME }}.txt
  echo "" >> image-digest/${{ env.IMAGE_NAME }}.txt
 
  - name: Upload artifact digests

.github/workflows/call-lint-chart.yaml

@@ -73,7 +73,7 @@ jobs:
 
  # https://github.com/actions/setup-python
  - name: Set up Python
- uses: actions/setup-python@v5.0.0
+ uses: actions/setup-python@v5.1.0
  with:
  python-version: 3.8
  architecture: x64