merge main

Signed-off-by: wind57 <[email protected]>

Author: wind57

spring-cloud-kubernetes-commons/src/test/java/org/springframework/cloud/kubernetes/commons/config/ConfigUtilsTests.java

@@ -19,7 +19,6 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -215,7 +214,7 @@ void testIssue1757() {
 				Map.of("client-id", "clientB", "client-secret", "b"));
 
 		MultipleSourcesContainer container = ConfigUtils.processLabeledData(List.of(containerA, containerB),
-				new MockEnvironment(), Map.of("load", "true"), "default", Set.of(), false);
+				new MockEnvironment(), Map.of("load", "true"), "default", false);
 
 		System.out.println(container);
 		assertThat(container.names()).containsExactlyInAnyOrder("client-1", "client-2");