This is an automated email from the ASF dual-hosted git repository. marat pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push: new 2c169307 Fix #1223 2c169307 is described below commit 2c1693070f216b55f39fcc31b0d8f5bd3b359791 Author: Marat Gubaidullin <ma...@talismancloud.io> AuthorDate: Thu Apr 11 13:10:55 2024 -0400 Fix #1223 --- .../apache/camel/karavan/api/BuildResource.java | 2 +- .../karavan/kubernetes/KubernetesService.java | 28 ++++++++++++---------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/karavan-app/src/main/java/org/apache/camel/karavan/api/BuildResource.java b/karavan-app/src/main/java/org/apache/camel/karavan/api/BuildResource.java index 6b74800d..ce865511 100644 --- a/karavan-app/src/main/java/org/apache/camel/karavan/api/BuildResource.java +++ b/karavan-app/src/main/java/org/apache/camel/karavan/api/BuildResource.java @@ -45,7 +45,7 @@ public class BuildResource { @Path("/update-config-map") public Response updateConfigMaps() { if (karavanCacheService.isReady()) { - kubernetesService.createBuildScriptConfigmap(); + kubernetesService.createBuildScriptConfigmap(null); return Response.ok().build(); } else { return Response.noContent().build(); diff --git a/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesService.java b/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesService.java index 8b7c8baf..f63a9deb 100644 --- a/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesService.java +++ b/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesService.java @@ -154,20 +154,22 @@ public class KubernetesService implements HealthCheck { } @ConsumeEvent(value = KARAVAN_STARTED, blocking = true) - public void createBuildScriptConfigmap() { - try (KubernetesClient client = kubernetesClient()) { - String script = codeService.getBuilderScript(); - ConfigMap configMap = client.configMaps().inNamespace(getNamespace()).withName(BUILD_CONFIG_MAP).get(); - if (configMap == null) { - configMap = getConfigMapForBuilder(BUILD_CONFIG_MAP, getPartOfLabels()); - configMap.setData(Map.of("build.sh", script)); - client.resource(configMap).create(); - } else { - configMap.setData(Map.of("build.sh", script)); - client.resource(configMap).patch(); + public void createBuildScriptConfigmap(String data) { + if (ConfigService.inKubernetes()) { + try (KubernetesClient client = kubernetesClient()) { + String script = codeService.getBuilderScript(); + ConfigMap configMap = client.configMaps().inNamespace(getNamespace()).withName(BUILD_CONFIG_MAP).get(); + if (configMap == null) { + configMap = getConfigMapForBuilder(BUILD_CONFIG_MAP, getPartOfLabels()); + configMap.setData(Map.of("build.sh", script)); + client.resource(configMap).create(); + } else { + configMap.setData(Map.of("build.sh", script)); + client.resource(configMap).patch(); + } + } catch (Exception e) { + LOGGER.error("Error createBuildScriptConfigmap: " + e.getMessage()); } - } catch (Exception e) { - LOGGER.error("Error createBuildScriptConfigmap: " + e.getMessage()); } }