From a26c5b6e07bc5f6872feee3446083d9a79be8b69 Mon Sep 17 00:00:00 2001 From: Maximiliano Pizarro Date: Wed, 5 Mar 2025 17:58:56 +0000 Subject: [PATCH 1/7] add kaoto project Signed-off-by: Maximiliano Pizarro --- stacks/kaoto/devfile.yaml | 146 ++++++++++++++++++++++++++++++++++++++ tests/check_odov3.sh | 1 + 2 files changed, 147 insertions(+) create mode 100644 stacks/kaoto/devfile.yaml diff --git a/stacks/kaoto/devfile.yaml b/stacks/kaoto/devfile.yaml new file mode 100644 index 00000000..081f8211 --- /dev/null +++ b/stacks/kaoto/devfile.yaml @@ -0,0 +1,146 @@ +schemaVersion: 2.2.2 +metadata: + name: kaoto + version: 2.5.0 + description: The Integration Designer for Apache Camel + displayName: Kaoto + icon: https://raw.githubusercontent.com/KaotoIO/kaoto/refs/heads/main/packages/ui/src/assets/logo-kaoto.svg + website: https://kaoto.io + tags: + - JavaScript + - React + - Quarkus + - Camel + - Podman + language: JavaScript + projectType: "Node.js" +projects: + - name: kaoto + git: + remotes: + origin: 'https://github.com/KaotoIO/kaoto' + checkoutFrom: + revision: main +components: + - name: tools + container: + image: quay.io/devfile/universal-developer-image:latest + memoryLimit: 8Gi + memoryRequest: 1Gi + cpuLimit: "2" + cpuRequest: 200m + env: + - name: KUBEDOCK_PARAMS + value: "--reverse-proxy --kubeconfig /home/user/.kube/config --initimage quay.io/agiertli/kubedock:0.13.0" + - name: USE_JAVA17 + value: "true" + - value: /home/jboss/.m2 + name: MAVEN_CONFIG + - value: -Xmx4G -Xss128M -XX:MetaspaceSize=1G -XX:MaxMetaspaceSize=2G + name: MAVEN_OPTS + - name: KUBEDOCK_ENABLED + value: 'true' + - name: DOCKER_HOST + value: 'tcp://127.0.0.1:2475' + - name: TESTCONTAINERS_RYUK_DISABLED + value: 'true' + - name: TESTCONTAINERS_CHECKS_DISABLE + value: 'true' + endpoints: + - exposure: none + name: kubedock + protocol: tcp + targetPort: 2475 + - exposure: public + name: http-booster + protocol: http + targetPort: 8080 + attributes: + discoverable: true + urlRewriteSupported: true + - exposure: public + name: kaoto + protocol: http + targetPort: 4173 + attributes: + discoverable: true + urlRewriteSupported: true + - exposure: internal + name: debug + protocol: http + targetPort: 5005 + volumeMounts: + - name: m2 + path: /home/user/.m2 + - name: npm + path: /home/user/.npm + - name: m2 + volume: + size: 512Mi + - name: npm + volume: + size: 512Mi +commands: + - id: yarn-install + exec: + label: 'Install Dependencies' + component: tools + workingDir: ${PROJECT_SOURCE} + commandLine: 'yarn install' + group: + kind: build + isDefault: true + - id: build + exec: + label: 'Build' + component: tools + workingDir: ${PROJECT_SOURCE} + commandLine: 'yarn workspace @kaoto/kaoto run build' + group: + kind: build + isDefault: true + - id: build-public-componets + exec: + label: 'build the public components' + component: tools + workingDir: ${PROJECT_SOURCE} + commandLine: 'yarn workspace @kaoto/kaoto run build:lib' + group: + kind: build + isDefault: true + - id: build-camel-catalog-supporting-schemas + exec: + label: 'build the Camel Catalog and the supporting schemas' + component: tools + workingDir: ${PROJECT_SOURCE} + commandLine: 'yarn workspace @kaoto/camel-catalog run build' + group: + kind: build + isDefault: true + - id: start-development-server + exec: + label: 'start the development server' + component: tools + workingDir: ${PROJECT_SOURCE} + commandLine: 'yarn workspace @kaoto/kaoto run start --host' + group: + kind: run + isDefault: true + - id: start-storybook + exec: + label: 'run the storybook' + component: tools + workingDir: ${PROJECT_SOURCE} + commandLine: 'yarn workspace @kaoto/kaoto-tests storybook' + group: + kind: run + isDefault: false + - id: start-with-docker + exec: + label: 'Running kaoto with Docker' + component: tools + workingDir: ${PROJECT_SOURCE} + commandLine: 'podman run --rm -p 8080:8080 --name kaoto quay.io/kaotoio/kaoto-app:main' + group: + kind: run + isDefault: false \ No newline at end of file diff --git a/tests/check_odov3.sh b/tests/check_odov3.sh index c502e943..970121e9 100755 --- a/tests/check_odov3.sh +++ b/tests/check_odov3.sh @@ -55,6 +55,7 @@ ginkgo run --procs 2 \ --skip="stack: java-vertx version: 1.4.0 starter: vertx-messaging-work-queue-booster" \ --skip="stack: java-websphereliberty-gradle version: 0.4.0 starter: rest" \ --skip="stack: jhipster-online" \ + --skip="stack: kaoto" \ --skip="stack: java-wildfly-bootable-jar" \ --skip="stack: java-wildfly" \ --skip="stack: java-openliberty" \ From 87b20aa4141dc7ed7de50577c77dd89aaf611090 Mon Sep 17 00:00:00 2001 From: Maximiliano Pizarro Date: Wed, 5 Mar 2025 20:13:09 +0000 Subject: [PATCH 2/7] kind build isDefault false Signed-off-by: Maximiliano Pizarro --- stacks/kaoto/devfile.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stacks/kaoto/devfile.yaml b/stacks/kaoto/devfile.yaml index 081f8211..967cc789 100644 --- a/stacks/kaoto/devfile.yaml +++ b/stacks/kaoto/devfile.yaml @@ -98,7 +98,7 @@ commands: commandLine: 'yarn workspace @kaoto/kaoto run build' group: kind: build - isDefault: true + isDefault: false - id: build-public-componets exec: label: 'build the public components' @@ -107,7 +107,7 @@ commands: commandLine: 'yarn workspace @kaoto/kaoto run build:lib' group: kind: build - isDefault: true + isDefault: false - id: build-camel-catalog-supporting-schemas exec: label: 'build the Camel Catalog and the supporting schemas' @@ -116,7 +116,7 @@ commands: commandLine: 'yarn workspace @kaoto/camel-catalog run build' group: kind: build - isDefault: true + isDefault: false - id: start-development-server exec: label: 'start the development server' From de0323259b553688a83b6ac366017e1e8d468dd2 Mon Sep 17 00:00:00 2001 From: Maximiliano Pizarro Date: Mon, 10 Mar 2025 12:43:59 +0000 Subject: [PATCH 3/7] added sha to container image Signed-off-by: Maximiliano Pizarro --- stacks/kaoto/devfile.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stacks/kaoto/devfile.yaml b/stacks/kaoto/devfile.yaml index 967cc789..ae1fd8ea 100644 --- a/stacks/kaoto/devfile.yaml +++ b/stacks/kaoto/devfile.yaml @@ -24,7 +24,7 @@ projects: components: - name: tools container: - image: quay.io/devfile/universal-developer-image:latest + image: quay.io/devfile/universal-developer-image@sha256:08cf567a02fa70043cad4c1bc6a98e04a7e3f108d2f145929bed80d248fd94fa memoryLimit: 8Gi memoryRequest: 1Gi cpuLimit: "2" From 46499202d179fc4f8353c5a42bdb1e97f83aa4ff Mon Sep 17 00:00:00 2001 From: Maximiliano Pizarro Date: Mon, 10 Mar 2025 12:46:21 +0000 Subject: [PATCH 4/7] added kaoto to CODEOWNERS file Signed-off-by: Maximiliano Pizarro --- .github/CODEOWNERS | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index dc61bf68..d1765282 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -54,4 +54,7 @@ /stacks/ollama @ibuziuk @manhah @devfile/che-team # JHipster stacks - On trial -/stacks/jhipster-online/ @devfile/devfile-services-team @devfile/che-team \ No newline at end of file +/stacks/jhipster-online/ @devfile/devfile-services-team @devfile/che-team + +# Kaoto stacks +/stacks/kaoto/ @devfile/devfile-services-team @devfile/che-team \ No newline at end of file From 0fc0ce14bf5376f25e5942458b1ab5058a0e7e3e Mon Sep 17 00:00:00 2001 From: Maximiliano Pizarro Date: Tue, 11 Mar 2025 12:55:38 +0000 Subject: [PATCH 5/7] Order number is added to identify execution steps. Signed-off-by: Maximiliano Pizarro --- stacks/kaoto/devfile.yaml | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/stacks/kaoto/devfile.yaml b/stacks/kaoto/devfile.yaml index ae1fd8ea..cbb66089 100644 --- a/stacks/kaoto/devfile.yaml +++ b/stacks/kaoto/devfile.yaml @@ -83,52 +83,52 @@ components: commands: - id: yarn-install exec: - label: 'Install Dependencies' + label: '1. Install Dependencies' component: tools workingDir: ${PROJECT_SOURCE} commandLine: 'yarn install' group: kind: build isDefault: true - - id: build - exec: - label: 'Build' - component: tools - workingDir: ${PROJECT_SOURCE} - commandLine: 'yarn workspace @kaoto/kaoto run build' - group: - kind: build - isDefault: false - - id: build-public-componets + - id: build-camel-catalog-supporting-schemas exec: - label: 'build the public components' + label: '2. Build the Camel Catalog and the supporting schemas' component: tools workingDir: ${PROJECT_SOURCE} - commandLine: 'yarn workspace @kaoto/kaoto run build:lib' + commandLine: 'yarn workspace @kaoto/camel-catalog run build' group: kind: build isDefault: false - - id: build-camel-catalog-supporting-schemas + - id: build exec: - label: 'build the Camel Catalog and the supporting schemas' + label: '3. Build' component: tools workingDir: ${PROJECT_SOURCE} - commandLine: 'yarn workspace @kaoto/camel-catalog run build' + commandLine: 'yarn workspace @kaoto/kaoto run build' group: kind: build isDefault: false - id: start-development-server exec: - label: 'start the development server' + label: '4. Start the development server' component: tools workingDir: ${PROJECT_SOURCE} commandLine: 'yarn workspace @kaoto/kaoto run start --host' group: kind: run isDefault: true + - id: build-public-componets + exec: + label: '(optional). Build the public components' + component: tools + workingDir: ${PROJECT_SOURCE} + commandLine: 'yarn workspace @kaoto/kaoto run build:lib' + group: + kind: build + isDefault: false - id: start-storybook exec: - label: 'run the storybook' + label: '(optional). Run the storybook' component: tools workingDir: ${PROJECT_SOURCE} commandLine: 'yarn workspace @kaoto/kaoto-tests storybook' @@ -137,7 +137,7 @@ commands: isDefault: false - id: start-with-docker exec: - label: 'Running kaoto with Docker' + label: '(optional). Running kaoto with Docker' component: tools workingDir: ${PROJECT_SOURCE} commandLine: 'podman run --rm -p 8080:8080 --name kaoto quay.io/kaotoio/kaoto-app:main' From 5dd152075c9b1585b644e3d8839e8fbc12714585 Mon Sep 17 00:00:00 2001 From: Maximiliano Pizarro Date: Tue, 11 Mar 2025 12:57:47 +0000 Subject: [PATCH 6/7] http to https and name endpoint Signed-off-by: Maximiliano Pizarro --- stacks/kaoto/devfile.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stacks/kaoto/devfile.yaml b/stacks/kaoto/devfile.yaml index cbb66089..b7a4618e 100644 --- a/stacks/kaoto/devfile.yaml +++ b/stacks/kaoto/devfile.yaml @@ -52,15 +52,15 @@ components: protocol: tcp targetPort: 2475 - exposure: public - name: http-booster - protocol: http + name: kaoto-podman + protocol: https targetPort: 8080 attributes: discoverable: true urlRewriteSupported: true - exposure: public name: kaoto - protocol: http + protocol: https targetPort: 4173 attributes: discoverable: true From 5e34401e398fc966d814f65c01f4a97591100817 Mon Sep 17 00:00:00 2001 From: Maximiliano Pizarro Date: Tue, 11 Mar 2025 13:00:08 +0000 Subject: [PATCH 7/7] added an empty line Signed-off-by: Maximiliano Pizarro --- stacks/kaoto/devfile.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stacks/kaoto/devfile.yaml b/stacks/kaoto/devfile.yaml index b7a4618e..0f129424 100644 --- a/stacks/kaoto/devfile.yaml +++ b/stacks/kaoto/devfile.yaml @@ -137,10 +137,10 @@ commands: isDefault: false - id: start-with-docker exec: - label: '(optional). Running kaoto with Docker' + label: '(optional). Running kaoto with Podman' component: tools workingDir: ${PROJECT_SOURCE} commandLine: 'podman run --rm -p 8080:8080 --name kaoto quay.io/kaotoio/kaoto-app:main' group: kind: run - isDefault: false \ No newline at end of file + isDefault: false