Fix 1968

spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/leader/LeaderProperties.java

@@ -60,7 +60,7 @@ public class LeaderProperties {
 	/**
 	 * Leadership status check period. Default: 60s
 	 */
-	private Duration updatePeriod = Duration.ofMillis(60000);
+	private Duration updatePeriod = Duration.ofMillis(10000);
 
 	/**
 	 * Enable/disable publishing events in case leadership acquisition fails. Default:

spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/leader/LeaderUtils.java

@@ -20,14 +20,19 @@
 import java.net.UnknownHostException;
 import java.util.concurrent.locks.ReentrantLock;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.cloud.kubernetes.commons.EnvReader;
+import org.springframework.cloud.kubernetes.commons.config.ConfigMapPropertySourceLocator;
 import org.springframework.util.StringUtils;
 
 /**
  * @author wind57
  */
 public final class LeaderUtils {
 
+	private static final Log LOG = LogFactory.getLog(LeaderUtils.class);
+
 	// k8s environment variable responsible for host name
 	private static final String HOSTNAME = "HOSTNAME";
 
@@ -50,6 +55,9 @@ public static void guarded(ReentrantLock lock, Runnable runnable) {
 			lock.lock();
 			runnable.run();
 		}
+		catch (Exception e) {
+			LOG.error(e.getMessage(), e);
+		}
 		finally {
 			lock.unlock();
 		}

spring-cloud-kubernetes-fabric8-autoconfig/src/main/java/org/springframework/cloud/kubernetes/fabric8/Fabric8AutoConfiguration.java

@@ -18,13 +18,11 @@
 
 import java.time.Duration;
 
-import io.fabric8.kubernetes.client.Client;
 import io.fabric8.kubernetes.client.Config;
 import io.fabric8.kubernetes.client.ConfigBuilder;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.KubernetesClientBuilder;
 
-import org.springframework.beans.factory.BeanFactoryUtils;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnCloudPlatform;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -33,8 +31,6 @@
 import org.springframework.cloud.kubernetes.commons.KubernetesCommonsAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.event.ContextClosedEvent;
-import org.springframework.context.event.EventListener;
 
 /**
  * Auto configuration for Kubernetes.
@@ -121,13 +117,4 @@ public Fabric8PodUtils kubernetesPodUtils(KubernetesClient client) {
 		return new Fabric8PodUtils(client);
 	}
 
-	@EventListener
-	void onContextClosed(ContextClosedEvent event) {
-		// Clean up any open connections from the KubernetesClient when the context is
-		// closed
-		BeanFactoryUtils.beansOfTypeIncludingAncestors(event.getApplicationContext(), KubernetesClient.class)
-			.values()
-			.forEach(Client::close);
-	}
-
 }

spring-cloud-kubernetes-fabric8-leader/src/main/java/org/springframework/cloud/kubernetes/fabric8/leader/App.java

@@ -0,0 +1,13 @@
+package org.springframework.cloud.kubernetes.fabric8.leader;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class App {
+
+	public static void main(String[] args) {
+		SpringApplication.run(App.class, args);
+	}
+
+}

spring-cloud-kubernetes-fabric8-leader/src/main/java/org/springframework/cloud/kubernetes/fabric8/leader/Fabric8LeaderAutoConfiguration.java

@@ -23,8 +23,10 @@
 import org.springframework.boot.actuate.info.InfoContributor;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnCloudPlatform;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.cloud.CloudPlatform;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.kubernetes.commons.leader.LeaderInfoContributor;
 import org.springframework.cloud.kubernetes.commons.leader.LeaderInitiator;
@@ -44,6 +46,7 @@
 @Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties(LeaderProperties.class)
 @ConditionalOnBean(KubernetesClient.class)
+@ConditionalOnCloudPlatform(CloudPlatform.KUBERNETES)
 @ConditionalOnProperty(value = "spring.cloud.kubernetes.leader.enabled", matchIfMissing = true)
 public class Fabric8LeaderAutoConfiguration {
 

spring-cloud-kubernetes-fabric8-leader/src/main/java/org/springframework/cloud/kubernetes/fabric8/leader/Fabric8LeadershipController.java

@@ -145,7 +145,8 @@ private Leader extractLeader(ConfigMap configMap) {
 	}
 
 	private boolean isPodReady(String name) {
-		return kubernetesClient.pods().withName(name).isReady();
+		//return kubernetesClient.pods().inNamespace("default").withName(name).isReady();
+		return true;
 	}
 
 	private ConfigMap getConfigMap() {

spring-cloud-kubernetes-fabric8-leader/src/main/java/org/springframework/cloud/kubernetes/fabric8/leader/Fabric8PodReadinessWatcher.java

@@ -64,7 +64,7 @@ public void start() {
 			guarded(lock, () -> {
 				if (watch == null) {
 					LOGGER.debug(() -> "Starting pod readiness watcher for :" + podName);
-					PodResource podResource = kubernetesClient.pods().withName(podName);
+					PodResource podResource = kubernetesClient.pods().inNamespace("default").withName(podName);
 					previousState = podResource.isReady();
 					watch = podResource.watch(this);
 				}