drop deprecations

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

Author: wind57

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,7 +81,7 @@ public class KubernetesInformerDiscoveryClient implements DiscoveryClient {
 
 	private final ServicePortSecureResolver servicePortSecureResolver;
 
-	private final CoreV1Api coreV1Api;
+	final CoreV1Api coreV1Api;
 
 	public KubernetesInformerDiscoveryClient(List<SharedInformerFactory> sharedInformerFactories,
 			List<Lister<V1Service>> serviceListers, List<Lister<V1Endpoints>> endpointsListers,

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

@@ -21,6 +21,7 @@
 import io.kubernetes.client.informer.SharedInformer;
 import io.kubernetes.client.informer.SharedInformerFactory;
 import io.kubernetes.client.informer.cache.Lister;
+import io.kubernetes.client.openapi.apis.CoreV1Api;
 import io.kubernetes.client.openapi.models.V1Endpoints;
 import io.kubernetes.client.openapi.models.V1Service;
 
@@ -30,7 +31,6 @@
 import org.springframework.cloud.client.CommonsClientAutoConfiguration;
 import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryClientAutoConfiguration;
 import org.springframework.cloud.kubernetes.client.KubernetesClientAutoConfiguration;
-import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider;
 import org.springframework.cloud.kubernetes.commons.discovery.ConditionalOnSpringCloudKubernetesBlockingDiscovery;
 import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryClientHealthConfiguration;
 import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
@@ -52,25 +52,16 @@
 @Import(KubernetesDiscoveryClientHealthConfiguration.class)
 public class KubernetesInformerDiscoveryClientAutoConfiguration {
 
-	@Deprecated(forRemoval = true)
-	public KubernetesInformerDiscoveryClient kubernetesInformerDiscoveryClient(
-			KubernetesNamespaceProvider kubernetesNamespaceProvider, SharedInformerFactory sharedInformerFactory,
-			Lister<V1Service> serviceLister, Lister<V1Endpoints> endpointsLister,
-			SharedInformer<V1Service> serviceInformer, SharedInformer<V1Endpoints> endpointsInformer,
-			KubernetesDiscoveryProperties properties) {
-		return new KubernetesInformerDiscoveryClient(kubernetesNamespaceProvider.getNamespace(), sharedInformerFactory,
-				serviceLister, endpointsLister, serviceInformer, endpointsInformer, properties);
-	}
-
 	@Bean
 	@ConditionalOnMissingBean
 	@Conditional(ConditionalOnSelectiveNamespacesMissing.class)
 	KubernetesInformerDiscoveryClient kubernetesClientInformerDiscoveryClient(
 			SharedInformerFactory sharedInformerFactory, Lister<V1Service> serviceLister,
 			Lister<V1Endpoints> endpointsLister, SharedInformer<V1Service> serviceInformer,
-			SharedInformer<V1Endpoints> endpointsInformer, KubernetesDiscoveryProperties properties) {
-		return new KubernetesInformerDiscoveryClient(sharedInformerFactory, serviceLister, endpointsLister,
-				serviceInformer, endpointsInformer, properties);
+			SharedInformer<V1Endpoints> endpointsInformer, KubernetesDiscoveryProperties properties,
+			CoreV1Api coreV1Api) {
+		return new KubernetesInformerDiscoveryClient(List.of(sharedInformerFactory), List.of(serviceLister),
+				List.of(endpointsLister), List.of(serviceInformer), List.of(endpointsInformer), properties, coreV1Api);
 	}
 
 	@Bean
@@ -79,9 +70,10 @@ KubernetesInformerDiscoveryClient kubernetesClientInformerDiscoveryClient(
 	KubernetesInformerDiscoveryClient selectiveNamespacesKubernetesInformerDiscoveryClient(
 			List<SharedInformerFactory> sharedInformerFactories, List<Lister<V1Service>> serviceListers,
 			List<Lister<V1Endpoints>> endpointsListers, List<SharedInformer<V1Service>> serviceInformers,
-			List<SharedInformer<V1Endpoints>> endpointsInformers, KubernetesDiscoveryProperties properties) {
+			List<SharedInformer<V1Endpoints>> endpointsInformers, KubernetesDiscoveryProperties properties,
+			CoreV1Api coreV1Api) {
 		return new KubernetesInformerDiscoveryClient(sharedInformerFactories, serviceListers, endpointsListers,
-				serviceInformers, endpointsInformers, properties);
+				serviceInformers, endpointsInformers, properties, coreV1Api);
 	}
 
 }

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

@@ -18,19 +18,12 @@
 
 import java.util.Objects;
 
-import io.kubernetes.client.informer.SharedInformer;
-import io.kubernetes.client.informer.SharedInformerFactory;
-import io.kubernetes.client.informer.cache.Lister;
-import io.kubernetes.client.openapi.models.V1Endpoints;
-import io.kubernetes.client.openapi.models.V1Service;
 import reactor.core.publisher.Flux;
 import reactor.core.scheduler.Schedulers;
 
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.discovery.ReactiveDiscoveryClient;
 import org.springframework.cloud.kubernetes.client.discovery.KubernetesInformerDiscoveryClient;
-import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider;
-import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
 
 /**
  * @author Ryan Baxter
@@ -39,18 +32,6 @@ public class KubernetesInformerReactiveDiscoveryClient implements ReactiveDiscov
 
 	private final KubernetesInformerDiscoveryClient kubernetesDiscoveryClient;
 
-	@Deprecated(forRemoval = true)
-	public KubernetesInformerReactiveDiscoveryClient(KubernetesNamespaceProvider kubernetesNamespaceProvider,
-			SharedInformerFactory sharedInformerFactory, Lister<V1Service> serviceLister,
-			Lister<V1Endpoints> endpointsLister, SharedInformer<V1Service> serviceInformer,
-			SharedInformer<V1Endpoints> endpointsInformer, KubernetesDiscoveryProperties properties) {
-		this.kubernetesDiscoveryClient = new KubernetesInformerDiscoveryClient(
-				kubernetesNamespaceProvider.getNamespace(), sharedInformerFactory, serviceLister, endpointsLister,
-				serviceInformer, endpointsInformer, properties);
-	}
-
-	// this is either kubernetesClientInformerDiscoveryClient
-	// or selectiveNamespacesKubernetesClientInformerDiscoveryClient
 	KubernetesInformerReactiveDiscoveryClient(KubernetesInformerDiscoveryClient kubernetesDiscoveryClient) {
 		this.kubernetesDiscoveryClient = kubernetesDiscoveryClient;
 	}