Merge branch 'master' into flaky_test_volume_metrics

longhorn · Feb 29, 2024 · 923d6f4 · 923d6f4
2 parents 6c0cc37 + feed006
commit 923d6f4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/e2e/requirements.txt b/e2e/requirements.txt
@@ -4,5 +4,5 @@ directio==1.3
 flake8
 kubernetes==27.2.0
 requests==2.31.0
-boto3==1.34.49
+boto3==1.34.51
 pyyaml==6.0.1
diff --git a/manager/integration/tests/test_basic.py b/manager/integration/tests/test_basic.py
@@ -101,6 +101,7 @@
 from common import create_and_wait_deployment
 from common import get_custom_object_api_client
 from common import RETRY_COUNTS_SHORT
+from common import scale_up_engine_image_daemonset
 
 from backupstore import backupstore_delete_volume_cfg_file
 from backupstore import backupstore_cleanup
@@ -4426,10 +4427,7 @@ def test_backuptarget_available_during_engine_image_not_ready(client, apps_api):
             common.wait_for_backup_target_available(client, False)
 
             # Scale up the engine image DaemonSet
-            body = [{"op": "remove",
-                     "path": "/spec/template/spec/nodeSelector/foo"}]
-            apps_api.patch_namespaced_daemon_set(
-                name=ds_name, namespace='longhorn-system', body=body)
+            scale_up_engine_image_daemonset(client)
             common.wait_for_backup_target_available(client, True)
 
             # Sleep 1 second to prevent the same time