Update fabric8 kubernetes client version to 7.4.0 (#831)

Author: vinokurig

infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/wsplugins/K8sContainerResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2024 Red Hat, Inc.
+ * Copyright (c) 2012-2025 Red Hat, Inc.
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
  * which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -87,7 +87,7 @@ private io.fabric8.kubernetes.api.model.Lifecycle toK8sLifecycle(Lifecycle lifec
         toK8sHandler(lifecycle.getPostStart());
     io.fabric8.kubernetes.api.model.LifecycleHandler preStop = toK8sHandler(lifecycle.getPreStop());
     io.fabric8.kubernetes.api.model.Lifecycle k8sLifecycle =
-        new io.fabric8.kubernetes.api.model.Lifecycle(postStart, preStop);
+        new io.fabric8.kubernetes.api.model.Lifecycle(postStart, preStop, "SIGTERM");
     return k8sLifecycle;
   }
 

infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/log/ContainerLogWatchTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2023 Red Hat, Inc.
+ * Copyright (c) 2012-2025 Red Hat, Inc.
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
  * which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -13,6 +13,7 @@
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.timeout;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -31,6 +32,7 @@
 import java.io.InputStream;
 import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
+import java.util.concurrent.CompletionStage;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import org.eclipse.che.workspace.infrastructure.kubernetes.util.RuntimeEventsPublisher;
@@ -355,6 +357,11 @@ public InputStream getOutput() {
       return inputStream;
     }
 
+    @Override
+    public CompletionStage<Throwable> onClose() {
+      return mock(CompletionStage.class);
+    }
+
     @Override
     public void close() {
       isClosed = true;

infrastructures/openshift/src/main/java/org/eclipse/che/workspace/infrastructure/openshift/multiuser/oauth/KeycloakProviderConfigFactory.java

@@ -11,14 +11,14 @@
  */
 package org.eclipse.che.workspace.infrastructure.openshift.multiuser.oauth;
 
+import static io.fabric8.openshift.client.OpenShiftConfig.wrap;
 import static org.eclipse.che.multiuser.keycloak.shared.KeycloakConstants.CLIENT_ID_SETTING;
 import static org.eclipse.che.multiuser.keycloak.shared.KeycloakConstants.REALM_SETTING;
 import static org.eclipse.che.multiuser.oidc.OIDCInfoProvider.AUTH_SERVER_URL_SETTING;
 
 import com.google.inject.Provider;
 import io.fabric8.kubernetes.client.Config;
 import io.fabric8.openshift.client.OpenShiftConfig;
-import io.fabric8.openshift.client.OpenShiftConfigBuilder;
 import jakarta.ws.rs.core.UriBuilder;
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
@@ -177,9 +177,9 @@ private Config personalizeConfig(Config defaultConfig) throws InfrastructureExce
       KeycloakTokenResponse keycloakTokenInfos =
           keycloakServiceClient.getIdentityProviderToken(oauthIdentityProvider);
       if ("user:full".equals(keycloakTokenInfos.getScope())) {
-        return new OpenShiftConfigBuilder(OpenShiftConfig.wrap(defaultConfig))
-            .withOauthToken(keycloakTokenInfos.getAccessToken())
-            .build();
+        OpenShiftConfig openShiftConfig = wrap(defaultConfig);
+        openShiftConfig.setOauthToken(keycloakTokenInfos.getAccessToken());
+        return openShiftConfig;
       } else {
         throw new InfrastructureException(
             "Cannot retrieve user OpenShift token: '"

pom.xml

@@ -66,7 +66,7 @@
         <enforcer.skip>false</enforcer.skip>
         <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-13-centos7:1-71b24684d64da46f960682cc4216222a7e4ed8b1a31dd5a865b3e71afdea20d2</integration.postgresql.db.image>
-        <io.fabric8.kubernetes-client.version>7.1.0</io.fabric8.kubernetes-client.version>
+        <io.fabric8.kubernetes-client.version>7.4.0</io.fabric8.kubernetes-client.version>
         <io.github.mweirauch.micrometer-jvm-extras.version>0.2.2</io.github.mweirauch.micrometer-jvm-extras.version>
         <io.jaegertracing.micrometer.version>1.8.1</io.jaegertracing.micrometer.version>
         <io.jaegertracing.version>1.8.1</io.jaegertracing.version>