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
commit ca05abcd671e849f618d0dc5e7d9d82ef0b8003e
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Fri Feb 23 09:55:41 2024 -0500
Redesign
---
.../org/apache/camel/karavan/api/AuthResource.java | 2 +-
.../apache/camel/karavan/api/BuildResource.java | 2 +-
.../camel/karavan/api/ContainerResource.java | 2 +-
.../apache/camel/karavan/api/DevModeResource.java | 2 +-
.../apache/camel/karavan/api/ImagesResource.java | 4 +-
.../camel/karavan/api/InfrastructureResource.java | 2 +-
.../apache/camel/karavan/api/KameletResources.java | 2 +-
.../camel/karavan/api/ProjectFileResource.java | 2 +-
.../apache/camel/karavan/api/ProjectResource.java | 4 +-
.../apache/camel/karavan/api/StatusResource.java | 2 +-
.../org/apache/camel/karavan/code/CodeService.java | 11 +-
.../camel/karavan/docker/DockerEventListener.java | 2 +-
.../camel/karavan/docker/DockerForGitea.java | 75 ----------
.../camel/karavan/docker/DockerForRegistry.java | 49 ------
.../org/apache/camel/karavan/git/GiteaService.java | 166 ---------------------
.../karavan/kubernetes/DeploymentEventHandler.java | 2 +-
.../karavan/kubernetes/KubernetesService.java | 2 +-
.../camel/karavan/kubernetes/PodEventHandler.java | 2 +-
.../karavan/kubernetes/ServiceEventHandler.java | 2 +-
.../camel/karavan/{git => }/model/GitConfig.java | 2 +-
.../camel/karavan/{git => }/model/GitRepo.java | 2 +-
.../camel/karavan/{git => }/model/GitRepoFile.java | 2 +-
.../{registry => model}/RegistryConfig.java | 2 +-
.../apache/camel/karavan/service/CamelService.java | 1 -
.../karavan/service/ContainerStatusService.java | 1 -
.../camel/karavan/{git => service}/GitService.java | 38 +----
.../{cache => service}/KaravanCacheService.java | 2 +-
.../camel/karavan/service/KaravanService.java | 33 ----
.../camel/karavan/service/ProjectService.java | 9 +-
.../{registry => service}/RegistryService.java | 6 +-
.../project/ProjectFileCreateValidator.java | 2 +-
.../validation/project/ProjectModifyValidator.java | 2 +-
.../src/main/resources/application.properties | 20 +--
33 files changed, 37 insertions(+), 420 deletions(-)
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/AuthResource.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/AuthResource.java
index fa44e8eb..00751702 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/AuthResource.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/AuthResource.java
@@ -22,7 +22,7 @@ import jakarta.ws.rs.Path;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
-import org.apache.camel.karavan.cache.KaravanCacheService;
+import org.apache.camel.karavan.service.KaravanCacheService;
import org.apache.camel.karavan.kubernetes.KubernetesService;
import org.apache.camel.karavan.service.AuthService;
import org.apache.camel.karavan.service.ProjectService;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/BuildResource.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/BuildResource.java
index 17ce3ad9..7dd5fbda 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/BuildResource.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/BuildResource.java
@@ -23,7 +23,7 @@ import jakarta.ws.rs.Path;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
-import org.apache.camel.karavan.cache.KaravanCacheService;
+import org.apache.camel.karavan.service.KaravanCacheService;
import org.apache.camel.karavan.code.CodeService;
import org.apache.camel.karavan.kubernetes.KubernetesService;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ContainerResource.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ContainerResource.java
index 5b7e8b3a..a5450dc2 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ContainerResource.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ContainerResource.java
@@ -24,7 +24,7 @@ import jakarta.inject.Inject;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
-import org.apache.camel.karavan.cache.KaravanCacheService;
+import org.apache.camel.karavan.service.KaravanCacheService;
import org.apache.camel.karavan.model.ContainerStatus;
import org.apache.camel.karavan.code.DockerComposeConverter;
import org.apache.camel.karavan.model.DockerComposeService;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/DevModeResource.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/DevModeResource.java
index ecde5aae..ce6f4903 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/DevModeResource.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/DevModeResource.java
@@ -22,7 +22,7 @@ import jakarta.inject.Inject;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
-import org.apache.camel.karavan.cache.KaravanCacheService;
+import org.apache.camel.karavan.service.KaravanCacheService;
import org.apache.camel.karavan.model.ContainerStatus;
import org.apache.camel.karavan.model.Project;
import org.apache.camel.karavan.docker.DockerService;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ImagesResource.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ImagesResource.java
index 0170918b..69bebd01 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ImagesResource.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ImagesResource.java
@@ -22,8 +22,8 @@ import jakarta.ws.rs.*;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import org.apache.camel.karavan.docker.DockerService;
-import org.apache.camel.karavan.registry.RegistryConfig;
-import org.apache.camel.karavan.registry.RegistryService;
+import org.apache.camel.karavan.model.RegistryConfig;
+import org.apache.camel.karavan.service.RegistryService;
import org.apache.camel.karavan.service.ConfigService;
import org.apache.camel.karavan.service.ProjectService;
import org.jose4j.base64url.Base64;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/InfrastructureResource.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/InfrastructureResource.java
index 832ec968..ff917c59 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/InfrastructureResource.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/InfrastructureResource.java
@@ -20,7 +20,7 @@ import jakarta.inject.Inject;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
-import org.apache.camel.karavan.cache.KaravanCacheService;
+import org.apache.camel.karavan.service.KaravanCacheService;
import org.apache.camel.karavan.model.DeploymentStatus;
import org.apache.camel.karavan.model.ServiceStatus;
import org.apache.camel.karavan.kubernetes.KubernetesService;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/KameletResources.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/KameletResources.java
index 3e1cc8e0..f2090ae0 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/KameletResources.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/KameletResources.java
@@ -21,7 +21,7 @@ import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.MediaType;
-import org.apache.camel.karavan.cache.KaravanCacheService;
+import org.apache.camel.karavan.service.KaravanCacheService;
import org.apache.camel.karavan.model.Project;
import org.apache.camel.karavan.model.ProjectFile;
import org.apache.camel.karavan.code.CodeService;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ProjectFileResource.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ProjectFileResource.java
index aa513cbb..994e6b60 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ProjectFileResource.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ProjectFileResource.java
@@ -20,7 +20,7 @@ import jakarta.inject.Inject;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.MediaType;
import org.apache.camel.karavan.code.CodeService;
-import org.apache.camel.karavan.cache.KaravanCacheService;
+import org.apache.camel.karavan.service.KaravanCacheService;
import org.apache.camel.karavan.model.Project;
import org.apache.camel.karavan.model.ProjectFile;
import org.apache.camel.karavan.validation.project.ProjectFileCreateValidator;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ProjectResource.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ProjectResource.java
index 092745de..9e0e8d71 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ProjectResource.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ProjectResource.java
@@ -21,8 +21,8 @@ import jakarta.ws.rs.*;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import org.apache.camel.karavan.docker.DockerService;
-import org.apache.camel.karavan.git.GitService;
-import org.apache.camel.karavan.cache.KaravanCacheService;
+import org.apache.camel.karavan.service.GitService;
+import org.apache.camel.karavan.service.KaravanCacheService;
import org.apache.camel.karavan.model.CamelStatus;
import org.apache.camel.karavan.model.CamelStatusValue;
import org.apache.camel.karavan.model.ContainerStatus;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/StatusResource.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/StatusResource.java
index 4d40b350..f1bc1ad9 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/StatusResource.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/StatusResource.java
@@ -20,7 +20,7 @@ import jakarta.inject.Inject;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
-import org.apache.camel.karavan.cache.KaravanCacheService;
+import org.apache.camel.karavan.service.KaravanCacheService;
import org.apache.camel.karavan.model.CamelStatus;
import org.apache.camel.karavan.model.CamelStatusValue;
import org.apache.camel.karavan.model.DeploymentStatus;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/code/CodeService.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/code/CodeService.java
index eece054f..89e5298d 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/code/CodeService.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/code/CodeService.java
@@ -34,9 +34,9 @@ import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.karavan.api.KameletResources;
import org.apache.camel.karavan.model.DockerComposeService;
import org.apache.camel.karavan.docker.DockerService;
-import org.apache.camel.karavan.git.model.GitRepo;
-import org.apache.camel.karavan.git.model.GitRepoFile;
-import org.apache.camel.karavan.cache.KaravanCacheService;
+import org.apache.camel.karavan.model.GitRepo;
+import org.apache.camel.karavan.model.GitRepoFile;
+import org.apache.camel.karavan.service.KaravanCacheService;
import org.apache.camel.karavan.model.Project;
import org.apache.camel.karavan.model.ProjectFile;
import org.apache.camel.karavan.kubernetes.KubernetesService;
@@ -344,11 +344,6 @@ public class CodeService {
}
- public DockerComposeService getInternalDockerComposeService (String name) {
- String composeText = getResourceFile("/services/internal.yaml");
- return DockerComposeConverter.fromCode(composeText, name);
- }
-
public DockerComposeService getDockerComposeService(String projectId) {
ProjectFile compose = karavanCacheService.getProjectFile(projectId,
PROJECT_COMPOSE_FILENAME);
if (compose != null) {
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerEventListener.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerEventListener.java
index 83ce5094..bf37bd5a 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerEventListener.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerEventListener.java
@@ -24,7 +24,7 @@ import com.github.dockerjava.api.model.EventType;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import org.apache.camel.karavan.model.ContainerStatus;
-import org.apache.camel.karavan.registry.RegistryService;
+import org.apache.camel.karavan.service.RegistryService;
import org.jboss.logging.Logger;
import java.io.Closeable;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerForGitea.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerForGitea.java
deleted file mode 100644
index ba8be1ed..00000000
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerForGitea.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.karavan.docker;
-
-import com.github.dockerjava.api.command.ExecCreateCmdResponse;
-import com.github.dockerjava.api.model.Container;
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-import org.apache.camel.karavan.code.CodeService;
-import org.apache.camel.karavan.git.GitService;
-import org.apache.camel.karavan.git.model.GitConfig;
-import org.apache.camel.karavan.model.ContainerStatus;
-import org.jboss.logging.Logger;
-
-@ApplicationScoped
-public class DockerForGitea {
-
- private static final Logger LOGGER =
Logger.getLogger(DockerForGitea.class.getName());
-
- protected static final String GITEA_CONTAINER_NAME = "gitea";
-
- @Inject
- DockerService dockerService;
-
- @Inject
- GitService gitService;
-
- @Inject
- CodeService codeService;
-
- public void startGitea() {
- try {
- LOGGER.info("Gitea container is starting...");
- var compose =
codeService.getInternalDockerComposeService(GITEA_CONTAINER_NAME);
- Container c = dockerService.createContainerFromCompose(compose,
ContainerStatus.ContainerType.internal, false);
- dockerService.runContainer(GITEA_CONTAINER_NAME);
- LOGGER.info("Gitea container is started");
- } catch (Exception e) {
- LOGGER.error(e.getMessage());
- }
- }
-
- public void createGiteaUser() {
- try {
- LOGGER.info("Creating Gitea User");
- GitConfig config = gitService.getGitConfig();
- Container gitea =
dockerService.getContainerByName(GITEA_CONTAINER_NAME);
- ExecCreateCmdResponse user =
dockerService.execCreate(gitea.getId(),
- "/app/gitea/gitea", "admin", "user", "create",
- "--config", "/etc/gitea/app.ini",
- "--username", config.getUsername(),
- "--password", config.getPassword(),
- "--email", config.getUsername() + "@karavan.space",
- "--admin");
- dockerService.execStart(user.getId(), new LoggerCallback());
- LOGGER.info("Created Gitea User");
- } catch (Exception e) {
- LOGGER.error(e.getMessage());
- }
- }
-}
\ No newline at end of file
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerForRegistry.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerForRegistry.java
deleted file mode 100644
index d395582e..00000000
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerForRegistry.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.karavan.docker;
-
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-import org.apache.camel.karavan.code.CodeService;
-import org.apache.camel.karavan.model.ContainerStatus;
-import org.jboss.logging.Logger;
-
-@ApplicationScoped
-public class DockerForRegistry {
-
- private static final Logger LOGGER =
Logger.getLogger(DockerForRegistry.class.getName());
-
- protected static final String REGISTRY_CONTAINER_NAME = "registry";
-
- @Inject
- DockerService dockerService;
-
- @Inject
- CodeService codeService;
-
- public void startRegistry() {
- try {
- LOGGER.info("Registry is starting...");
- var compose =
codeService.getInternalDockerComposeService(REGISTRY_CONTAINER_NAME);
- dockerService.createContainerFromCompose(compose,
ContainerStatus.ContainerType.internal, false);
- dockerService.runContainer(REGISTRY_CONTAINER_NAME);
- LOGGER.info("Registry is started");
- } catch (Exception e) {
- LOGGER.error(e.getCause().getMessage());
- }
- }
-}
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/git/GiteaService.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/git/GiteaService.java
deleted file mode 100644
index 8c7b281a..00000000
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/git/GiteaService.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.karavan.git;
-
-import io.vertx.core.json.JsonObject;
-import io.vertx.mutiny.core.Vertx;
-import io.vertx.mutiny.core.buffer.Buffer;
-import io.vertx.mutiny.ext.web.client.HttpResponse;
-import io.vertx.mutiny.ext.web.client.WebClient;
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.inject.Inject;
-import org.apache.camel.karavan.git.model.GitConfig;
-import org.apache.camel.karavan.service.ConfigService;
-import org.eclipse.microprofile.faulttolerance.Retry;
-import org.jboss.logging.Logger;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.List;
-import java.util.Map;
-
-@ApplicationScoped
-public class GiteaService {
-
- private static final Logger LOGGER =
Logger.getLogger(GiteaService.class.getName());
-
- @Inject
- Vertx vertx;
-
- @Inject
- GitService gitService;
-
- String token;
-
- WebClient webClient;
-
- private WebClient getWebClient() {
- if (webClient == null) {
- webClient = WebClient.create(vertx);
- }
- return webClient;
- }
-
- @Retry(maxRetries = 100, delay = 2000)
- public void install() throws Exception {
- LOGGER.info("Install Gitea");
- HttpResponse<Buffer> result =
getWebClient().postAbs(getGiteaBaseUrl()).timeout(1000)
- .putHeader("Content-Type", "application/x-www-form-urlencoded")
- .sendBuffer(Buffer.buffer(
-
"db_type=sqlite3&db_host=localhost%3A3306&db_user=root&db_passwd=&db_name=gitea"
+
-
"&ssl_mode=disable&db_schema=&db_path=%2Fvar%2Flib%2Fgitea%2Fdata%2Fgitea.db&app_name=Karavan"
+
-
"&repo_root_path=%2Fvar%2Flib%2Fgitea%2Fgit%2Frepositories&lfs_root_path=%2Fvar%2Flib%2Fgitea%2Fgit%2Flfs&run_user=git"
+
-
"&domain=localhost&ssh_port=2222&http_port=3000&app_url=http%3A%2F%2Flocalhost%3A3000%2F&log_root_path=%2Fvar%2Flib%2Fgitea%2Fdata%2Flog"
+
-
"&smtp_addr=&smtp_port=&smtp_from=&smtp_user=&smtp_passwd=&enable_federated_avatar=on&enable_open_id_sign_in=on"
+
-
"&enable_open_id_sign_up=on&default_allow_create_organization=on&default_enable_timetracking=on"
+
-
"&no_reply_address=noreply.localhost&password_algorithm=pbkdf2&admin_name=&admin_email=&admin_passwd=&admin_confirm_passwd="
- ))
- .subscribeAsCompletionStage().toCompletableFuture().get();
- if (result.statusCode() != 200 && result.statusCode() != 405) {
- LOGGER.info("Gitea not ready");
- throw new Exception("Gitea not ready");
- }
- LOGGER.info("Installed Gitea");
- }
-
- @Retry(maxRetries = 100, delay = 2000)
- public void createRepository() throws Exception {
- LOGGER.info("Creating Gitea Repository");
- String token = generateToken();
- HttpResponse<Buffer> result = getWebClient().postAbs(getGiteaBaseUrl()
+ "/api/v1/user/repos").timeout(500)
- .putHeader("Content-Type", "application/json")
- .bearerTokenAuthentication(token)
- .sendJsonObject(new JsonObject(Map.of(
- "auto_init", true,
- "default_branch", "main",
- "description", "karavan",
- "name", "karavan",
- "private", true
- )))
- .subscribeAsCompletionStage().toCompletableFuture().get();
- if (result.statusCode() == 409 &&
result.bodyAsJsonObject().getString("message").contains("already exists")) {
- JsonObject res = result.bodyAsJsonObject();
- deleteToken("karavan");
- } else if (result.statusCode() == 201) {
- JsonObject res = result.bodyAsJsonObject();
- deleteToken("karavan");
- } else {
- LOGGER.info("Error creating Gitea repository");
- throw new Exception("Error creating Gitea repository");
- }
- LOGGER.info("Created Gitea Repository");
- }
-
- @Retry(maxRetries = 100, delay = 2000)
- protected String generateToken() throws Exception {
- if (token != null) {
- return token;
- }
- LOGGER.info("Creating Gitea User Token");
- GitConfig config = gitService.getGitConfig();
- String uri = getGiteaBaseUrl() + "/api/v1/users/" +
config.getUsername() + "/tokens";
- HttpResponse<Buffer> result = getWebClient().postAbs(uri).timeout(500)
- .putHeader("Content-Type", "application/json")
- .putHeader("accept", "application/json")
- .basicAuthentication(config.getUsername(),
config.getPassword())
- .sendJsonObject(new JsonObject(
- Map.of("name", "karavan", "scopes",
List.of("write:repository", "write:user")))
- ).subscribeAsCompletionStage().toCompletableFuture().get();
- if (result.statusCode() == 400) {
- JsonObject res = result.bodyAsJsonObject();
- return res.getString("sha1");
- } else if (result.statusCode() == 201) {
- JsonObject res = result.bodyAsJsonObject();
- token = res.getString("sha1");
- LOGGER.info("Gitea User Token received");
- return token;
- } else {
- LOGGER.info("Error getting token");
- throw new Exception("Error getting token");
- }
- }
-
- protected void deleteToken(String token) throws Exception {
- LOGGER.info("Deleting Gitea User Token");
- GitConfig config = gitService.getGitConfig();
- HttpResponse<Buffer> result = getWebClient()
- .deleteAbs(getGiteaBaseUrl() + "/api/v1/users/" +
config.getUsername() + "/tokens/" + token)
- .timeout(500)
- .putHeader("Content-Type", "application/json")
- .putHeader("accept", "application/json")
- .basicAuthentication(config.getUsername(),
config.getPassword())
-
.send().subscribeAsCompletionStage().toCompletableFuture().get();
- if (result.statusCode() == 204) {
- LOGGER.info("Deleted Gitea User Token");
- }
- }
-
- private String getGiteaBaseUrl() throws MalformedURLException {
- if (ConfigService.inDocker()) {
- return "http://gitea:3000";;
- } else if (ConfigService.inKubernetes()) {
- String uri = gitService.getGitConfig().getUri();
- URL url = new URL(uri);
- String protocol = url.getProtocol();
- String host = url.getHost();
- int port = url.getPort();
- return protocol + "://" + host + (port > 0 ? ":" + port : "");
- } else {
- return "http://localhost:3000";;
- }
- }
-}
\ No newline at end of file
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/DeploymentEventHandler.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/DeploymentEventHandler.java
index ee8335f6..ff3bab61 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/DeploymentEventHandler.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/DeploymentEventHandler.java
@@ -19,7 +19,7 @@ package org.apache.camel.karavan.kubernetes;
import io.fabric8.kubernetes.api.model.apps.Deployment;
import io.fabric8.kubernetes.client.informers.ResourceEventHandler;
-import org.apache.camel.karavan.cache.KaravanCacheService;
+import org.apache.camel.karavan.service.KaravanCacheService;
import org.apache.camel.karavan.model.DeploymentStatus;
import org.jboss.logging.Logger;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesService.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesService.java
index b2d109cd..be2c8f97 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesService.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesService.java
@@ -33,7 +33,7 @@ import jakarta.enterprise.inject.Default;
import jakarta.enterprise.inject.Produces;
import jakarta.inject.Inject;
import org.apache.camel.karavan.code.CodeService;
-import org.apache.camel.karavan.cache.KaravanCacheService;
+import org.apache.camel.karavan.service.KaravanCacheService;
import org.apache.camel.karavan.model.ContainerStatus;
import org.apache.camel.karavan.model.Project;
import org.apache.camel.karavan.service.ConfigService;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/PodEventHandler.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/PodEventHandler.java
index c4464378..c59a3eb1 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/PodEventHandler.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/PodEventHandler.java
@@ -24,7 +24,7 @@ import io.fabric8.kubernetes.api.model.ResourceRequirements;
import io.fabric8.kubernetes.client.informers.ResourceEventHandler;
import io.vertx.core.json.JsonObject;
import io.vertx.mutiny.core.eventbus.EventBus;
-import org.apache.camel.karavan.cache.KaravanCacheService;
+import org.apache.camel.karavan.service.KaravanCacheService;
import org.apache.camel.karavan.model.ContainerStatus;
import org.jboss.logging.Logger;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/ServiceEventHandler.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/ServiceEventHandler.java
index 1da82323..29dea468 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/ServiceEventHandler.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/ServiceEventHandler.java
@@ -19,7 +19,7 @@ package org.apache.camel.karavan.kubernetes;
import io.fabric8.kubernetes.api.model.Service;
import io.fabric8.kubernetes.client.informers.ResourceEventHandler;
-import org.apache.camel.karavan.cache.KaravanCacheService;
+import org.apache.camel.karavan.service.KaravanCacheService;
import org.apache.camel.karavan.model.ServiceStatus;
import org.jboss.logging.Logger;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/git/model/GitConfig.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/GitConfig.java
similarity index 97%
rename from
karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/git/model/GitConfig.java
rename to
karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/GitConfig.java
index a4ffee00..a60ac642 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/git/model/GitConfig.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/GitConfig.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.camel.karavan.git.model;
+package org.apache.camel.karavan.model;
public class GitConfig {
private String uri;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/git/model/GitRepo.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/GitRepo.java
similarity index 97%
rename from
karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/git/model/GitRepo.java
rename to
karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/GitRepo.java
index bf0b650f..ec765318 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/git/model/GitRepo.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/GitRepo.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.camel.karavan.git.model;
+package org.apache.camel.karavan.model;
import java.util.List;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/git/model/GitRepoFile.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/GitRepoFile.java
similarity index 97%
rename from
karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/git/model/GitRepoFile.java
rename to
karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/GitRepoFile.java
index 6925269b..83c7fec6 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/git/model/GitRepoFile.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/GitRepoFile.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.camel.karavan.git.model;
+package org.apache.camel.karavan.model;
public class GitRepoFile {
private String name;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/registry/RegistryConfig.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/RegistryConfig.java
similarity index 97%
rename from
karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/registry/RegistryConfig.java
rename to
karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/RegistryConfig.java
index 2c3e06c8..57e1a417 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/registry/RegistryConfig.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/model/RegistryConfig.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.camel.karavan.registry;
+package org.apache.camel.karavan.model;
public class RegistryConfig {
private String registry;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/CamelService.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/CamelService.java
index aba29489..af2f6e34 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/CamelService.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/CamelService.java
@@ -26,7 +26,6 @@ import io.vertx.mutiny.ext.web.client.HttpResponse;
import io.vertx.mutiny.ext.web.client.WebClient;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
-import org.apache.camel.karavan.cache.KaravanCacheService;
import org.apache.camel.karavan.model.CamelStatus;
import org.apache.camel.karavan.model.CamelStatusValue;
import org.apache.camel.karavan.model.ContainerStatus;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/ContainerStatusService.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/ContainerStatusService.java
index 2de708ad..69d52e6c 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/ContainerStatusService.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/ContainerStatusService.java
@@ -23,7 +23,6 @@ import io.vertx.core.eventbus.EventBus;
import io.vertx.core.json.JsonObject;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
-import org.apache.camel.karavan.cache.KaravanCacheService;
import org.apache.camel.karavan.model.ContainerStatus;
import org.apache.camel.karavan.docker.DockerService;
import org.eclipse.microprofile.config.inject.ConfigProperty;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/git/GitService.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/GitService.java
similarity index 92%
rename from
karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/git/GitService.java
rename to
karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/GitService.java
index b2fff8cd..c949c345 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/git/GitService.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/GitService.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.karavan.git;
+package org.apache.camel.karavan.service;
import com.jcraft.jsch.JSch;
import com.jcraft.jsch.JSchException;
@@ -24,12 +24,11 @@ import io.smallrye.mutiny.tuples.Tuple2;
import io.vertx.core.Vertx;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
-import org.apache.camel.karavan.git.model.GitConfig;
-import org.apache.camel.karavan.git.model.GitRepo;
-import org.apache.camel.karavan.git.model.GitRepoFile;
+import org.apache.camel.karavan.model.GitConfig;
+import org.apache.camel.karavan.model.GitRepo;
+import org.apache.camel.karavan.model.GitRepoFile;
import org.apache.camel.karavan.model.Project;
import org.apache.camel.karavan.model.ProjectFile;
-import org.apache.camel.karavan.service.ConfigService;
import org.eclipse.jgit.api.*;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.api.errors.InvalidRemoteException;
@@ -44,7 +43,6 @@ import
org.eclipse.jgit.transport.ssh.jsch.JschConfigSessionFactory;
import org.eclipse.jgit.treewalk.TreeWalk;
import org.eclipse.jgit.treewalk.filter.TreeFilter;
import org.eclipse.microprofile.config.inject.ConfigProperty;
-import org.eclipse.microprofile.faulttolerance.Retry;
import org.jboss.logging.Logger;
import java.io.File;
@@ -76,9 +74,6 @@ public class GitService {
@ConfigProperty(name = "karavan.known-hosts-path")
Optional<String> knownHostsPath;
- @ConfigProperty(name = "karavan.git-install-gitea")
- boolean installGitea;
-
@Inject
Vertx vertx;
@@ -103,14 +98,7 @@ public class GitService {
}
public GitConfig getGitConfig() {
- if (ConfigService.inKubernetes() || ConfigService.inDocker()) {
- return new GitConfig(repository, username.orElse(null),
password.orElse(null), branch, privateKeyPath.orElse(null));
- } else {
- String uri = installGitea
- ? "http://localhost:3000/karavan/karavan.git";
- : repository;
- return new GitConfig(uri, username.orElse(null),
password.orElse(null), branch, privateKeyPath.orElse(null));
- }
+ return new GitConfig(repository, username.orElse(null),
password.orElse(null), branch, privateKeyPath.orElse(null));
}
public List<String> getEnvForBuild() {
@@ -212,21 +200,6 @@ public class GitService {
return git;
}
- private List<Tuple2<String, String>> readKameletsFromFolder(String folder)
{
- LOGGER.info("Read kamelets from " + folder);
- List<Tuple2<String, String>> kamelets = new ArrayList<>();
- vertx.fileSystem().readDirBlocking(folder).stream().filter(f ->
f.endsWith("kamelet.yaml")).forEach(f -> {
- Path path = Paths.get(f);
- try {
- String yaml = Files.readString(path);
- kamelets.add(Tuple2.of(path.getFileName().toString(), yaml));
- } catch (IOException e) {
- LOGGER.error("Error during file read", e);
- }
- });
- return kamelets;
- }
-
private List<String> readProjectsFromFolder(String folder, String...
filter) {
LOGGER.info("Read projects from " + folder);
List<String> files = new ArrayList<>();
@@ -445,7 +418,6 @@ public class GitService {
return files;
}
- @Retry(maxRetries = 100, delay = 2000)
public boolean checkGit() throws Exception {
LOGGER.info("Check git");
GitConfig gitConfig = getGitConfig();
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/cache/KaravanCacheService.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/KaravanCacheService.java
similarity index 99%
rename from
karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/cache/KaravanCacheService.java
rename to
karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/KaravanCacheService.java
index 46367d5e..60960238 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/cache/KaravanCacheService.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/KaravanCacheService.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.karavan.cache;
+package org.apache.camel.karavan.service;
import com.hazelcast.config.ClasspathYamlConfig;
import com.hazelcast.config.Config;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/KaravanService.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/KaravanService.java
index fe2df760..39f576e4 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/KaravanService.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/KaravanService.java
@@ -25,13 +25,8 @@ import io.vertx.core.eventbus.EventBus;
import jakarta.enterprise.event.Observes;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
-import org.apache.camel.karavan.cache.KaravanCacheService;
-import org.apache.camel.karavan.docker.DockerForGitea;
-import org.apache.camel.karavan.docker.DockerForRegistry;
import org.apache.camel.karavan.docker.DockerService;
-import org.apache.camel.karavan.git.GiteaService;
import org.apache.camel.karavan.kubernetes.KubernetesService;
-import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.eclipse.microprofile.health.HealthCheck;
import org.eclipse.microprofile.health.HealthCheckResponse;
import org.eclipse.microprofile.health.Liveness;
@@ -46,30 +41,15 @@ public class KaravanService implements HealthCheck {
private static final Logger LOGGER =
Logger.getLogger(KaravanService.class.getName());
- @ConfigProperty(name = "karavan.git-install-gitea")
- boolean giteaInstall;
-
- @ConfigProperty(name = "karavan.image-registry-install")
- boolean registryInstall;
-
@Inject
KubernetesService kubernetesService;
@Inject
DockerService dockerService;
- @Inject
- DockerForGitea dockerForGitea;
-
- @Inject
- DockerForRegistry dockerForRegistry;
-
@Inject
EventBus eventBus;
- @Inject
- GiteaService giteaService;
-
@Inject
ProjectService projectService;
@@ -99,25 +79,12 @@ public class KaravanService implements HealthCheck {
} else {
dockerService.createNetwork();
dockerService.startListeners();
-
- if (giteaInstall) {
- dockerForGitea.startGitea();
- giteaService.install();
- dockerForGitea.createGiteaUser();
- giteaService.createRepository();
- }
- if (registryInstall) {
- dockerForRegistry.startRegistry();
- }
}
}
@ConsumeEvent(value = START_KUBERNETES_SERVICES, blocking = true)
void startKubernetesServices(String data) throws Exception {
LOGGER.info("Starting Karavan in Kubernetes");
- if (giteaInstall) {
- giteaService.createRepository();
- }
kubernetesService.startInformers(null);
}
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/ProjectService.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/ProjectService.java
index 961d33e4..594e9f46 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/ProjectService.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/ProjectService.java
@@ -23,7 +23,6 @@ import io.vertx.mutiny.core.eventbus.EventBus;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.inject.Default;
import jakarta.inject.Inject;
-import org.apache.camel.karavan.cache.KaravanCacheService;
import org.apache.camel.karavan.model.ContainerStatus;
import org.apache.camel.karavan.model.GroupedKey;
import org.apache.camel.karavan.model.Project;
@@ -32,17 +31,14 @@ import org.apache.camel.karavan.code.CodeService;
import org.apache.camel.karavan.code.DockerComposeConverter;
import org.apache.camel.karavan.model.DockerComposeService;
import org.apache.camel.karavan.docker.DockerForKaravan;
-import org.apache.camel.karavan.git.GitService;
-import org.apache.camel.karavan.git.model.GitRepo;
+import org.apache.camel.karavan.model.GitRepo;
import org.apache.camel.karavan.kubernetes.KubernetesService;
-import org.apache.camel.karavan.registry.RegistryService;
import org.apache.camel.karavan.shared.Constants;
import org.apache.camel.karavan.shared.Property;
import org.apache.camel.karavan.validation.project.ProjectModifyValidator;
import org.apache.commons.lang3.StringUtils;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.microprofile.config.inject.ConfigProperty;
-import org.eclipse.microprofile.faulttolerance.Retry;
import org.eclipse.microprofile.health.HealthCheck;
import org.eclipse.microprofile.health.HealthCheckResponse;
import org.eclipse.microprofile.health.Readiness;
@@ -53,7 +49,7 @@ import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
-import static
org.apache.camel.karavan.cache.KaravanCacheService.DEFAULT_ENVIRONMENT;
+import static
org.apache.camel.karavan.service.KaravanCacheService.DEFAULT_ENVIRONMENT;
import static org.apache.camel.karavan.code.CodeService.*;
import static
org.apache.camel.karavan.shared.Constants.NOTIFICATION_EVENT_COMMIT;
@@ -275,7 +271,6 @@ public class ProjectService implements HealthCheck {
return codeService.getProjectPort(projectId);
}
- @Retry(maxRetries = 100, delay = 2000)
public void tryStart() throws Exception {
if (karavanCacheService.isReady() && gitService.checkGit()) {
if (karavanCacheService.getProjects().isEmpty()) {
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/registry/RegistryService.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/RegistryService.java
similarity index 94%
rename from
karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/registry/RegistryService.java
rename to
karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/RegistryService.java
index ae6ff3a2..8fd76bf8 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/registry/RegistryService.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/service/RegistryService.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.karavan.registry;
+package org.apache.camel.karavan.service;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import org.apache.camel.karavan.kubernetes.KubernetesService;
-import org.apache.camel.karavan.service.ConfigService;
+import org.apache.camel.karavan.model.RegistryConfig;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.jboss.logging.Logger;
@@ -32,8 +32,6 @@ public class RegistryService {
private static final Logger LOGGER =
Logger.getLogger(RegistryService.class.getName());
- @ConfigProperty(name = "karavan.image-registry-install")
- boolean installRegistry;
@ConfigProperty(name = "karavan.image-registry")
String registry;
@ConfigProperty(name = "karavan.image-group")
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/validation/project/ProjectFileCreateValidator.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/validation/project/ProjectFileCreateValidator.java
index 093e2715..0cc12533 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/validation/project/ProjectFileCreateValidator.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/validation/project/ProjectFileCreateValidator.java
@@ -2,7 +2,7 @@ package org.apache.camel.karavan.validation.project;
import java.util.List;
-import org.apache.camel.karavan.cache.KaravanCacheService;
+import org.apache.camel.karavan.service.KaravanCacheService;
import org.apache.camel.karavan.model.ProjectFile;
import org.apache.camel.karavan.shared.validation.SimpleValidator;
import org.apache.camel.karavan.shared.validation.ValidationError;
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/validation/project/ProjectModifyValidator.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/validation/project/ProjectModifyValidator.java
index 038645af..166f491e 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/validation/project/ProjectModifyValidator.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/validation/project/ProjectModifyValidator.java
@@ -2,7 +2,7 @@ package org.apache.camel.karavan.validation.project;
import java.util.List;
-import org.apache.camel.karavan.cache.KaravanCacheService;
+import org.apache.camel.karavan.service.KaravanCacheService;
import org.apache.camel.karavan.model.Project;
import org.apache.camel.karavan.shared.validation.SimpleValidator;
import org.apache.camel.karavan.shared.validation.ValidationError;
diff --git a/karavan-web/karavan-app/src/main/resources/application.properties
b/karavan-web/karavan-app/src/main/resources/application.properties
index 0a6457e1..56ddbf0e 100644
--- a/karavan-web/karavan-app/src/main/resources/application.properties
+++ b/karavan-web/karavan-app/src/main/resources/application.properties
@@ -47,7 +47,6 @@ karavan.git-repository=http://gitea:3000/karavan/karavan.git
karavan.git-username=karavan
karavan.git-password=karavan
karavan.git-branch=main
-karavan.git-install-gitea=false
karavan.private-key-path=
karavan.known-hosts-path=
@@ -57,23 +56,6 @@ karavan.image-registry=registry:5000
karavan.image-group=karavan
karavan.image-registry-username=
karavan.image-registry-password=
-karavan.image-registry-install=false
-
-# Public Dev
-%dev.karavan.auth=public
-%dev.quarkus.oidc.enabled=false
-%dev.quarkus.http.auth.basic=false
-%dev.quarkus.security.users.embedded.enabled=false
-%dev.quarkus.http.auth.permission.authenticated.enabled=false
-%dev.quarkus.http.auth.permission.public.enabled=false
-
-# Public Test
-%test.karavan.auth=public
-%test.quarkus.oidc.enabled=false
-%test.quarkus.http.auth.basic=false
-%test.quarkus.security.users.embedded.enabled=false
-%test.quarkus.http.auth.permission.authenticated.enabled=false
-%test.quarkus.http.auth.permission.public.enabled=false
# Public
%public.karavan.auth=public
@@ -124,7 +106,7 @@ quarkus.kubernetes-client.connection-timeout=2000
quarkus.kubernetes-client.request-timeout=10000
quarkus.kubernetes-client.devservices.enabled=false
-quarkus.swagger-ui.always-include=true
+%public.quarkus.swagger-ui.always-include=true
quarkus.quinoa.ci=false
quarkus.quinoa.package-manager-install=false
