From 93ec00ce32905ef11c1854cc2cbd4af870852ee5 Mon Sep 17 00:00:00 2001
From: Ryan Baxter <rbaxter@vmware.com>
Date: Thu, 8 Dec 2022 22:41:53 -0500
Subject: [PATCH] Upgrade To Kubernetes Java Client 17 (#1168)

Co-authored-by: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com>
---
 .../client/discovery/KubernetesInformerDiscoveryClient.java   | 4 +++-
 spring-cloud-kubernetes-dependencies/pom.xml                  | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClient.java b/spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClient.java
index 9ca7db3f..06b9283c 100644
--- a/spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClient.java
+++ b/spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClient.java
@@ -174,7 +174,9 @@ public class KubernetesInformerDiscoveryClient implements DiscoveryClient, Initi
 							.map(addr -> new DefaultKubernetesServiceInstance(
 									addr.getTargetRef() != null ? addr.getTargetRef().getUid() : "", serviceId,
 									addr.getIp(), port, metadata, secured, service.getMetadata().getNamespace(),
-									service.getMetadata().getClusterName()));
+									// TODO find out how to get cluster name possibly from
+									// KubeConfig
+									null));
 				});
 	}
 
diff --git a/spring-cloud-kubernetes-dependencies/pom.xml b/spring-cloud-kubernetes-dependencies/pom.xml
index 27026d9f..7fafe729 100644
--- a/spring-cloud-kubernetes-dependencies/pom.xml
+++ b/spring-cloud-kubernetes-dependencies/pom.xml
@@ -34,7 +34,7 @@
 	<properties>
 		<hoverfly.version>0.13.0</hoverfly.version>
 		<kubernetes-fabric8-client.version>6.2.0</kubernetes-fabric8-client.version>
-		<kubernetes-native-client.version>16.0.2</kubernetes-native-client.version>
+		<kubernetes-native-client.version>17.0.0</kubernetes-native-client.version>
 		<wiremock.version>2.26.3</wiremock.version>
 		<spring-retry.version>1.3.1</spring-retry.version>
 		<commons.collections4.version>4.4</commons.collections4.version>