From 04da1ee49fb36e12475c4071aa2a730396e491e1 Mon Sep 17 00:00:00 2001
From: Rostislav Svoboda <rsvoboda@redhat.com>
Date: Fri, 5 Jun 2020 15:17:00 +0200
Subject: [PATCH] KubernetesDeploy update to always close client and to fetch
 masterURL just once

---
 .../io/quarkus/kubernetes/deployment/KubernetesDeploy.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeploy.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeploy.java
index 2e1386505a436..f8e312eec9829 100644
--- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeploy.java
+++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeploy.java
@@ -67,7 +67,6 @@ private Result doCheck() {
         KubernetesClient client = KubernetesClientUtils.createClient();
         String masterURL = client.getConfiguration().getMasterUrl();
         try {
-            masterURL = client.getConfiguration().getMasterUrl();
             //Let's check if we can connect.
             VersionInfo version = client.getVersion();
             if (version == null) {
@@ -79,7 +78,6 @@ private Result doCheck() {
             log.info("Kubernetes API Server at '" + masterURL + "' successfully contacted.");
             log.debugf("Kubernetes Version: %s.%s", version.getMajor(), version.getMinor());
             serverFound = true;
-            client.close();
             return Result.enabled();
         } catch (Exception e) {
             if (e.getCause() instanceof SSLHandshakeException) {
@@ -94,6 +92,8 @@ private Result doCheck() {
                                 + masterURL + "'",
                         e));
             }
+        } finally {
+            client.close();
         }
     }