Merge pull request #723 from eclipse-che/fix-declined-auth-startup

fix: apply strategic merge to workspace-preferences-configmap
eclipse-che · Oct 4, 2024 · e4d7256 · e4d7256
2 parents 42c7e18 + 04f0b76
commit e4d7256
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/.../eclipse/che/api/factory/server/scm/kubernetes/KubernetesAuthorisationRequestManager.java b/.../eclipse/che/api/factory/server/scm/kubernetes/KubernetesAuthorisationRequestManager.java
@@ -21,6 +21,8 @@
 import com.google.gson.Gson;
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.dsl.base.PatchContext;
+import io.fabric8.kubernetes.client.dsl.base.PatchType;
 import jakarta.ws.rs.core.UriInfo;
 import java.net.URL;
 import java.util.HashSet;
@@ -118,7 +120,7 @@ private void patchConfigMap(ConfigMap configMap) {
           .configMaps()
           .inNamespace(getFirstNamespace())
           .withName(PREFERENCES_CONFIGMAP_NAME)
-          .patch(configMap);
+          .patch(PatchContext.of(PatchType.STRATEGIC_MERGE), configMap);
     } catch (UnsatisfiedScmPreconditionException
         | ScmConfigurationPersistenceException
         | InfrastructureException e) {