Merge pull request #2049 from wind57/drop_deprecations

Drop deprecations

Author: ryanjbaxter

.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-autoconfig/src/main/java/org/springframework/cloud/kubernetes/client/KubernetesClientPodUtils.java

@@ -60,20 +60,6 @@ public class KubernetesClientPodUtils implements PodUtils<V1Pod> {
 
 	private final boolean failFast;
 
-	@Deprecated(forRemoval = true)
-	public KubernetesClientPodUtils(CoreV1Api client, String namespace) {
-		if (client == null) {
-			throw new IllegalArgumentException("Must provide an instance of KubernetesClient");
-		}
-
-		this.client = client;
-		this.hostName = EnvReader.getEnv(HOSTNAME);
-		this.serviceHost = EnvReader.getEnv(KUBERNETES_SERVICE_HOST);
-		this.current = LazilyInstantiate.using(this::internalGetPod);
-		this.namespace = namespace;
-		this.failFast = false;
-	}
-
 	// mainly needed for the health and info contributors, so that they report DOWN
 	// correctly
 	public KubernetesClientPodUtils(CoreV1Api client, String namespace, boolean failFast) {

spring-cloud-kubernetes-client-config/src/main/java/org/springframework/cloud/kubernetes/client/config/KubernetesClientSecretsPropertySource.java

@@ -29,11 +29,6 @@
  */
 public class KubernetesClientSecretsPropertySource extends SecretsPropertySource {
 
-	@Deprecated(forRemoval = true)
-	public KubernetesClientSecretsPropertySource(SourceData sourceData) {
-		super(sourceData);
-	}
-
 	private static final EnumMap<NormalizedSourceType, KubernetesClientContextToSourceData> STRATEGIES = new EnumMap<>(
 			NormalizedSourceType.class);
 

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

@@ -17,11 +17,13 @@
 package org.springframework.cloud.kubernetes.client.discovery;
 
 import java.util.Collections;
+import java.util.List;
 
 import io.kubernetes.client.informer.SharedIndexInformer;
 import io.kubernetes.client.informer.SharedInformerFactory;
 import io.kubernetes.client.informer.cache.Lister;
 import io.kubernetes.client.openapi.ApiClient;
+import io.kubernetes.client.openapi.apis.CoreV1Api;
 import io.kubernetes.client.openapi.models.V1Endpoints;
 import io.kubernetes.client.openapi.models.V1EndpointsList;
 import io.kubernetes.client.openapi.models.V1Service;
@@ -96,8 +98,9 @@ public void initialize(BootstrapRegistry registry) {
 					.sharedIndexInformerFor(endpointsApi, V1Endpoints.class, 0L, namespace);
 				Lister<V1Endpoints> endpointsLister = new Lister<>(endpointsSharedIndexInformer.getIndexer());
 				KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient(
-						sharedInformerFactory, serviceLister, endpointsLister, serviceSharedIndexInformer,
-						endpointsSharedIndexInformer, discoveryProperties);
+						List.of(sharedInformerFactory), List.of(serviceLister), List.of(endpointsLister),
+						List.of(serviceSharedIndexInformer), List.of(endpointsSharedIndexInformer), discoveryProperties,
+						new CoreV1Api(apiClient));
 				try {
 					discoveryClient.afterPropertiesSet();
 					return discoveryClient::getInstances;

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

@@ -35,7 +35,6 @@
 import jakarta.annotation.PostConstruct;
 import org.apache.commons.logging.LogFactory;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
@@ -82,46 +81,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);
-	}
+	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 +109,6 @@ public KubernetesInformerDiscoveryClient(List<SharedInformerFactory> sharedInfor
 			return serviceInformersReady && endpointsInformersReady;
 		};
 
-		this.properties = properties;
-		filter = filter(properties);
-		servicePortSecureResolver = new ServicePortSecureResolver(properties);
 	}
 
 	@Override