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 9a2ffd6 Fix status collect issues (#413)
9a2ffd6 is described below
commit 9a2ffd6454d39590b125eaec476c7334b6fa5fc5
Author: Marat Gubaidullin <marat.gubaidul...@gmail.com>
AuthorDate: Tue Jul 12 18:04:37 2022 -0400
Fix status collect issues (#413)
---
.../org/apache/camel/karavan/model/KaravanConfiguration.java | 1 +
.../java/org/apache/camel/karavan/service/KaravanService.java | 1 -
.../java/org/apache/camel/karavan/service/KubernetesService.java | 1 -
.../java/org/apache/camel/karavan/service/StatusService.java | 4 ++--
karavan-app/src/main/resources/application.properties | 9 ++++++---
karavan-builder/openshift/karavan-acl.yaml | 2 ++
6 files changed, 11 insertions(+), 7 deletions(-)
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/model/KaravanConfiguration.java
b/karavan-app/src/main/java/org/apache/camel/karavan/model/KaravanConfiguration.java
index 497a2fc..5d028c3 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/model/KaravanConfiguration.java
+++
b/karavan-app/src/main/java/org/apache/camel/karavan/model/KaravanConfiguration.java
@@ -19,5 +19,6 @@ public interface KaravanConfiguration {
String cluster();
String namespace();
String pipeline();
+ Boolean active();
}
}
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/service/KaravanService.java
b/karavan-app/src/main/java/org/apache/camel/karavan/service/KaravanService.java
index 8f334c3..dff71f7 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/service/KaravanService.java
+++
b/karavan-app/src/main/java/org/apache/camel/karavan/service/KaravanService.java
@@ -52,7 +52,6 @@ public class KaravanService {
KaravanConfiguration configuration;
void onStart(@Observes StartupEvent ev) {
- configuration.environments().forEach(environment ->
System.out.println(environment.name()));
}
@ConsumeEvent(value = IMPORT_PROJECTS, blocking = true)
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/service/KubernetesService.java
b/karavan-app/src/main/java/org/apache/camel/karavan/service/KubernetesService.java
index d72abe7..a75b4c8 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/service/KubernetesService.java
+++
b/karavan-app/src/main/java/org/apache/camel/karavan/service/KubernetesService.java
@@ -216,7 +216,6 @@ public class KubernetesService {
public List<String> getConfigMaps(String namespace) {
List<String> result = new ArrayList<>();
kubernetesClient().configMaps().inNamespace(namespace).list().getItems().forEach(configMap
-> {
- System.out.println(configMap.getMetadata().getName());
String name = configMap.getMetadata().getName();
configMap.getData().keySet().forEach(data -> result.add(name + "/"
+ data));
});
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 0c2e200..cf8ca70 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,8 +84,8 @@ public class StatusService {
ProjectStatus status = new ProjectStatus();
status.setProjectId(projectId);
status.setLastUpdate(System.currentTimeMillis());
- List<ProjectEnvStatus> statuses = new
ArrayList<>(configuration.environments().size());
- configuration.environments().forEach(e -> {
+ List<ProjectEnvStatus> statuses = new ArrayList<>(1);
+ configuration.environments().stream().filter(e ->
e.active()).forEach(e -> {
String url = ProfileManager.getActiveProfile().equals("dev")
? String.format("http://%s-%s.%s/q/health";, projectId,
e.namespace(), e.cluster())
: String.format("http://%s.%s.%s/q/health";, projectId,
e.namespace(), e.cluster());
diff --git a/karavan-app/src/main/resources/application.properties
b/karavan-app/src/main/resources/application.properties
index 4808ab5..808000b 100644
--- a/karavan-app/src/main/resources/application.properties
+++ b/karavan-app/src/main/resources/application.properties
@@ -19,20 +19,23 @@ karavan.config.environments[0].name=dev
karavan.config.environments[0].namespace=karavan
karavan.config.environments[0].pipeline=karavan-quarkus
karavan.config.environments[0].cluster=svc.cluster.local
+karavan.config.environments[0].active=true
karavan.config.environments[1].name=test
karavan.config.environments[1].namespace=test
karavan.config.environments[1].pipeline=karavan-quarkus
karavan.config.environments[1].cluster=svc.cluster.local
+karavan.config.environments[1].active=false
karavan.config.environments[2].name=prod
karavan.config.environments[2].namespace=prod
karavan.config.environments[2].pipeline=karavan-quarkus
karavan.config.environments[2].cluster=svc.cluster.local
+karavan.config.environments[2].active=false
-%dev.karavan.config.environments[0].cluster=apps.cluster-m8k78.m8k78.sandbox206.opentlc.com
-%dev.karavan.config.environments[1].cluster=apps.cluster-m8k78.m8k78.sandbox206.opentlc.com
-%dev.karavan.config.environments[2].cluster=apps.cluster-m8k78.m8k78.sandbox206.opentlc.com
+%dev.karavan.config.environments[0].cluster=apps.cluster-bzs7w.bzs7w.sandbox863.opentlc.com
+%dev.karavan.config.environments[1].cluster=apps.cluster-bzs7w.bzs7w.sandbox863.opentlc.com
+%dev.karavan.config.environments[2].cluster=apps.cluster-bzs7w.bzs7w.sandbox863.opentlc.com
# Infinispan Server address
diff --git a/karavan-builder/openshift/karavan-acl.yaml
b/karavan-builder/openshift/karavan-acl.yaml
index 015c67a..88088a9 100644
--- a/karavan-builder/openshift/karavan-acl.yaml
+++ b/karavan-builder/openshift/karavan-acl.yaml
@@ -17,8 +17,10 @@ rules:
- ""
resources:
- secrets
+ - configmaps
verbs:
- get
+ - list
---
# Role tekton run pipeline
kind: Role
