From 286459283ad2097d7c177df829033f785a2e21ea Mon Sep 17 00:00:00 2001 From: Mykola Morhun Date: Thu, 3 Dec 2020 12:17:53 +0200 Subject: [PATCH] Fix exception if no data in certs config map (#18519) Signed-off-by: Mykola Morhun --- .../kubernetes/provision/KubernetesTrustedCAProvisioner.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/KubernetesTrustedCAProvisioner.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/KubernetesTrustedCAProvisioner.java index 1ec8eef7ac1..64c56f4f804 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/KubernetesTrustedCAProvisioner.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/provision/KubernetesTrustedCAProvisioner.java @@ -114,7 +114,9 @@ public void provision(KubernetesEnvironment k8sEnv, RuntimeIdentity runtimeID) KubernetesNamespace namespace = namespaceFactory.getOrCreate(runtimeID); Optional existing = namespace.configMaps().get(configMapName); - if (existing.isEmpty() || !existing.get().getData().equals(allCaCertsConfigMap.getData())) { + if (existing.isEmpty() + || !(existing.get().getData() == allCaCertsConfigMap.getData() + || existing.get().getData().equals(allCaCertsConfigMap.getData()))) { // create or renew map k8sEnv .getConfigMaps()