From 813218455a42485a3facd44d2f1304b3fa24cd54 Mon Sep 17 00:00:00 2001
From: Sergii Kabashniuk <skabashnyuk@users.noreply.github.com>
Date: Fri, 30 Jul 2021 11:58:11 +0300
Subject: [PATCH] build: Upgrade kubernetes client to latest stable version
 5.6.0 (#60)

---
 .../kubernetes/KubernetesClientFactory.java   | 19 +++++++++++++++++--
 .../provision/secret/FileSecretApplier.java   |  2 +-
 pom.xml                                       |  2 +-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/KubernetesClientFactory.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/KubernetesClientFactory.java
index 6311a5a4b7d..13b93fd2c1d 100644
--- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/KubernetesClientFactory.java
+++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/KubernetesClientFactory.java
@@ -20,7 +20,6 @@
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.utils.HttpClientUtils;
 import io.fabric8.kubernetes.client.utils.ImpersonatorInterceptor;
-import io.fabric8.kubernetes.client.utils.Utils;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
 import javax.inject.Inject;
@@ -126,7 +125,23 @@ public void shutdownClient() {
       connectionPool.evictAll();
     }
 
-    Utils.shutdownExecutorService(executorService);
+    if (executorService != null && !executorService.isShutdown()) {
+      executorService.shutdown();
+      try {
+        Logger logger = LoggerFactory.getLogger(getClass());
+        logger.debug("Shutdown kubernetes client threads pool, wait 30s to stop normally");
+        if (!executorService.awaitTermination(30, TimeUnit.SECONDS)) {
+          executorService.shutdownNow();
+          logger.debug("Interrupt kubernetes client threads pool, wait 60s to stop");
+          if (!executorService.awaitTermination(60, TimeUnit.SECONDS)) {
+            logger.error("Couldn't shutdown kubernetes client threads pool");
+          }
+        }
+      } catch (InterruptedException x) {
+        executorService.shutdownNow();
+        Thread.currentThread().interrupt();
+      }
+    }
   }
 
   /** Retrieves the {@link OkHttpClient} instance shared by all Kubernetes clients. */
diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/secret/FileSecretApplier.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/secret/FileSecretApplier.java
index b910cc3a6c1..1ad3e2cea42 100644
--- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/secret/FileSecretApplier.java
+++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/secret/FileSecretApplier.java
@@ -86,7 +86,7 @@ public void applySecret(KubernetesEnvironment env, RuntimeIdentity runtimeIdenti
             .withName(secret.getMetadata().getName())
             .withSecret(
                 new SecretVolumeSourceBuilder()
-                    .withNewSecretName(secret.getMetadata().getName())
+                    .withSecretName(secret.getMetadata().getName())
                     .build())
             .build();
 
diff --git a/pom.xml b/pom.xml
index 8c74071d9dd..0c2d1610b0e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,7 @@
         <commons-lang.version>2.6</commons-lang.version>
         <integration.mysql.db.image>quay.io/eclipse/che--centos--mysql-57-centos7:latest-e08ee4d43b7356607685b69bde6335e27cf20c020f345b6c6c59400183882764</integration.mysql.db.image>
         <integration.postgresql.db.image>quay.io/eclipse/che--centos--postgresql-96-centos7:9.6-b681d78125361519180a6ac05242c296f8906c11eab7e207b5ca9a89b6344392</integration.postgresql.db.image>
-        <io.fabric8.kubernetes-client>5.4.1</io.fabric8.kubernetes-client>
+        <io.fabric8.kubernetes-client>5.6.0</io.fabric8.kubernetes-client>
         <io.github.mweirauch.micrometer-jvm-extras.version>0.1.3</io.github.mweirauch.micrometer-jvm-extras.version>
         <io.jaegertracing.micrometer.version>1.0.0</io.jaegertracing.micrometer.version>
         <io.jaegertracing.version>1.0.0</io.jaegertracing.version>