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 f8602a1 Cleanup
f8602a1 is described below
commit f8602a15e0bfa95da679e7c16833f48936e09929
Author: Marat Gubaidullin <[email protected]>
AuthorDate: Wed Sep 21 14:46:54 2022 -0400
Cleanup
---
karavan-app/{Dockerfile.distroless.dockerignore => .dockerignore} | 3 ++-
karavan-app/Dockerfile.distroless.dockerignore | 3 ++-
karavan-app/pom.xml | 7 +++++--
.../main/java/org/apache/camel/karavan/service/StatusService.java | 2 +-
karavan-app/src/main/resources/application.properties | 2 +-
karavan-app/src/main/webapp/package-lock.json | 6 +++---
karavan-app/src/main/webapp/src/projects/ProjectInfo.tsx | 1 +
7 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/karavan-app/Dockerfile.distroless.dockerignore
b/karavan-app/.dockerignore
similarity index 66%
copy from karavan-app/Dockerfile.distroless.dockerignore
copy to karavan-app/.dockerignore
index 94810d0..855da0f 100644
--- a/karavan-app/Dockerfile.distroless.dockerignore
+++ b/karavan-app/.dockerignore
@@ -2,4 +2,5 @@
!target/*-runner
!target/*-runner.jar
!target/lib/*
-!target/quarkus-app/*
\ No newline at end of file
+!target/quarkus-app/*
+src/*
\ No newline at end of file
diff --git a/karavan-app/Dockerfile.distroless.dockerignore
b/karavan-app/Dockerfile.distroless.dockerignore
index 94810d0..855da0f 100644
--- a/karavan-app/Dockerfile.distroless.dockerignore
+++ b/karavan-app/Dockerfile.distroless.dockerignore
@@ -2,4 +2,5 @@
!target/*-runner
!target/*-runner.jar
!target/lib/*
-!target/quarkus-app/*
\ No newline at end of file
+!target/quarkus-app/*
+src/*
\ No newline at end of file
diff --git a/karavan-app/pom.xml b/karavan-app/pom.xml
index 0223375..9c8aab1 100644
--- a/karavan-app/pom.xml
+++ b/karavan-app/pom.xml
@@ -32,7 +32,7 @@
<quarkus.platform.version>2.11.2.Final</quarkus.platform.version>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
<version.camel-kamelet>0.9.0</version.camel-kamelet>
- <version.camel>3.18.1</version.camel>
+ <version.camel>3.18.2</version.camel>
</properties>
<dependencyManagement>
<dependencies>
@@ -91,6 +91,10 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-openshift-client</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-minikube</artifactId>
+ </dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-oidc</artifactId>
@@ -131,7 +135,6 @@
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-container-image-docker</artifactId>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/service/StatusService.java
b/karavan-app/src/main/java/org/apache/camel/karavan/service/StatusService.java
index 0428d41..a947236 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/service/StatusService.java
+++
b/karavan-app/src/main/java/org/apache/camel/karavan/service/StatusService.java
@@ -84,7 +84,7 @@ public class StatusService {
} else if (project.getDeployed() && !hasDeployment) {
project.setDeployed(false);
infinispanService.saveProject(project);
-// infinispanService.saveProjectStatus(new
ProjectStatus(project.getProjectId(), List.of(), System.currentTimeMillis()));
+ infinispanService.saveProjectStatus(new
ProjectStatus(project.getProjectId(), List.of(), System.currentTimeMillis()));
}
}
});
diff --git a/karavan-app/src/main/resources/application.properties
b/karavan-app/src/main/resources/application.properties
index c58c496..63e986e 100644
--- a/karavan-app/src/main/resources/application.properties
+++ b/karavan-app/src/main/resources/application.properties
@@ -19,7 +19,7 @@ karavan.kamelets-git-main=main
karavan.config.group-id=org.camel.karavan.demo
karavan.config.image-group=karavan
karavan.config.runtime=QUARKUS
-karavan.config.runtime-version=2.11.2.Final
+karavan.config.runtime-version=2.12.2.Final
karavan.config.status-threshold=1000
karavan.config.environments[0].name=dev
diff --git a/karavan-app/src/main/webapp/package-lock.json
b/karavan-app/src/main/webapp/package-lock.json
index 43fcfb8..f85754f 100644
--- a/karavan-app/src/main/webapp/package-lock.json
+++ b/karavan-app/src/main/webapp/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "karavan",
- "version": "3.18.3",
+ "version": "3.18.4",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "karavan",
- "version": "3.18.3",
+ "version": "3.18.4",
"dependencies": {
"@monaco-editor/react": "4.3.1",
"@patternfly/patternfly": "4.194.4",
@@ -42,7 +42,7 @@
}
},
"../../../../karavan-core": {
- "version": "3.18.3",
+ "version": "3.18.4",
"license": "Apache-2.0",
"dependencies": {
"@types/js-yaml": "^4.0.5",
diff --git a/karavan-app/src/main/webapp/src/projects/ProjectInfo.tsx
b/karavan-app/src/main/webapp/src/projects/ProjectInfo.tsx
index 8713358..2e6dffe 100644
--- a/karavan-app/src/main/webapp/src/projects/ProjectInfo.tsx
+++ b/karavan-app/src/main/webapp/src/projects/ProjectInfo.tsx
@@ -235,6 +235,7 @@ export class ProjectInfo extends React.Component<Props,
State> {
}
getReplicasPanel(deploymentStatus: DeploymentStatus, env: string) {
+ console.log(deploymentStatus);
const ok = (deploymentStatus && deploymentStatus?.readyReplicas > 0
&& (deploymentStatus.unavailableReplicas === 0 ||
deploymentStatus.unavailableReplicas === undefined)
&& deploymentStatus?.replicas === deploymentStatus?.readyReplicas)
