Merge branch 'master' into backupstore

.github/mergify.yml

@@ -5,9 +5,8 @@ pull_request_rules:
   - check-success=DCO
   - check-success=CodeFactor
   - check-success=codespell
-  - "#approved-reviews-by>=1"
+  - "#approved-reviews-by>=2"
   - approved-reviews-by=@longhorn/maintainer
-  - label=ready-to-merge
   actions:
     merge:
       method: rebase
@@ -17,18 +16,4 @@ pull_request_rules:
   - conflict
   actions:
     comment:
-      message: This pull request is now in conflicts. Could you fix it @{{author}}? 🙏
-
-# Comment on the PR to trigger backport. ex: @Mergifyio copy stable/3.1 stable/4.0
-- name: backport patches to stable branch
-  conditions:
-  - base=master
-  actions:
-    backport:
-      title: "[BACKPORT][{{ destination_branch }}] {{ title }}"
-      body: |
-        This is an automatic backport of pull request #{{number}}.
-        
-        {{cherry_pick_error}}
-      assignees:
-      - "{{ author }}"
+      message: This pull request is now in conflict. Could you fix it @{{author}}? 🙏

.github/workflows/codespell.yml

@@ -0,0 +1,22 @@
+name: Codespell
+
+on:
+  pull_request:
+    branches:
+    - master
+    - main
+    - "v*.*.*"
+
+jobs:
+  codespell:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 1
+    - name: Check code spell
+      uses: codespell-project/actions-codespell@v2
+      with:
+        check_filenames: true
+        skip: "*/**.yaml,*/**.yml,./scripts,./vendor,MAINTAINERS,LICENSE,go.mod,go.sum"

manager/integration/tests/test_ha.py

@@ -1984,7 +1984,7 @@ def test_extra_replica_cleanup(client, volume_name, settings_reset): # NOQA
     wait_for_volume_replica_count(client, volume_name, 3)
 
     volume = client.by_id_volume(volume_name)
-    assert volume.robustness == "healthy"
+    wait_for_volume_healthy(client, volume_name)
 
     check_volume_data(volume, data)
 

mirror_csi_images/scripts/publish.sh

@@ -9,7 +9,7 @@ if [[ -n "${LONGHORN_IMAGES_FILE_URL}" ]]; then
   wget "${LONGHORN_IMAGES_FILE_URL}" -O "${LONGHORN_IMAGES_FILE}"
 
   while read -r LINE; do
-    if [[ "${LINE}" =~ "csi-" ]]; then
+    if [[ "${LINE}" =~ csi-|livenessprobe ]]; then
       CSI_IMAGE=$(echo "${LINE}" | sed -e "s/longhornio\///g")
       IFS=: read -ra IMAGE_TAG_PAIR <<< "${CSI_IMAGE}"
       echo "registry.k8s.io/sig-storage/${IMAGE_TAG_PAIR[0]}" "longhornio/${IMAGE_TAG_PAIR[0]}" "${IMAGE_TAG_PAIR[1]}" >> "${INFILE}"
@@ -23,7 +23,7 @@ else
   IFS=, read -ra CSI_IMAGES_ARR <<< "${CSI_IMAGES}"
   for CSI_IMAGE in "${CSI_IMAGES_ARR[@]}"; do
     IFS=: read -ra IMAGE_TAG_PAIR <<< "$CSI_IMAGE"
-    if [[ "${CSI_IMAGE}" =~ "csi-" ]]; then
+    if [[ "${CSI_IMAGE}" =~ csi-|livenessprobe ]]; then
       echo "registry.k8s.io/sig-storage/${IMAGE_TAG_PAIR[0]}" "longhornio/${IMAGE_TAG_PAIR[0]}" "${IMAGE_TAG_PAIR[1]}" >> "${INFILE}"
     elif [[ "${CSI_IMAGE}" =~ "support-bundle-kit" ]]; then
       echo "rancher/${IMAGE_TAG_PAIR[0]}" "longhornio/${IMAGE_TAG_PAIR[0]}" "${IMAGE_TAG_PAIR[1]}" >> "${INFILE}"

pipelines/utilities/argocd.sh

@@ -48,8 +48,8 @@ spec:
       targetRevision: ${REVISION}
       helm:
         values: |
-          helmPreUpgradeCheckerJob:
-            enabled: false
+          preUpgradeChecker:
+            jobEnabled: false
   destination:
     server: https://kubernetes.default.svc
     namespace: ${LONGHORN_NAMESPACE}

test_framework/scripts/longhorn-setup.sh

@@ -323,6 +323,7 @@ run_longhorn_upgrade_test(){
 
   yq e -i 'select(.spec.containers[0] != null).spec.containers[0].env[4].value="'${LONGHORN_UPGRADE_TYPE}'"' ${LONGHORN_UPGRADE_TESTS_MANIFEST_FILE_PATH}
 
+  RESOURCE_SUFFIX=$(terraform -chdir=${TF_VAR_tf_workspace}/terraform/${LONGHORN_TEST_CLOUDPROVIDER}/${DISTRO} output -raw resource_suffix)
   yq e -i 'select(.spec.containers[0] != null).spec.containers[0].env[7].value="'${RESOURCE_SUFFIX}'"' ${LONGHORN_UPGRADE_TESTS_MANIFEST_FILE_PATH}
 
   kubectl apply -f ${LONGHORN_UPGRADE_TESTS_MANIFEST_FILE_PATH}
@@ -389,6 +390,9 @@ run_longhorn_tests(){
 
   LONGHORN_TEST_POD_NAME=`yq e 'select(.spec.containers[0] != null).metadata.name' ${LONGHORN_TESTS_MANIFEST_FILE_PATH}`
 
+  RESOURCE_SUFFIX=$(terraform -chdir=${TF_VAR_tf_workspace}/terraform/${LONGHORN_TEST_CLOUDPROVIDER}/${DISTRO} output -raw resource_suffix)
+  yq e -i 'select(.spec.containers[0] != null).spec.containers[0].env[7].value="'${RESOURCE_SUFFIX}'"' ${LONGHORN_TESTS_MANIFEST_FILE_PATH}
+
   kubectl apply -f ${LONGHORN_TESTS_MANIFEST_FILE_PATH}
 
   local RETRY_COUNTS=60

test_framework/scripts/terraform-setup.sh

@@ -32,8 +32,6 @@ terraform_setup(){
   if [[ "${TF_VAR_create_load_balancer}" == true ]]; then
     terraform -chdir=${TF_VAR_tf_workspace}/terraform/${LONGHORN_TEST_CLOUDPROVIDER}/${DISTRO} output -raw load_balancer_url > ${TF_VAR_tf_workspace}/load_balancer_url
   fi
-
-  export RESOURCE_SUFFIX=$(terraform -chdir=${TF_VAR_tf_workspace}/terraform/${LONGHORN_TEST_CLOUDPROVIDER}/${DISTRO} output -raw resource_suffix)
 }