You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ma...@apache.org on 2022/10/26 14:56:47 UTC
[camel-karavan] branch main updated: Fix for minikube
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 2b77c38 Fix for minikube
2b77c38 is described below
commit 2b77c3830d386d0a51241869f3325f77ce3ef595
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Wed Oct 26 10:56:39 2022 -0400
Fix for minikube
---
.../apache/camel/karavan/service/KubernetesService.java | 14 +++++++++-----
karavan-app/src/main/webapp/src/projects/ProjectModels.ts | 1 -
karavan-cloud/minikube/karavan.yaml | 2 +-
3 files changed, 10 insertions(+), 7 deletions(-)
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 d150261..20bac71 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
@@ -37,7 +37,6 @@ import io.fabric8.tekton.pipeline.v1beta1.PipelineRunSpec;
import io.fabric8.tekton.pipeline.v1beta1.PipelineRunSpecBuilder;
import io.fabric8.tekton.pipeline.v1beta1.WorkspaceBindingBuilder;
import io.quarkus.runtime.ShutdownEvent;
-import io.quarkus.runtime.StartupEvent;
import io.quarkus.vertx.ConsumeEvent;
import io.vertx.mutiny.core.eventbus.EventBus;
import org.apache.camel.karavan.model.DeploymentStatus;
@@ -57,7 +56,6 @@ import javax.enterprise.inject.Produces;
import javax.inject.Inject;
import java.io.IOException;
import java.io.InputStream;
-import java.nio.channels.Pipe;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
@@ -108,7 +106,7 @@ public class KubernetesService {
Optional<KaravanConfiguration.Environment> env = config.environments().stream()
.filter(environment -> environment.name().equals("dev")).findFirst();
if (env.isPresent()) {
- String labelName = isOpenshift() ? "app.openshift.io/runtime" : "app.kubernetes.io/runtime";
+ String labelName = getRuntimeLabel();
try {
watches.add(kubernetesClient().apps().deployments().inNamespace(currentNamespace).withLabel(labelName, "camel")
.watch(new DeploymentWatcher(infinispanService, this)));
@@ -269,9 +267,10 @@ public class KubernetesService {
public List<PodStatus> getDeploymentPodsStatuses(String name, String namespace) {
try {
+ String labelName = getRuntimeLabel();
List<Pod> pods = kubernetesClient().pods().inNamespace(namespace)
.withLabel("app.kubernetes.io/name", name)
- .withLabel("app.openshift.io/runtime", "camel")
+ .withLabel(labelName, "camel")
.list().getItems();
return pods.stream().map(pod -> new PodStatus(
@@ -308,7 +307,8 @@ public class KubernetesService {
public List<String> getCamelDeployments(String namespace) {
try {
- return kubernetesClient().apps().deployments().inNamespace(namespace).withLabel("app.openshift.io/runtime", "camel").list().getItems()
+ String labelName = getRuntimeLabel();
+ return kubernetesClient().apps().deployments().inNamespace(namespace).withLabel(labelName, "camel").list().getItems()
.stream().map(deployment -> deployment.getMetadata().getName()).collect(Collectors.toList());
} catch (Exception ex) {
LOGGER.error(ex.getMessage());
@@ -373,6 +373,10 @@ public class KubernetesService {
return kubernetesClient().secrets().inNamespace(currentNamespace).withName("karavan").get();
}
+ public String getRuntimeLabel() {
+ return isOpenshift() ? "app.openshift.io/runtime" : "app.kubernetes.io/runtime";
+ }
+
public boolean isOpenshift() {
return kubernetesClient().isAdaptable(OpenShiftClient.class);
}
diff --git a/karavan-app/src/main/webapp/src/projects/ProjectModels.ts b/karavan-app/src/main/webapp/src/projects/ProjectModels.ts
index 11bf478..16ae793 100644
--- a/karavan-app/src/main/webapp/src/projects/ProjectModels.ts
+++ b/karavan-app/src/main/webapp/src/projects/ProjectModels.ts
@@ -83,7 +83,6 @@ export class ProjectFileType {
export const ProjectFileTypes: ProjectFileType[] = [
new ProjectFileType("INTEGRATION", "Integration", "yaml"),
new ProjectFileType("CODE", "Code", "java"),
- new ProjectFileType("CODE", "Code", "groovy"),
new ProjectFileType("PROPERTIES", "Properties", "properties"),
new ProjectFileType("OPENAPI", "OpenAPI", "json"),
new ProjectFileType("OPENAPI", "OpenAPI", "yaml"),
diff --git a/karavan-cloud/minikube/karavan.yaml b/karavan-cloud/minikube/karavan.yaml
index 3dfd3bb..8bfa138 100644
--- a/karavan-cloud/minikube/karavan.yaml
+++ b/karavan-cloud/minikube/karavan.yaml
@@ -7,4 +7,4 @@ spec:
instances: 1
auth: public
type: dev
- nodePort: 37777
\ No newline at end of file
+ nodePort: 30777
\ No newline at end of file