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 d3449ed6167e898a857fcd8f4d976b1f4aed8e11 Author: Marat Gubaidullin <[email protected]> AuthorDate: Tue Nov 8 19:15:20 2022 -0500 Quarkus Deployment to Kubernetes and Openshift in VS Code --- karavan-vscode/package.json | 154 +++++++++++++++++++++++++++++----------- karavan-vscode/src/extension.ts | 26 +------ karavan-vscode/src/jbang.ts | 45 +++++------- karavan-vscode/src/utils.ts | 59 ++++++++++++--- 4 files changed, 180 insertions(+), 104 deletions(-) diff --git a/karavan-vscode/package.json b/karavan-vscode/package.json index 652ed72..5f89c12 100644 --- a/karavan-vscode/package.json +++ b/karavan-vscode/package.json @@ -93,13 +93,6 @@ "scope": "machine", "order": 22 }, - "camel.quarkus-version": { - "type": "string", - "default": "2.13.3.Final", - "description": "Camel-quarkus version", - "scope": "machine", - "order": 21 - }, "camel.maxMessages": { "type": "integer", "default": 0, @@ -141,6 +134,41 @@ "scope": "machine", "order": 65 }, + "Karavan.defaultGroupId": { + "type": "string", + "default": "org.demo", + "description": "Default GroupId", + "scope": "machine", + "order": 66 + }, + "Karavan.quarkusOpenshiftDeploy": { + "type": "string", + "default": "mvn clean package", + "description": "Quarkus deploy command for Openshift", + "scope": "machine", + "order": 70 + }, + "Karavan.quarkusKubernetesDeploy": { + "type": "string", + "default": "eval $(minikube -p minikube docker-env) && mvn clean package", + "description": "Quarkus deploy command for Kubernetes", + "scope": "machine", + "order": 70 + }, + "Karavan.springbootOpenshiftDeploy": { + "type": "string", + "default": "mvn -Popenshift clean package oc:build oc:resource oc:apply", + "description": "Springboot deploy command for Openshift", + "scope": "machine", + "order": 70 + }, + "Karavan.springbootKubernetesDeploy": { + "type": "string", + "default": "eval $(minikube -p minikube docker-env) && mvn -Pkubernetes clean package k8s:build k8s:resource k8s:apply", + "description": "Springboot deploy command for Kubernetes", + "scope": "machine", + "order": 70 + }, "Karavan.applicationProperties": { "type": "array", "uniqueItems": true, @@ -148,73 +176,119 @@ "type": "string" }, "default": [ - "camel.jbang.project-id=$NAME", - "camel.jbang.project-name=$NAME", - "camel.jbang.project-description=$NAME", + "camel.health.enabled=true", + "camel.health.exposure-level=full", + "camel.karavan.project-id=$NAME", + "camel.karavan.project-name=$NAME", + "camel.karavan.project-description=$NAME", + "camel.karavan.target=$TARGET", "camel.jbang.gav=$GAV", "camel.jbang.runtime=$RUNTIME", - "camel.jbang.dependencies=mvn:io.quarkus:quarkus-container-image-jib,camel:microprofile-health,mvn:io.quarkus:quarkus-openshift", - "camel.health.enabled=true", - "camel.health.exposure-level=full" + "camel.jbang.exportDir=.export" ], - "description": "Default application.properties template", + "description": "application.properties template", "scope": "machine", "order": 90 }, - "Karavan.quarkusApplicationProperties": { + "Karavan.quarkusOpenshiftProperties": { "type": "array", "uniqueItems": true, "items": { "type": "string" }, "default": [ - "camel.jbang.quarkusVersion=$RUNTIME_VERSION" + "camel.jbang.quarkusVersion=2.13.3.Final", + "camel.jbang.dependencies=camel:microprofile-health,mvn:io.quarkus:quarkus-openshift", + "# image build properties", + "quarkus.container-image.build=true", + "quarkus.container-image.group=${NAMESPACE}", + "quarkus.container-image.name=$NAME", + "quarkus.container-image.tag=${DATE}", + "# deployment properties", + "quarkus.kubernetes.deploy=true", + "quarkus.kubernetes-client.trust-certs=true", + "quarkus.kubernetes.deployment-target=openshift", + "quarkus.kubernetes-client.namespace=${NAMESPACE}", + "quarkus.kubernetes.namespace=${NAMESPACE}", + "quarkus.openshift.labels.\"app.openshift.io/runtime\"=camel", + "quarkus.openshift.deployment-kind=Deployment", + "quarkus.openshift.add-version-to-label-selectors=false", + "quarkus.openshift.route.expose=true", + "quarkus.openshift.part-of=$NAME", + "quarkus.openshift.replicas=1" ], - "description": "Default application.properties template for Quarkus Runtime", + "description": "application.properties template for camel-quarkus on Openshift", "scope": "machine", - "order": 95 + "order": 92 }, - "Karavan.imageBuildProperties": { + "Karavan.quarkusKubernetesProperties": { "type": "array", "uniqueItems": true, "items": { "type": "string" }, "default": [ - "quarkus.container-image.group=${NAMESPACE}", + "camel.jbang.quarkusVersion=2.13.3.Final", + "camel.jbang.dependencies=camel:microprofile-health,mvn:io.quarkus:quarkus-container-image-jib,mvn:io.quarkus:quarkus-kubernetes", + "# image build properties", + "quarkus.container-image.build=true", + "quarkus.container-image.group=default", "quarkus.container-image.name=$NAME", "quarkus.container-image.builder=jib", - "quarkus.container-image.registry=${IMAGE_REGISTRY}", "quarkus.container-image.insecure=true", - "quarkus.container-image.username=${KUBERNETES_USER}", - "quarkus.container-image.password=${KUBERNETES_TOKEN}", - "quarkus.container-image.tag=${DATE}" + "quarkus.container-image.tag=${DATE}", + "# deployment properties", + "quarkus.kubernetes.deploy=true", + "quarkus.kubernetes-client.trust-certs=true", + "quarkus.kubernetes.image-pull-policy=if-not-present", + "quarkus.kubernetes.labels.\"app.kubernetes.io/runtime\"=camel", + "quarkus.kubernetes.add-version-to-label-selectors=false", + "quarkus.kubernetes.deployment-target=kubernetes", + "quarkus.kubernetes.replicas=1" ], - "description": "Default application.properties template for image build", + "description": "application.properties template for camel-quarkus on Kubernetes", "scope": "machine", - "order": 96 + "order": 93 }, - "Karavan.openshiftProperties": { + "Karavan.springbootOpenshiftProperties": { "type": "array", "uniqueItems": true, "items": { "type": "string" }, "default": [ - "quarkus.kubernetes-client.trust-certs=true", - "quarkus.kubernetes-client.master-url=${KUBERNETES_SERVER}", - "quarkus.kubernetes-client.namespace=${NAMESPACE}", - "quarkus.kubernetes-client.token=${KUBERNETES_TOKEN}", - "quarkus.openshift.labels.\"app.openshift.io/runtime\"=camel", - "quarkus.openshift.deployment-kind=Deployment", - "quarkus.openshift.add-version-to-label-selectors=false", - "quarkus.openshift.route.expose=false", - "quarkus.openshift.part-of=$NAME", - "quarkus.openshift.replicas=1" + "camel.jbang.dependencies=camel:microprofile-health", + "# jkube properties", + "jkube.version=1.9.1", + "jkube.build.strategy=s2i", + "jkube.namespace=${NAMESPACE}", + "jkube.generator.name=$NAME:${DATE}", + "jkube.imagePullPolicy=Always" + ], + "description": "application.properties template for camel-springboot on Kubernetes", + "scope": "machine", + "order": 94 + }, + "Karavan.springbootKubernetesProperties": { + "type": "array", + "uniqueItems": true, + "items": { + "type": "string" + }, + "default": [ + "camel.jbang.dependencies=camel:microprofile-health", + "# jkube properties", + "jkube.version=1.9.1", + "jkube.build.strategy=jib", + "jkube.namespace=${NAMESPACE}", + "jkube.generator.name=$NAME:${DATE}", + "jkube.imagePullPolicy=Always", + "jkube.enricher.jkube-controller.type=Deployment", + "jkube.enricher.jkube-controller.replicaCount=1" ], - "description": "Default application.properties template for Openshift", + "description": "application.properties template for camel-springboot on Kubernetes", "scope": "machine", - "order": 97 + "order": 95 } } }, @@ -526,4 +600,4 @@ "shelljs": "^0.8.5", "uuid": "8.3.2" } -} +} \ No newline at end of file diff --git a/karavan-vscode/src/extension.ts b/karavan-vscode/src/extension.ts index 9052b58..0979e49 100644 --- a/karavan-vscode/src/extension.ts +++ b/karavan-vscode/src/extension.ts @@ -140,7 +140,7 @@ export function activate(context: ExtensionContext) { // Export project const exportCommand = commands.registerCommand("karavan.jbang-export", (...args: any[]) => { - inputExportFolder(rootPath); + jbang.camelJbangExport(); }); context.subscriptions.push(exportCommand); @@ -186,29 +186,6 @@ export function activate(context: ExtensionContext) { }); } -/** - * export into folder - */ -export async function inputExportFolder(rootPath?: string) { - window.showInputBox({ - title: "Export project", - ignoreFocusOut: true, - prompt: "Export folder name", - value: "export", - validateInput: (text: string): string | undefined => { - if (!text || text.length === 0) { - return 'Name should not be empty'; - } else { - return undefined; - } - } - }).then(folder => { - if (folder && rootPath) { - const fullPath = rootPath + path.sep + folder; - jbang.camelJbangExport(fullPath); - } - }); -} /** * export with gav @@ -218,6 +195,7 @@ export async function inputExportGav(runtime: string, target: string) { title: "Export project with " + runtime, ignoreFocusOut: true, prompt: "groupId:artifactId:version", + value: utils.defaultGAV(), validateInput: (text: string): string | undefined => { if (!text || text.length === 0) { return 'Name should not be empty. Format groupId:artifactId:version'; diff --git a/karavan-vscode/src/jbang.ts b/karavan-vscode/src/jbang.ts index 1a76949..e2baa92 100644 --- a/karavan-vscode/src/jbang.ts +++ b/karavan-vscode/src/jbang.ts @@ -94,8 +94,8 @@ export function camelJbangRun(filename?: string) { terminal.sendText(command); } -export function camelJbangExport(directory: string) { - const command = createExportCommand(directory); +export function camelJbangExport() { + const command = createExportCommand(); const terminalId = "export"; const existTerminal = TERMINALS.get(terminalId); if (existTerminal) existTerminal.dispose(); @@ -105,36 +105,30 @@ export function camelJbangExport(directory: string) { terminal.sendText(command); } -export function createExportCommand(directory: string) { +export function createExportCommand() { const kameletsPath: string | undefined = workspace.getConfiguration().get("Karavan.kameletsPath"); - const cmd = "export --directory=" + directory - + (kameletsPath && kameletsPath.trim().length > 0 ? " --local-kamelet-dir=" + kameletsPath : ""); + const cmd = "export --fresh " + (kameletsPath && kameletsPath.trim().length > 0 ? " --local-kamelet-dir=" + kameletsPath : ""); return prepareCommand(cmd); } export function camelDeploy(directory: string) { - const command = createExportCommand(directory).concat(" && ") - .concat(createPackageAndPushImageCommand(directory)).concat(" && ") - .concat(createPackageAndDeployCommand(directory)); Promise.all([ - exec.execCommand("oc whoami"), // get user - exec.execCommand("oc whoami --show-token"), // get token + utils.getRuntime(), + utils.getTarget(), + utils.getExportFolder(), exec.execCommand("oc project -q"), // get namespace - exec.execCommand("oc get route default-route -n openshift-image-registry --template='{{ .spec.host }}'"), // get image-registry - exec.execCommand("oc whoami --show-server") // get server ]).then(val => { + const runtime = val[0] || ''; + const target = val[1] || ''; + const exportFolder = val[2] || ''; let env: any = { "DATE": Date.now().toString() }; - if (val[0].result) env.KUBERNETES_USER = val[0].value.trim(); - if (val[1].result) env.KUBERNETES_TOKEN = val[1].value.trim(); - if (val[2].result) env.NAMESPACE = val[2].value.trim(); - if (val[3].result) env.IMAGE_REGISTRY = val[3].value.trim() - else env.IMAGE_REGISTRY = "image-registry.openshift-image-registry.svc:5000"; - if (val[4].result) env.KUBERNETES_SERVER = val[4].value.trim() - else env.KUBERNETES_SERVER = "kubernetes.default.svc"; - - if (val[0].result && val[1].result && !val[2].result) { - window.showErrorMessage("Namespace not set \n" + val[2].error); + if (target === 'openshift' && val[3].result) { + env.NAMESPACE = val[3].value.trim(); + } else if (target === 'openshift' && val[3].result === undefined) { + window.showErrorMessage("Namespace not set \n" + val[3].error); } + const deployCommand: string = workspace.getConfiguration().get("Karavan.".concat(runtime.replaceAll("-", "")).concat(utils.capitalize(target)).concat("Deploy")) || ''; + const command = createExportCommand().concat(" && ").concat(deployCommand).concat(" -f ").concat(exportFolder); camelRunDeploy(command, env); }).catch((reason: any) => { window.showErrorMessage("Error: \n" + reason.message); @@ -190,10 +184,3 @@ function setMinikubeEnvVariables(env: string): Map<string, string> { }) return map; } - -function removeMinikubeEnvVariables() { - delete shell.env['DOCKER_TLS_VERIFY']; - delete shell.env['DOCKER_HOST']; - delete shell.env['DOCKER_CERT_PATH']; - delete shell.env['MINIKUBE_ACTIVE_DOCKERD']; -} \ No newline at end of file diff --git a/karavan-vscode/src/utils.ts b/karavan-vscode/src/utils.ts index b24a666..9cfad7c 100644 --- a/karavan-vscode/src/utils.ts +++ b/karavan-vscode/src/utils.ts @@ -168,6 +168,8 @@ export async function getIntegrationFiles(baseDir: string) { export async function getProperties(rootPath?: string) { + if (rootPath === undefined) + rootPath = (workspace.workspaceFolders && (workspace.workspaceFolders.length > 0)) ? workspace.workspaceFolders[0].uri.fsPath : undefined; if (rootPath) { const readData = await readFile(path.resolve(rootPath, "application.properties")); return Buffer.from(readData).toString('utf8'); @@ -177,6 +179,29 @@ export async function getProperties(rootPath?: string) { } } +export async function getProperty(name: string) { + const properties = await getProperties(); + const props = properties.split("\n"); + for (var p of props){ + const pair = p.split("="); + if (pair[0] === name) { + return pair[1]; + } + } +} + +export async function getRuntime() { + return getProperty("camel.jbang.runtime"); +;} + +export async function getTarget() { + return getProperty('camel.karavan.target'); +} + +export async function getExportFolder() { + return getProperty('camel.jbang.exportDir'); +} + export async function stat(fullPath: string) { const uriFile: Uri = Uri.file(fullPath); return workspace.fs.stat(uriFile); @@ -201,26 +226,38 @@ export async function write(fullPath: string, code: string) { ); } -export async function createApplicationproperties(runtime: string, gav: string, deployTarget: string ) { +export function capitalize (text) { + return text.charAt(0).toUpperCase() + text.slice(1).toLowerCase(); +} + +export function defaultGAV (): string | undefined { + const groupId = workspace.getConfiguration().get("Karavan.defaultGroupId"); + const artifact = currentFolderName(); + return groupId + ":" + artifact + ":1"; +} + +export function currentFolderName (): string | undefined { if (workspace.workspaceFolders) { const uriFolder: Uri = workspace.workspaceFolders[0].uri; const parts = uriFolder.fsPath.split(path.sep); const name = parts.at(parts.length -1) || ''; + return name; + } +} + +export async function createApplicationproperties(runtime: string, gav: string, target: string ) { + if (workspace.workspaceFolders) { + const uriFolder: Uri = workspace.workspaceFolders[0].uri; + const name = currentFolderName() || ""; - const runtimeVersion: string = workspace.getConfiguration().get("camel." + runtime + "-version") || ''; const props: string [] = workspace.getConfiguration().get("Karavan.applicationProperties") || []; - const imageBuildProps: string [] = workspace.getConfiguration().get("Karavan.imageBuildProperties") || []; - const targetProps: string [] = - deployTarget === 'openshift' ? (workspace.getConfiguration().get("Karavan.openshiftProperties") || []) - : []; - const runtimeDefaults: [] = (runtime === 'quarkus') - ? workspace.getConfiguration().get("Karavan.quarkusApplicationProperties") || [] - : []; - const text = props.concat(runtimeDefaults).concat("\n").concat(imageBuildProps).concat("\n").concat(targetProps).map(v => { + const runtimeProps: string [] = workspace.getConfiguration().get("Karavan.".concat(runtime.replaceAll("-", "")).concat(capitalize(target)).concat("Properties")) || []; + + const text = props.concat(runtimeProps).map(v => { if (v.includes('$NAME')) return v.replace('$NAME', name) else if (v.includes('$GAV')) return v.replace('$GAV', gav) - else if (v.includes('$RUNTIME_VERSION')) return v.replace('$RUNTIME_VERSION', runtimeVersion) // $RUNTIME_VERSION should be before $RUNTIME else if (v.includes('$RUNTIME')) return v.replace('$RUNTIME', runtime) + else if (v.includes('$TARGET')) return v.replace('$TARGET', target) else return v; }).join('\n'); write(path.join(uriFolder.path, "application.properties"), text);
