ci(stability): merge the develop branch

Author: datacore-bolt-ci

call-home/src/bin/callhome/collector/k8s_client.rs

@@ -33,8 +33,10 @@ impl K8sClient {
             nodes_count += node_list.items.len();
 
             match node_list.metadata.continue_ {
-                Some(ref token) => list_params = list_params.continue_token(token),
-                None => break,
+                Some(ref token) if !token.is_empty() => {
+                    list_params = list_params.continue_token(token)
+                }
+                _ => break,
             }
         }
 

dependencies/control-plane

@@ -198,8 +198,10 @@ impl ClientSet {
             let mut result = pods_api.list(&list_params).await?;
             pods.append(&mut result.items);
             match result.metadata.continue_ {
-                None => break,
-                Some(token) => list_params = list_params.continue_token(token.as_str()),
+                Some(ref token) if !token.is_empty() => {
+                    list_params = list_params.continue_token(token)
+                }
+                _ => break,
             };
         }
         Ok(pods)
@@ -352,8 +354,8 @@ impl ClientSet {
                     .collect(),
             );
             match vscs.metadata.continue_ {
-                Some(token) if !token.is_empty() => {
-                    list_params = list_params.continue_token(token.as_str())
+                Some(ref token) if !token.is_empty() => {
+                    list_params = list_params.continue_token(token)
                 }
                 _ => break,
             };
@@ -380,8 +382,8 @@ impl ClientSet {
             let mut result = events_api.list(&list_params).await?;
             events.append(&mut result.items);
             match result.metadata.continue_ {
-                Some(token) if !token.is_empty() => {
-                    list_params = list_params.continue_token(token.as_str())
+                Some(ref token) if !token.is_empty() => {
+                    list_params = list_params.continue_token(token)
                 }
                 _ => break,
             };

k8s/supportability/src/collect/k8s_resources/client.rs

@@ -323,10 +323,10 @@ where
         resources.extend(resource_list);
 
         match maybe_token {
-            Some(ref token) => {
+            Some(ref token) if !token.is_empty() => {
                 list_params = list_params.continue_token(token);
             }
-            None => break,
+            _ => break,
         }
     }
 
@@ -355,10 +355,10 @@ where
         resources.extend(resource_list);
 
         match maybe_token {
-            Some(ref token) => {
+            Some(ref token) if !token.is_empty() => {
                 list_params = list_params.continue_token(token);
             }
-            None => break,
+            _ => break,
         }
     }