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
commit 5bca98ead5b39b0225ad8b4cc8c121f8a4dce812 Author: Marat Gubaidullin <ma...@talismancloud.io> AuthorDate: Thu Sep 14 15:18:16 2023 -0400 Rename CLI to Installer for #885 --- docs/DEV.md | 4 ++-- docs/WEB_KUBERNETES.md | 8 ++++---- .../src/main/webui/src/project/container/DeploymentPanel.tsx | 7 +++---- .../java/org/apache/camel/karavan/installer/KaravanCommand.java | 2 +- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/docs/DEV.md b/docs/DEV.md index 4fa59791..a369fc47 100644 --- a/docs/DEV.md +++ b/docs/DEV.md @@ -9,8 +9,8 @@ KaravanDesigner UI component Karavan Cloud Application * karavan-app Karavan Application to be installed into Kubernetes - * karavan-cli - Karavan CLI to install into Kubernetes + * karavan-installer + Karavan Installer to install into Kubernetes * karavan-operator Karavan Operator to install into Openshift 5. karavan-vscode diff --git a/docs/WEB_KUBERNETES.md b/docs/WEB_KUBERNETES.md index 33676394..f371a5a3 100644 --- a/docs/WEB_KUBERNETES.md +++ b/docs/WEB_KUBERNETES.md @@ -16,17 +16,17 @@ ``` minikube dashboard ``` -4. Install Karavan using CLI +4. Install Karavan using Installer Option 1: ``` - mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:copy -Dartifact=org.apache.camel.karavan:karavan-cli:4.0.0-RC2:jar -DoutputDirectory=. + mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:copy -Dartifact=org.apache.camel.karavan:karavan-installer:4.0.0-RC2:jar -DoutputDirectory=. - java -jar karavan-cli-4.0.0-RC2.jar install --git-repository=$GIT_REPOSITORY --git-password=$GIT_TOKEN --git-username=$GIT_USERNAME --node-port=30777 + java -jar karavan-installer-4.0.0-RC2.jar install --git-repository=$GIT_REPOSITORY --git-password=$GIT_TOKEN --git-username=$GIT_USERNAME --node-port=30777 ``` Option 2: ``` - jbang org.apache.camel.karavan:karavan-cli:4.0.0-RC2 install --git-repository=$GIT_REPOSITORY --git-password=$GIT_TOKEN --git-username=$GIT_USERNAME --node-port=30777 + jbang org.apache.camel.karavan:karavan-installer:4.0.0-RC2 install --git-repository=$GIT_REPOSITORY --git-password=$GIT_TOKEN --git-username=$GIT_USERNAME --node-port=30777 ``` 5. Get karavan service URL ``` diff --git a/karavan-web/karavan-app/src/main/webui/src/project/container/DeploymentPanel.tsx b/karavan-web/karavan-app/src/main/webui/src/project/container/DeploymentPanel.tsx index b2e21233..c10de37b 100644 --- a/karavan-web/karavan-app/src/main/webui/src/project/container/DeploymentPanel.tsx +++ b/karavan-web/karavan-app/src/main/webui/src/project/container/DeploymentPanel.tsx @@ -23,7 +23,6 @@ interface Props { export function DeploymentPanel (props: Props) { - const {config} = useAppConfigStore(); const [project] = useProjectStore((s) => [s.project], shallow); const [ deployments] = useStatusesStore((s) => [s.deployments], shallow); @@ -75,15 +74,15 @@ export function DeploymentPanel (props: Props) { return (<Modal className="modal-delete" title="Confirmation" - isOpen={showDeleteConfirmation} - onClose={() => setShowDeleteConfirmation(false)} + isOpen={showRolloutConfirmation} + onClose={() => setShowRolloutConfirmation(false)} actions={[ <Button key="confirm" variant="primary" onClick={e => { if (project.projectId) { rolloutDeployment(); setShowRolloutConfirmation(false); } - }}>Delete + }}>Rollout </Button>, <Button key="cancel" variant="link" onClick={e => setShowRolloutConfirmation(false)}>Cancel</Button> diff --git a/karavan-web/karavan-installer/src/main/java/org/apache/camel/karavan/installer/KaravanCommand.java b/karavan-web/karavan-installer/src/main/java/org/apache/camel/karavan/installer/KaravanCommand.java index 3bd061b7..1af74baf 100644 --- a/karavan-web/karavan-installer/src/main/java/org/apache/camel/karavan/installer/KaravanCommand.java +++ b/karavan-web/karavan-installer/src/main/java/org/apache/camel/karavan/installer/KaravanCommand.java @@ -11,7 +11,7 @@ import java.util.concurrent.Callable; @CommandLine.Command(name = "install", mixinStandardHelpOptions = true, - description = "Karavan CLI") + description = "Karavan Installer") public class KaravanCommand implements Callable<Integer> { @CommandLine.Option(names = {"-v", "--version"}, required = true, description = "Karavan version", defaultValue = "4.0.0-RC2")