This is an automated email from the ASF dual-hosted git repository.
marat pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
from e4a9d77d Fix #1297
new d7d82f32 Karavan status service
new ca733a41 Status service that works
new dc1b853c Modules
new 5c125d8e Modules
new 6587a7e9 Fix #1299
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/app-oidc.yml | 12 +
.github/workflows/app.yml | 12 +
karavan-app/pom.xml | 28 +-
.../karavan/{service => }/KaravanService.java | 50 +--
.../karavan/{service => }/RegistryService.java | 17 +-
.../org/apache/camel/karavan/api/AuthResource.java | 27 +-
.../apache/camel/karavan/api/BuildResource.java | 16 +-
.../camel/karavan/api/ComponentResources.java | 2 +-
.../camel/karavan/api/ConfigurationResource.java | 8 +-
.../camel/karavan/api/ContainerResource.java | 134 +++---
.../apache/camel/karavan/api/DevModeResource.java | 56 ++-
.../apache/camel/karavan/api/ImagesResource.java | 16 +-
.../camel/karavan/api/InfrastructureResource.java | 73 ++--
.../apache/camel/karavan/api/KameletResources.java | 25 +-
.../apache/camel/karavan/api/LogWatchResource.java | 21 +-
.../camel/karavan/api/NotificationResource.java | 2 +-
.../camel/karavan/api/ProjectFileResource.java | 22 +-
.../camel/karavan/api/ProjectGitResource.java | 6 +-
.../apache/camel/karavan/api/ProjectResource.java | 52 ++-
.../apache/camel/karavan/api/StatusResource.java | 50 +--
.../apache/camel/karavan/manager/CamelManager.java | 165 ++++++++
.../ManagerConstants.java} | 35 +-
.../NotificationManager.java} | 11 +-
.../camel/karavan/manager/ProjectManager.java | 133 ++++++
.../{ => manager}/docker/DockerEventListener.java | 14 +-
.../{ => manager}/docker/DockerForKaravan.java | 34 +-
.../docker/DockerLogCallback.java} | 6 +-
.../docker/DockerManager.java} | 157 ++-----
.../docker/DockerPullCallback.java} | 6 +-
.../camel/karavan/manager/docker/DockerUtils.java | 92 ++++
.../kubernetes/KubernetesManager.java} | 90 +---
.../apache/camel/karavan/service/CamelService.java | 261 ------------
.../karavan/service/ContainerStatusService.java | 149 -------
.../camel/karavan/service/ProjectService.java | 468 ---------------------
.../.mvn/wrapper/maven-wrapper.properties | 0
{karavan-app => karavan-projects}/mvnw | 0
{karavan-app => karavan-projects}/mvnw.cmd | 0
{karavan-app => karavan-projects}/pom.xml | 121 +-----
.../apache/camel/karavan/project}/CodeService.java | 85 ++--
.../karavan/project}/DockerComposeConverter.java | 6 +-
.../apache/camel/karavan/project}/GitService.java | 6 +-
.../camel/karavan/project/ProjectEvents.java | 15 +-
.../camel/karavan/project/ProjectService.java | 277 ++++++++++++
.../camel/karavan/project/ProjectStarter.java | 192 +++++++++
.../camel/karavan/project/ProjectsCache.java | 87 ++++
.../karavan/project}/model/DockerCompose.java | 2 +-
.../project}/model/DockerComposeHealthCheck.java | 2 +-
.../project}/model/DockerComposeNetwork.java | 2 +-
.../project}/model/DockerComposeService.java | 2 +-
.../camel/karavan/project}/model/GitConfig.java | 2 +-
.../camel/karavan/project}/model/GitRepo.java | 2 +-
.../camel/karavan/project}/model/GitRepoFile.java | 2 +-
.../camel/karavan/project}/model/GroupedKey.java | 10 +-
.../camel/karavan/project}/model/Project.java | 10 +-
.../camel/karavan/project}/model/ProjectFile.java | 10 +-
.../karavan/project}/model/RegistryConfig.java | 2 +-
.../src/main/resources/services/devservices.yaml | 0
.../resources/templates/builder-env.properties | 0
.../resources/templates/components-blocklist.txt | 0
.../main/resources/templates/configmap.jkube.yaml | 0
.../templates/database-bean-template.camel.yaml | 0
.../main/resources/templates/deployment.jkube.yaml | 0
.../templates/docker-application.properties | 0
.../src/main/resources/templates/docker-build.sh | 0
.../main/resources/templates/docker-compose.yaml | 0
.../main/resources/templates/ingress.jkube.yaml | 0
.../resources/templates/kamelets-blocklist.txt | 0
.../templates/kubernetes-application.properties | 2 -
.../main/resources/templates/kubernetes-build.sh | 0
.../templates/messaging-bean-template.camel.yaml | 0
.../templates/openshift-application.properties | 1 -
.../main/resources/templates/openshift-build.sh | 0
.../org.apache.camel.AggregationStrategy.java | 0
.../templates/org.apache.camel.Processor.java | 0
.../main/resources/templates/service.jkube.yaml | 0
.../.mvn/wrapper/maven-wrapper.properties | 0
{karavan-app => karavan-status}/mvnw | 0
{karavan-app => karavan-status}/mvnw.cmd | 0
{karavan-app => karavan-status}/pom.xml | 116 +----
.../camel/karavan/config}/ConfigService.java | 3 +-
.../camel/karavan/config}/Configuration.java | 2 +-
.../camel/karavan/status/CamelStatusListener.java | 126 ++++++
.../camel/karavan/status/CamelStatusService.java | 62 +++
.../karavan/status/ContainerStatusListener.java | 121 ++++++
.../apache/camel/karavan/status/StatusCache.java | 95 +----
.../camel/karavan/status/StatusConstants.java | 28 +-
.../apache/camel/karavan/status/StatusEvents.java | 27 +-
.../apache/camel/karavan/status/StatusService.java | 51 +--
.../camel/karavan/status/docker/DockerAPI.java | 102 +++++
.../karavan/status/docker/DockerStatusService.java | 59 +++
.../camel/karavan/status/docker/DockerUtils.java | 95 +----
.../status}/kubernetes/DeploymentEventHandler.java | 38 +-
.../kubernetes/DeploymentStatusListener.java | 47 +++
.../status/kubernetes/KubernetesStatusService.java | 150 +++++++
.../status}/kubernetes/PodEventHandler.java | 45 +-
.../status}/kubernetes/ServiceEventHandler.java | 37 +-
.../status/kubernetes/ServiceStatusListener.java | 35 +-
.../camel/karavan/status}/model/CamelStatus.java | 10 +-
.../karavan/status/model/CamelStatusRequest.java | 40 +-
.../karavan/status}/model/CamelStatusValue.java | 10 +-
.../camel/karavan/status}/model/ContainerPort.java | 10 +-
.../karavan/status}/model/ContainerStatus.java | 9 +-
.../karavan/status}/model/DeploymentStatus.java | 12 +-
.../camel/karavan/status}/model/GroupedKey.java | 10 +-
.../camel/karavan/status}/model/ServiceStatus.java | 9 +-
pom.xml | 15 +
106 files changed, 2232 insertions(+), 2220 deletions(-)
copy karavan-app/src/main/java/org/apache/camel/karavan/{service =>
}/KaravanService.java (51%)
rename karavan-app/src/main/java/org/apache/camel/karavan/{service =>
}/RegistryService.java (85%)
create mode 100644
karavan-app/src/main/java/org/apache/camel/karavan/manager/CamelManager.java
copy karavan-app/src/main/java/org/apache/camel/karavan/{shared/Constants.java
=> manager/ManagerConstants.java} (58%)
rename
karavan-app/src/main/java/org/apache/camel/karavan/{service/NotificationService.java
=> manager/NotificationManager.java} (84%)
create mode 100644
karavan-app/src/main/java/org/apache/camel/karavan/manager/ProjectManager.java
rename karavan-app/src/main/java/org/apache/camel/karavan/{ =>
manager}/docker/DockerEventListener.java (88%)
rename karavan-app/src/main/java/org/apache/camel/karavan/{ =>
manager}/docker/DockerForKaravan.java (80%)
rename
karavan-app/src/main/java/org/apache/camel/karavan/{docker/LogCallback.java =>
manager/docker/DockerLogCallback.java} (86%)
rename
karavan-app/src/main/java/org/apache/camel/karavan/{docker/DockerService.java
=> manager/docker/DockerManager.java} (73%)
rename
karavan-app/src/main/java/org/apache/camel/karavan/{docker/PullCallback.java =>
manager/docker/DockerPullCallback.java} (90%)
create mode 100644
karavan-app/src/main/java/org/apache/camel/karavan/manager/docker/DockerUtils.java
rename
karavan-app/src/main/java/org/apache/camel/karavan/{kubernetes/KubernetesService.java
=> manager/kubernetes/KubernetesManager.java} (87%)
delete mode 100644
karavan-app/src/main/java/org/apache/camel/karavan/service/CamelService.java
delete mode 100644
karavan-app/src/main/java/org/apache/camel/karavan/service/ContainerStatusService.java
delete mode 100644
karavan-app/src/main/java/org/apache/camel/karavan/service/ProjectService.java
copy {karavan-app => karavan-projects}/.mvn/wrapper/maven-wrapper.properties
(100%)
copy {karavan-app => karavan-projects}/mvnw (100%)
copy {karavan-app => karavan-projects}/mvnw.cmd (100%)
copy {karavan-app => karavan-projects}/pom.xml (54%)
rename {karavan-app/src/main/java/org/apache/camel/karavan/code =>
karavan-projects/src/main/java/org/apache/camel/karavan/project}/CodeService.java
(83%)
rename {karavan-app/src/main/java/org/apache/camel/karavan/code =>
karavan-projects/src/main/java/org/apache/camel/karavan/project}/DockerComposeConverter.java
(96%)
rename {karavan-app/src/main/java/org/apache/camel/karavan/service =>
karavan-projects/src/main/java/org/apache/camel/karavan/project}/GitService.java
(99%)
copy karavan-app/src/main/webui/src/project/beans/BeanFilesDropdown.css =>
karavan-projects/src/main/java/org/apache/camel/karavan/project/ProjectEvents.java
(74%)
create mode 100644
karavan-projects/src/main/java/org/apache/camel/karavan/project/ProjectService.java
create mode 100644
karavan-projects/src/main/java/org/apache/camel/karavan/project/ProjectStarter.java
create mode 100644
karavan-projects/src/main/java/org/apache/camel/karavan/project/ProjectsCache.java
rename {karavan-app/src/main/java/org/apache/camel/karavan =>
karavan-projects/src/main/java/org/apache/camel/karavan/project}/model/DockerCompose.java
(97%)
rename {karavan-app/src/main/java/org/apache/camel/karavan =>
karavan-projects/src/main/java/org/apache/camel/karavan/project}/model/DockerComposeHealthCheck.java
(97%)
rename {karavan-app/src/main/java/org/apache/camel/karavan =>
karavan-projects/src/main/java/org/apache/camel/karavan/project}/model/DockerComposeNetwork.java
(96%)
rename {karavan-app/src/main/java/org/apache/camel/karavan =>
karavan-projects/src/main/java/org/apache/camel/karavan/project}/model/DockerComposeService.java
(99%)
rename {karavan-app/src/main/java/org/apache/camel/karavan =>
karavan-projects/src/main/java/org/apache/camel/karavan/project}/model/GitConfig.java
(97%)
rename {karavan-app/src/main/java/org/apache/camel/karavan =>
karavan-projects/src/main/java/org/apache/camel/karavan/project}/model/GitRepo.java
(97%)
rename {karavan-app/src/main/java/org/apache/camel/karavan =>
karavan-projects/src/main/java/org/apache/camel/karavan/project}/model/GitRepoFile.java
(97%)
copy {karavan-app/src/main/java/org/apache/camel/karavan =>
karavan-projects/src/main/java/org/apache/camel/karavan/project}/model/GroupedKey.java
(91%)
rename {karavan-app/src/main/java/org/apache/camel/karavan =>
karavan-projects/src/main/java/org/apache/camel/karavan/project}/model/Project.java
(93%)
rename {karavan-app/src/main/java/org/apache/camel/karavan =>
karavan-projects/src/main/java/org/apache/camel/karavan/project}/model/ProjectFile.java
(88%)
rename {karavan-app/src/main/java/org/apache/camel/karavan =>
karavan-projects/src/main/java/org/apache/camel/karavan/project}/model/RegistryConfig.java
(96%)
rename {karavan-app =>
karavan-projects}/src/main/resources/services/devservices.yaml (100%)
rename {karavan-app =>
karavan-projects}/src/main/resources/templates/builder-env.properties (100%)
rename {karavan-app =>
karavan-projects}/src/main/resources/templates/components-blocklist.txt (100%)
rename {karavan-app =>
karavan-projects}/src/main/resources/templates/configmap.jkube.yaml (100%)
rename {karavan-app =>
karavan-projects}/src/main/resources/templates/database-bean-template.camel.yaml
(100%)
rename {karavan-app =>
karavan-projects}/src/main/resources/templates/deployment.jkube.yaml (100%)
rename {karavan-app =>
karavan-projects}/src/main/resources/templates/docker-application.properties
(100%)
rename {karavan-app =>
karavan-projects}/src/main/resources/templates/docker-build.sh (100%)
rename {karavan-app =>
karavan-projects}/src/main/resources/templates/docker-compose.yaml (100%)
rename {karavan-app =>
karavan-projects}/src/main/resources/templates/ingress.jkube.yaml (100%)
rename {karavan-app =>
karavan-projects}/src/main/resources/templates/kamelets-blocklist.txt (100%)
rename {karavan-app =>
karavan-projects}/src/main/resources/templates/kubernetes-application.properties
(93%)
rename {karavan-app =>
karavan-projects}/src/main/resources/templates/kubernetes-build.sh (100%)
rename {karavan-app =>
karavan-projects}/src/main/resources/templates/messaging-bean-template.camel.yaml
(100%)
rename {karavan-app =>
karavan-projects}/src/main/resources/templates/openshift-application.properties
(96%)
rename {karavan-app =>
karavan-projects}/src/main/resources/templates/openshift-build.sh (100%)
rename {karavan-app =>
karavan-projects}/src/main/resources/templates/org.apache.camel.AggregationStrategy.java
(100%)
rename {karavan-app =>
karavan-projects}/src/main/resources/templates/org.apache.camel.Processor.java
(100%)
rename {karavan-app =>
karavan-projects}/src/main/resources/templates/service.jkube.yaml (100%)
copy {karavan-app => karavan-status}/.mvn/wrapper/maven-wrapper.properties
(100%)
copy {karavan-app => karavan-status}/mvnw (100%)
copy {karavan-app => karavan-status}/mvnw.cmd (100%)
copy {karavan-app => karavan-status}/pom.xml (56%)
rename {karavan-app/src/main/java/org/apache/camel/karavan/service =>
karavan-status/src/main/java/org/apache/camel/karavan/config}/ConfigService.java
(96%)
rename {karavan-app/src/main/java/org/apache/camel/karavan/model =>
karavan-status/src/main/java/org/apache/camel/karavan/config}/Configuration.java
(98%)
create mode 100644
karavan-status/src/main/java/org/apache/camel/karavan/status/CamelStatusListener.java
create mode 100644
karavan-status/src/main/java/org/apache/camel/karavan/status/CamelStatusService.java
create mode 100644
karavan-status/src/main/java/org/apache/camel/karavan/status/ContainerStatusListener.java
rename
karavan-app/src/main/java/org/apache/camel/karavan/service/KaravanCacheService.java
=>
karavan-status/src/main/java/org/apache/camel/karavan/status/StatusCache.java
(67%)
rename
karavan-app/src/main/java/org/apache/camel/karavan/shared/Constants.java =>
karavan-status/src/main/java/org/apache/camel/karavan/status/StatusConstants.java
(52%)
rename
karavan-app/src/main/java/org/apache/camel/karavan/docker/LoggerCallback.java
=>
karavan-status/src/main/java/org/apache/camel/karavan/status/StatusEvents.java
(51%)
rename
karavan-app/src/main/java/org/apache/camel/karavan/service/KaravanService.java
=>
karavan-status/src/main/java/org/apache/camel/karavan/status/StatusService.java
(55%)
create mode 100644
karavan-status/src/main/java/org/apache/camel/karavan/status/docker/DockerAPI.java
create mode 100644
karavan-status/src/main/java/org/apache/camel/karavan/status/docker/DockerStatusService.java
rename
karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerServiceUtils.java
=>
karavan-status/src/main/java/org/apache/camel/karavan/status/docker/DockerUtils.java
(65%)
rename {karavan-app/src/main/java/org/apache/camel/karavan =>
karavan-status/src/main/java/org/apache/camel/karavan/status}/kubernetes/DeploymentEventHandler.java
(74%)
create mode 100644
karavan-status/src/main/java/org/apache/camel/karavan/status/kubernetes/DeploymentStatusListener.java
create mode 100644
karavan-status/src/main/java/org/apache/camel/karavan/status/kubernetes/KubernetesStatusService.java
rename {karavan-app/src/main/java/org/apache/camel/karavan =>
karavan-status/src/main/java/org/apache/camel/karavan/status}/kubernetes/PodEventHandler.java
(81%)
rename {karavan-app/src/main/java/org/apache/camel/karavan =>
karavan-status/src/main/java/org/apache/camel/karavan/status}/kubernetes/ServiceEventHandler.java
(72%)
rename
karavan-app/src/main/java/org/apache/camel/karavan/service/AuthService.java =>
karavan-status/src/main/java/org/apache/camel/karavan/status/kubernetes/ServiceStatusListener.java
(50%)
copy {karavan-app/src/main/java/org/apache/camel/karavan =>
karavan-status/src/main/java/org/apache/camel/karavan/status}/model/CamelStatus.java
(87%)
rename
karavan-app/src/main/java/org/apache/camel/karavan/model/CamelStatus.java =>
karavan-status/src/main/java/org/apache/camel/karavan/status/model/CamelStatusRequest.java
(58%)
rename {karavan-app/src/main/java/org/apache/camel/karavan =>
karavan-status/src/main/java/org/apache/camel/karavan/status}/model/CamelStatusValue.java
(86%)
rename {karavan-app/src/main/java/org/apache/camel/karavan =>
karavan-status/src/main/java/org/apache/camel/karavan/status}/model/ContainerPort.java
(87%)
rename {karavan-app/src/main/java/org/apache/camel/karavan =>
karavan-status/src/main/java/org/apache/camel/karavan/status}/model/ContainerStatus.java
(97%)
rename {karavan-app/src/main/java/org/apache/camel/karavan =>
karavan-status/src/main/java/org/apache/camel/karavan/status}/model/DeploymentStatus.java
(91%)
rename {karavan-app/src/main/java/org/apache/camel/karavan =>
karavan-status/src/main/java/org/apache/camel/karavan/status}/model/GroupedKey.java
(91%)
rename {karavan-app/src/main/java/org/apache/camel/karavan =>
karavan-status/src/main/java/org/apache/camel/karavan/status}/model/ServiceStatus.java
(91%)
create mode 100644 pom.xml
