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 1e5c5f3 Cloud native3 (#468) 1e5c5f3 is described below commit 1e5c5f36366b8fc512de3d5df4d2650b7f279af4 Author: Marat Gubaidullin <marat.gubaidul...@gmail.com> AuthorDate: Tue Aug 23 17:49:12 2022 -0400 Cloud native3 (#468) * Demo custom kamelets repo * Fix issues with projet deployed status --- .../java/org/apache/camel/karavan/api/KubernetesResource.java | 2 ++ karavan-app/src/main/resources/application.properties | 8 ++++++++ karavan-app/src/main/webapp/package-lock.json | 6 +++--- karavan-app/src/main/webapp/src/MainLogin.tsx | 4 +--- karavan-app/src/main/webapp/src/projects/ProjectDashboard.tsx | 4 ++-- karavan-app/src/main/webapp/src/projects/ProjectInfo.tsx | 2 +- karavan-builder/openshift/karavan-secret.yaml | 2 +- 7 files changed, 18 insertions(+), 10 deletions(-) diff --git a/karavan-app/src/main/java/org/apache/camel/karavan/api/KubernetesResource.java b/karavan-app/src/main/java/org/apache/camel/karavan/api/KubernetesResource.java index 5654cf5..f32da80 100644 --- a/karavan-app/src/main/java/org/apache/camel/karavan/api/KubernetesResource.java +++ b/karavan-app/src/main/java/org/apache/camel/karavan/api/KubernetesResource.java @@ -65,6 +65,8 @@ public class KubernetesResource { Optional<KaravanConfiguration.Environment> env = configuration.environments().stream().filter(e -> e.name().equals(environment)).findFirst(); if (env.isPresent()) { kubernetesService.createPipelineRun(project, env.get().pipeline(), env.get().namespace()); + p.setDeployed(true); // TODO: Replace this update by updating from Pipeline + infinispanService.saveProject(p); // TODO: Replace this update by updating from Pipeline } return p; } diff --git a/karavan-app/src/main/resources/application.properties b/karavan-app/src/main/resources/application.properties index cf78dab..4efe8c2 100644 --- a/karavan-app/src/main/resources/application.properties +++ b/karavan-app/src/main/resources/application.properties @@ -58,6 +58,14 @@ quarkus.infinispan-client.auth-password=password # Use BASIC as a Docker for Mac workaround quarkus.infinispan-client.client-intelligence=BASIC +# SSO +#quarkus.oidc.auth-server-url=http://localhost:8081/realms/karavan +#quarkus.oidc.client-id=karavan +#quarkus.oidc.credentials.secret=vWh7ZQf3jhCd1jkZwGIaSqeLKIvYCbPM +#quarkus.oidc.application-type=web-app +#quarkus.oidc.tls.verification=none +#quarkus.http.auth.permission.authenticated.paths=/* +#quarkus.http.auth.permission.authenticated.policy=authenticated # Quarkus configuration quarkus.log.level=INFO diff --git a/karavan-app/src/main/webapp/package-lock.json b/karavan-app/src/main/webapp/package-lock.json index 484bf5d..9c98cc2 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.0", + "version": "3.18.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "karavan", - "version": "3.18.0", + "version": "3.18.3", "dependencies": { "@monaco-editor/react": "4.3.1", "@patternfly/patternfly": "4.194.4", @@ -41,7 +41,7 @@ } }, "../../../../karavan-core": { - "version": "3.18.0", + "version": "3.18.3", "license": "Apache-2.0", "dependencies": { "@types/js-yaml": "^4.0.5", diff --git a/karavan-app/src/main/webapp/src/MainLogin.tsx b/karavan-app/src/main/webapp/src/MainLogin.tsx index b457b0f..1953ee1 100644 --- a/karavan-app/src/main/webapp/src/MainLogin.tsx +++ b/karavan-app/src/main/webapp/src/MainLogin.tsx @@ -3,10 +3,8 @@ import { Bullseye, Card, CardBody, CardFooter, CardTitle, LoginForm, LoginMainFooterBandItem, - LoginMainFooterLinksItem, - LoginPage, Text + LoginMainFooterLinksItem, Text } from '@patternfly/react-core'; -import {Project} from "./models/ProjectModels"; interface Props { config: any, diff --git a/karavan-app/src/main/webapp/src/projects/ProjectDashboard.tsx b/karavan-app/src/main/webapp/src/projects/ProjectDashboard.tsx index 96b9ea5..47b5443 100644 --- a/karavan-app/src/main/webapp/src/projects/ProjectDashboard.tsx +++ b/karavan-app/src/main/webapp/src/projects/ProjectDashboard.tsx @@ -7,8 +7,8 @@ import { } from '@patternfly/react-core'; import '../designer/karavan.css'; import {KaravanApi} from "../api/KaravanApi"; -import {Project, ProjectEnvStatus, ProjectFileTypes, ProjectStatus} from "../models/ProjectModels"; -import {ChartDonut, ChartDonutThreshold, ChartDonutUtilization} from "@patternfly/react-charts"; +import {Project, ProjectFileTypes, ProjectStatus} from "../models/ProjectModels"; +import {ChartDonutThreshold} from "@patternfly/react-charts"; interface Props { project: Project, diff --git a/karavan-app/src/main/webapp/src/projects/ProjectInfo.tsx b/karavan-app/src/main/webapp/src/projects/ProjectInfo.tsx index ce726a5..9bd5022 100644 --- a/karavan-app/src/main/webapp/src/projects/ProjectInfo.tsx +++ b/karavan-app/src/main/webapp/src/projects/ProjectInfo.tsx @@ -156,7 +156,7 @@ export class ProjectInfo extends React.Component<Props, State> { onClick={e => { this.push(() => this.build()); }}> - {isDeploying ? "..." : "Run"} + {isDeploying ? "..." : "Deploy"} </Button> </Tooltip>) } diff --git a/karavan-builder/openshift/karavan-secret.yaml b/karavan-builder/openshift/karavan-secret.yaml index c515eb9..248e379 100644 --- a/karavan-builder/openshift/karavan-secret.yaml +++ b/karavan-builder/openshift/karavan-secret.yaml @@ -10,7 +10,7 @@ stringData: projects-git-password: demo projects-git-username: demo projects-git-main: main - kamelets-git-repository: https://github.com/mgubaidullin/karavan-kamelets.git + kamelets-git-repository: https://github.com/mgubaidullin/karavan-demo-kamelets.git kamelets-git-password: demo kamelets-git-username: demo kamelets-git-main: main