wip

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

Author: wind57

.github/workflows/composites/pre-test-actions/action.yaml

@@ -24,7 +24,7 @@ runs:
     - name: build project
       shell: bash
       run: |
-        ./mvnw clean install -Dspring-boot.build-image.skip=true -DskipITs -DskipTests -T1C -U -B -q  
+        ./mvnw clean install -P 'run-on-github-actions' -Dspring-boot.build-image.skip=true -DskipITs -DskipTests -T1C -U -B -q  
 
     - name: build controllers project
       uses: ./.github/workflows/composites/build-controllers-project

spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClient.java

@@ -82,46 +82,22 @@ public class KubernetesInformerDiscoveryClient implements DiscoveryClient {
 
 	private final ServicePortSecureResolver servicePortSecureResolver;
 
-	// visible only for testing and
-	// must be constructor injected in a future release
-	@Autowired
-	CoreV1Api coreV1Api;
-
-	@Deprecated(forRemoval = true)
-	public KubernetesInformerDiscoveryClient(String namespace, SharedInformerFactory sharedInformerFactory,
-			Lister<V1Service> serviceLister, Lister<V1Endpoints> endpointsLister,
-			SharedInformer<V1Service> serviceInformer, SharedInformer<V1Endpoints> endpointsInformer,
-			KubernetesDiscoveryProperties properties) {
-		this.sharedInformerFactories = List.of(sharedInformerFactory);
-		this.serviceListers = List.of(serviceLister);
-		this.endpointsListers = List.of(endpointsLister);
-		this.informersReadyFunc = () -> serviceInformer.hasSynced() && endpointsInformer.hasSynced();
-		this.properties = properties;
-		filter = filter(properties);
-		servicePortSecureResolver = new ServicePortSecureResolver(properties);
-	}
-
-	public KubernetesInformerDiscoveryClient(SharedInformerFactory sharedInformerFactory,
-			Lister<V1Service> serviceLister, Lister<V1Endpoints> endpointsLister,
-			SharedInformer<V1Service> serviceInformer, SharedInformer<V1Endpoints> endpointsInformer,
-			KubernetesDiscoveryProperties properties) {
-		this.sharedInformerFactories = List.of(sharedInformerFactory);
-		this.serviceListers = List.of(serviceLister);
-		this.endpointsListers = List.of(endpointsLister);
-		this.informersReadyFunc = () -> serviceInformer.hasSynced() && endpointsInformer.hasSynced();
-		this.properties = properties;
-		filter = filter(properties);
-		servicePortSecureResolver = new ServicePortSecureResolver(properties);
-	}
+	private final CoreV1Api coreV1Api;
 
 	public KubernetesInformerDiscoveryClient(List<SharedInformerFactory> sharedInformerFactories,
 			List<Lister<V1Service>> serviceListers, List<Lister<V1Endpoints>> endpointsListers,
 			List<SharedInformer<V1Service>> serviceInformers, List<SharedInformer<V1Endpoints>> endpointsInformers,
-			KubernetesDiscoveryProperties properties) {
+			KubernetesDiscoveryProperties properties, CoreV1Api coreV1Api) {
 		this.sharedInformerFactories = sharedInformerFactories;
 
 		this.serviceListers = serviceListers;
 		this.endpointsListers = endpointsListers;
+		this.coreV1Api = coreV1Api;
+		this.properties = properties;
+
+		filter = filter(properties);
+		servicePortSecureResolver = new ServicePortSecureResolver(properties);
+
 		this.informersReadyFunc = () -> {
 			boolean serviceInformersReady = serviceInformers.isEmpty() || serviceInformers.stream()
 				.map(SharedInformer::hasSynced)
@@ -134,9 +110,6 @@ public KubernetesInformerDiscoveryClient(List<SharedInformerFactory> sharedInfor
 			return serviceInformersReady && endpointsInformersReady;
 		};
 
-		this.properties = properties;
-		filter = filter(properties);
-		servicePortSecureResolver = new ServicePortSecureResolver(properties);
 	}
 
 	@Override

spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-discoveryserver/src/test/java/org/springframework/cloud/kubernetes/discoveryserver/DiscoveryServerIntegrationInstanceEndpointTests.java

@@ -81,27 +81,6 @@ class DiscoveryServerIntegrationInstanceEndpointTests {
 	@Autowired
 	private WebTestClient webTestClient;
 
-	@Test
-	void instanceDeprecated() {
-		Map<String, String> metadata = new HashMap<>();
-		metadata.put("spring", "true");
-		metadata.put("port.http", "8080");
-		metadata.put("k8s_namespace", "namespace");
-		metadata.put("type", "ClusterIP");
-		metadata.put("k8s", "true");
-
-		DefaultKubernetesServiceInstance kubernetesServiceInstance = new DefaultKubernetesServiceInstance(
-				TEST_ENDPOINTS.getSubsets().get(0).getAddresses().get(0).getTargetRef().getUid(),
-				TEST_SERVICE.getMetadata().getName(), TEST_ENDPOINTS.getSubsets().get(0).getAddresses().get(0).getIp(),
-				TEST_ENDPOINTS.getSubsets().get(0).getPorts().get(0).getPort(), metadata, false,
-				TEST_SERVICE.getMetadata().getNamespace(), null);
-		webTestClient.get()
-			.uri("/app/test-svc-3/uid2")
-			.exchange()
-			.expectBody(DefaultKubernetesServiceInstance.class)
-			.isEqualTo(kubernetesServiceInstance);
-	}
-
 	@Test
 	void instance() {
 		Map<String, String> metadata = new HashMap<>();

spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClient.java

@@ -42,17 +42,6 @@ public class KubernetesDiscoveryClient implements DiscoveryClient {
 
 	private final String discoveryServerUrl;
 
-	@Deprecated(forRemoval = true)
-	public KubernetesDiscoveryClient(RestTemplate rest, KubernetesDiscoveryClientProperties properties) {
-		if (!StringUtils.hasText(properties.getDiscoveryServerUrl())) {
-			throw new DiscoveryServerUrlInvalidException();
-		}
-		this.rest = rest;
-		this.emptyNamespaces = properties.getNamespaces().isEmpty();
-		this.namespaces = properties.getNamespaces();
-		this.discoveryServerUrl = properties.getDiscoveryServerUrl();
-	}
-
 	KubernetesDiscoveryClient(RestTemplate rest, KubernetesDiscoveryProperties kubernetesDiscoveryProperties) {
 		if (!StringUtils.hasText(kubernetesDiscoveryProperties.discoveryServerUrl())) {
 			throw new DiscoveryServerUrlInvalidException();

spring-cloud-kubernetes-discovery/src/main/java/org/springframework/cloud/kubernetes/discovery/KubernetesDiscoveryClientAutoConfiguration.java

@@ -34,15 +34,6 @@ public class KubernetesReactiveDiscoveryClient implements ReactiveDiscoveryClien
 
 	private final WebClient webClient;
 
-	@Deprecated(forRemoval = true)
-	public KubernetesReactiveDiscoveryClient(WebClient.Builder webClientBuilder,
-			KubernetesDiscoveryClientProperties properties) {
-		if (!StringUtils.hasText(properties.getDiscoveryServerUrl())) {
-			throw new DiscoveryServerUrlInvalidException();
-		}
-		webClient = webClientBuilder.baseUrl(properties.getDiscoveryServerUrl()).build();
-	}
-
 	KubernetesReactiveDiscoveryClient(WebClient.Builder webClientBuilder, KubernetesDiscoveryProperties properties) {
 		if (!StringUtils.hasText(properties.discoveryServerUrl())) {
 			throw new DiscoveryServerUrlInvalidException();