From 4a74c38a510e3e828e674096644988b5f6618025 Mon Sep 17 00:00:00 2001 From: Guillem Gari Date: Thu, 25 Jul 2024 12:30:37 +0200 Subject: [PATCH 01/19] changed folder name from helm to charts --- {helm => charts}/artifacthub-repo.yml | 0 {helm => charts}/rb-theron-sim/Chart.yaml | 0 {helm => charts}/rb-theron-sim/README.md | 0 .../rb-theron-sim/templates/01-environments-configmap.yaml | 0 .../rb-theron-sim/templates/01-zenoh-rmw-configmap.yaml | 0 {helm => charts}/rb-theron-sim/templates/02-ingress-rules.yaml | 0 {helm => charts}/rb-theron-sim/templates/02-services.yaml | 0 .../rb-theron-sim/templates/03-gazebo-server-deployment.yaml | 0 .../rb-theron-sim/templates/03-map-laser-merger-deployment.yaml | 0 .../rb-theron-sim/templates/03-map-localization-deployment.yaml | 0 .../rb-theron-sim/templates/03-map-navigation-deployment.yaml | 0 .../rb-theron-sim/templates/03-map-server-deployment.yaml | 0 .../rb-theron-sim/templates/03-router-deployment.yaml | 0 {helm => charts}/rb-theron-sim/templates/03-rviz.yaml | 0 {helm => charts}/rb-theron-sim/templates/NOTES.txt | 0 {helm => charts}/rb-theron-sim/templates/_helpers.tpl | 0 {helm => charts}/rb-theron-sim/values-iron-zenoh.yaml | 0 {helm => charts}/rb-theron-sim/values.yaml | 0 18 files changed, 0 insertions(+), 0 deletions(-) rename {helm => charts}/artifacthub-repo.yml (100%) rename {helm => charts}/rb-theron-sim/Chart.yaml (100%) rename {helm => charts}/rb-theron-sim/README.md (100%) rename {helm => charts}/rb-theron-sim/templates/01-environments-configmap.yaml (100%) rename {helm => charts}/rb-theron-sim/templates/01-zenoh-rmw-configmap.yaml (100%) rename {helm => charts}/rb-theron-sim/templates/02-ingress-rules.yaml (100%) rename {helm => charts}/rb-theron-sim/templates/02-services.yaml (100%) rename {helm => charts}/rb-theron-sim/templates/03-gazebo-server-deployment.yaml (100%) rename {helm => charts}/rb-theron-sim/templates/03-map-laser-merger-deployment.yaml (100%) rename {helm => charts}/rb-theron-sim/templates/03-map-localization-deployment.yaml (100%) rename {helm => charts}/rb-theron-sim/templates/03-map-navigation-deployment.yaml (100%) rename {helm => charts}/rb-theron-sim/templates/03-map-server-deployment.yaml (100%) rename {helm => charts}/rb-theron-sim/templates/03-router-deployment.yaml (100%) rename {helm => charts}/rb-theron-sim/templates/03-rviz.yaml (100%) rename {helm => charts}/rb-theron-sim/templates/NOTES.txt (100%) rename {helm => charts}/rb-theron-sim/templates/_helpers.tpl (100%) rename {helm => charts}/rb-theron-sim/values-iron-zenoh.yaml (100%) rename {helm => charts}/rb-theron-sim/values.yaml (100%) diff --git a/helm/artifacthub-repo.yml b/charts/artifacthub-repo.yml similarity index 100% rename from helm/artifacthub-repo.yml rename to charts/artifacthub-repo.yml diff --git a/helm/rb-theron-sim/Chart.yaml b/charts/rb-theron-sim/Chart.yaml similarity index 100% rename from helm/rb-theron-sim/Chart.yaml rename to charts/rb-theron-sim/Chart.yaml diff --git a/helm/rb-theron-sim/README.md b/charts/rb-theron-sim/README.md similarity index 100% rename from helm/rb-theron-sim/README.md rename to charts/rb-theron-sim/README.md diff --git a/helm/rb-theron-sim/templates/01-environments-configmap.yaml b/charts/rb-theron-sim/templates/01-environments-configmap.yaml similarity index 100% rename from helm/rb-theron-sim/templates/01-environments-configmap.yaml rename to charts/rb-theron-sim/templates/01-environments-configmap.yaml diff --git a/helm/rb-theron-sim/templates/01-zenoh-rmw-configmap.yaml b/charts/rb-theron-sim/templates/01-zenoh-rmw-configmap.yaml similarity index 100% rename from helm/rb-theron-sim/templates/01-zenoh-rmw-configmap.yaml rename to charts/rb-theron-sim/templates/01-zenoh-rmw-configmap.yaml diff --git a/helm/rb-theron-sim/templates/02-ingress-rules.yaml b/charts/rb-theron-sim/templates/02-ingress-rules.yaml similarity index 100% rename from helm/rb-theron-sim/templates/02-ingress-rules.yaml rename to charts/rb-theron-sim/templates/02-ingress-rules.yaml diff --git a/helm/rb-theron-sim/templates/02-services.yaml b/charts/rb-theron-sim/templates/02-services.yaml similarity index 100% rename from helm/rb-theron-sim/templates/02-services.yaml rename to charts/rb-theron-sim/templates/02-services.yaml diff --git a/helm/rb-theron-sim/templates/03-gazebo-server-deployment.yaml b/charts/rb-theron-sim/templates/03-gazebo-server-deployment.yaml similarity index 100% rename from helm/rb-theron-sim/templates/03-gazebo-server-deployment.yaml rename to charts/rb-theron-sim/templates/03-gazebo-server-deployment.yaml diff --git a/helm/rb-theron-sim/templates/03-map-laser-merger-deployment.yaml b/charts/rb-theron-sim/templates/03-map-laser-merger-deployment.yaml similarity index 100% rename from helm/rb-theron-sim/templates/03-map-laser-merger-deployment.yaml rename to charts/rb-theron-sim/templates/03-map-laser-merger-deployment.yaml diff --git a/helm/rb-theron-sim/templates/03-map-localization-deployment.yaml b/charts/rb-theron-sim/templates/03-map-localization-deployment.yaml similarity index 100% rename from helm/rb-theron-sim/templates/03-map-localization-deployment.yaml rename to charts/rb-theron-sim/templates/03-map-localization-deployment.yaml diff --git a/helm/rb-theron-sim/templates/03-map-navigation-deployment.yaml b/charts/rb-theron-sim/templates/03-map-navigation-deployment.yaml similarity index 100% rename from helm/rb-theron-sim/templates/03-map-navigation-deployment.yaml rename to charts/rb-theron-sim/templates/03-map-navigation-deployment.yaml diff --git a/helm/rb-theron-sim/templates/03-map-server-deployment.yaml b/charts/rb-theron-sim/templates/03-map-server-deployment.yaml similarity index 100% rename from helm/rb-theron-sim/templates/03-map-server-deployment.yaml rename to charts/rb-theron-sim/templates/03-map-server-deployment.yaml diff --git a/helm/rb-theron-sim/templates/03-router-deployment.yaml b/charts/rb-theron-sim/templates/03-router-deployment.yaml similarity index 100% rename from helm/rb-theron-sim/templates/03-router-deployment.yaml rename to charts/rb-theron-sim/templates/03-router-deployment.yaml diff --git a/helm/rb-theron-sim/templates/03-rviz.yaml b/charts/rb-theron-sim/templates/03-rviz.yaml similarity index 100% rename from helm/rb-theron-sim/templates/03-rviz.yaml rename to charts/rb-theron-sim/templates/03-rviz.yaml diff --git a/helm/rb-theron-sim/templates/NOTES.txt b/charts/rb-theron-sim/templates/NOTES.txt similarity index 100% rename from helm/rb-theron-sim/templates/NOTES.txt rename to charts/rb-theron-sim/templates/NOTES.txt diff --git a/helm/rb-theron-sim/templates/_helpers.tpl b/charts/rb-theron-sim/templates/_helpers.tpl similarity index 100% rename from helm/rb-theron-sim/templates/_helpers.tpl rename to charts/rb-theron-sim/templates/_helpers.tpl diff --git a/helm/rb-theron-sim/values-iron-zenoh.yaml b/charts/rb-theron-sim/values-iron-zenoh.yaml similarity index 100% rename from helm/rb-theron-sim/values-iron-zenoh.yaml rename to charts/rb-theron-sim/values-iron-zenoh.yaml diff --git a/helm/rb-theron-sim/values.yaml b/charts/rb-theron-sim/values.yaml similarity index 100% rename from helm/rb-theron-sim/values.yaml rename to charts/rb-theron-sim/values.yaml From afd250831027b5d10dbb9fd21297d18a51b65e2e Mon Sep 17 00:00:00 2001 From: Guillem Gari Date: Thu, 25 Jul 2024 12:30:58 +0200 Subject: [PATCH 02/19] added github workflow --- .github/workflows/helm-releaser.yaml | 29 ++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .github/workflows/helm-releaser.yaml diff --git a/.github/workflows/helm-releaser.yaml b/.github/workflows/helm-releaser.yaml new file mode 100644 index 0000000..cc79654 --- /dev/null +++ b/.github/workflows/helm-releaser.yaml @@ -0,0 +1,29 @@ +--- +name: Release Charts + +on: + push: + branches: + - devel + workflow_dispatch: + +jobs: + release: + permissions: + contents: write + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Configure Git + run: | + git config user.name "$GITHUB_ACTOR" + git config user.email "$GITHUB_ACTOR@users.noreply.github.com" + + - name: Run chart-releaser + uses: helm/chart-releaser-action@v1.6.0 + env: + CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}" From 13c3f9820262bb443288698a11d91ab1cece4f29 Mon Sep 17 00:00:00 2001 From: Guillem Gari Date: Thu, 25 Jul 2024 16:45:40 +0200 Subject: [PATCH 03/19] Release 0.0.2 --- charts/rb-theron-sim/Chart.yaml | 6 +-- charts/rb-theron-sim/README.md | 42 ++++++++++++++++++++- charts/rb-theron-sim/values-iron-zenoh.yaml | 27 +++++++++++-- charts/rb-theron-sim/values.yaml | 31 +++++++++++++++ 4 files changed, 97 insertions(+), 9 deletions(-) diff --git a/charts/rb-theron-sim/Chart.yaml b/charts/rb-theron-sim/Chart.yaml index 30606ac..3907e14 100644 --- a/charts/rb-theron-sim/Chart.yaml +++ b/charts/rb-theron-sim/Chart.yaml @@ -2,7 +2,7 @@ name: rb-theron-sim description: Robotnik RB-THERON Simulation on ROS2 type: application -version: 0.0.1 +version: 0.0.2 apiVersion: v2 keywords: - kubernetes @@ -24,8 +24,8 @@ maintainers: annotations: artifacthub.io/changes: | - kind: Added - description: "first version" + description: "Added Readme content" artifacthub.io/license: BSD 3-Clause artifacthub.io/screenshots: | - title: Rviz interface - url: https://github.com/fluidos-project/robotic-logistics-use-case/blob/main/doc/k8s-ros2-rb-theron-rviz-web.gif \ No newline at end of file + url: https://github.com/fluidos-project/robotic-logistics-use-case/blob/main/doc/rb-theron-rviz-02.png \ No newline at end of file diff --git a/charts/rb-theron-sim/README.md b/charts/rb-theron-sim/README.md index a840a9e..31af429 100644 --- a/charts/rb-theron-sim/README.md +++ b/charts/rb-theron-sim/README.md @@ -1,3 +1,41 @@ -# RB-THERON Simulation Helm Chart +# rb-theron-sim -Helm chart for Robotnik RB-THERON simulation for ROS2 +![Version: 0.0.1](https://img.shields.io/badge/Version-0.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) + +Robotnik RB-THERON Simulation on ROS2 + +**Homepage:** + +## Maintainers + +| Name | Email | Url | +| ---- | ------ | --- | +| Guillem Gari | | | + +## Source Code + +* + +## Values + +| Key | Type | Default | Description | +|-----|------|---------|-------------| +| containers.environment.production | bool | `true` | Removes the debug features. | +| ros.discovery | string | `"subnet"` | Middleware automatic discovery range. Allowed values: `localhost` `subnet`, `off` or `system_default`. | +| ros.distro | string | `"humble"` | ROS distribution. Allowed values: `humble` or `iron`. | +| ros.gazebo.map | string | `"opil_factory"` | Map to use in the simulation. | +| ros.images.simulation.flavor | string | `"rb-theron-gazebo"` | flavor tag for simulation image | +| ros.images.simulation.project | string | `"robotnik"` | project for simulation image | +| ros.images.simulation.registry | string | `"docker.io"` | registry for simulation image | +| ros.images.simulation.repository | string | `"robotnik-simulations"` | repository for simulation image | +| ros.images.simulation.version | string | `"0.3.0-rc07"` | version tag for simulation image | +| ros.images.zenoh.project | string | `"robotnik"` | project for zenoh-router image. ignored if `ros.rwm` is not `rmw_zenoh_cpp` | +| ros.images.zenoh.registry | string | `"docker.io"` | registry for zenoh-router image. ignored if `ros.rwm` is not `rmw_zenoh_cpp` | +| ros.images.zenoh.repository | string | `"zenoh-rmw"` | repository for zenoh-router image. ignored if `ros.rwm` is not `rmw_zenoh_cpp` | +| ros.images.zenoh.version | string | `"0.0.1-rc00"` | version tag for zenoh-router image. ignored if `ros.rwm` is not `rmw_zenoh_cpp` | +| ros.rmw | string | `"rmw_cyclonedds_cpp"` | ROS MiddleWare Implementation. Allowed values: `rmw_cyclonedds_cpp` `rmw_fastrtps_cpp`, or `rmw_zenoh_cpp`. zenoh is only available in distro `iron` or above | +| services.gazebo.name | string | `"robots-gazebo"` | service name. | +| services.gazebo.port | int | `11345` | service port. | +| services.zenoh.name | string | `"zenoh-router"` | router service name. ignored if `ros.rwm` is not `rmw_zenoh_cpp` | +| services.zenoh.port | int | `7447` | router service port. ignored if `ros.rwm` is not `rmw_zenoh_cpp` | +| services.zenoh.proto | string | `"TCP"` | router service protocol. ignored if `ros.rwm` is not `rmw_zenoh_cpp` | diff --git a/charts/rb-theron-sim/values-iron-zenoh.yaml b/charts/rb-theron-sim/values-iron-zenoh.yaml index ac17d00..f7dcee5 100644 --- a/charts/rb-theron-sim/values-iron-zenoh.yaml +++ b/charts/rb-theron-sim/values-iron-zenoh.yaml @@ -1,33 +1,52 @@ --- +## @section Containers parameters containers: environment: + # -- Removes the debug features. production: false +## @section ROS parameters ros: + # -- ROS MiddleWare Implementation. Allowed values: `rmw_cyclonedds_cpp` `rmw_fastrtps_cpp`, or `rmw_zenoh_cpp`. zenoh is only available in distro `iron` or above rmw: rmw_zenoh_cpp - # rmw: rmw_cyclonedds_cpp - # NOT WORKING - # discovery: localhost + # -- Middleware automatic discovery range. Allowed values: `localhost` `subnet`, `off` or `system_default`. discovery: subnet + # -- ROS distribution. Allowed values: `humble` or `iron`. distro: iron images: simulation: + # -- registry for simulation image registry: "docker.io" + # -- project for simulation image project: "robotnik" + # -- repository for simulation image repository: "robotnik-simulations" + # -- flavor tag for simulation image flavor: "rb-theron-gazebo" + # -- version tag for simulation image version: 0.3.0-rc07 zenoh: + # -- registry for zenoh-router image. ignored if `ros.rwm` is not `rmw_zenoh_cpp` registry: "docker.io" + # -- project for zenoh-router image. ignored if `ros.rwm` is not `rmw_zenoh_cpp` project: "robotnik" + # -- repository for zenoh-router image. ignored if `ros.rwm` is not `rmw_zenoh_cpp` repository: "zenoh-rmw" + # -- version tag for zenoh-router image. ignored if `ros.rwm` is not `rmw_zenoh_cpp` version: 0.0.1-rc00 gazebo: + # -- Map to use in the simulation. map: opil_factory +## @section Services parameters services: gazebo: + # -- service name. name: robots-gazebo + # -- service port. port: 11345 zenoh: + # -- router service name. ignored if `ros.rwm` is not `rmw_zenoh_cpp` name: zenoh-router + # -- router service port. ignored if `ros.rwm` is not `rmw_zenoh_cpp` port: 7447 - proto: TCP + # -- router service protocol. ignored if `ros.rwm` is not `rmw_zenoh_cpp` + proto: TCP \ No newline at end of file diff --git a/charts/rb-theron-sim/values.yaml b/charts/rb-theron-sim/values.yaml index 1204e59..8af9b14 100644 --- a/charts/rb-theron-sim/values.yaml +++ b/charts/rb-theron-sim/values.yaml @@ -1,21 +1,52 @@ --- +## @section Containers parameters containers: environment: + # -- Removes the debug features. production: true +## @section ROS parameters ros: + # -- ROS MiddleWare Implementation. Allowed values: `rmw_cyclonedds_cpp` `rmw_fastrtps_cpp`, or `rmw_zenoh_cpp`. zenoh is only available in distro `iron` or above rmw: rmw_cyclonedds_cpp + # -- Middleware automatic discovery range. Allowed values: `localhost` `subnet`, `off` or `system_default`. discovery: subnet + # -- ROS distribution. Allowed values: `humble` or `iron`. distro: humble images: simulation: + # -- registry for simulation image registry: "docker.io" + # -- project for simulation image project: "robotnik" + # -- repository for simulation image repository: "robotnik-simulations" + # -- flavor tag for simulation image flavor: "rb-theron-gazebo" + # -- version tag for simulation image version: 0.3.0-rc07 + zenoh: + # -- registry for zenoh-router image. ignored if `ros.rwm` is not `rmw_zenoh_cpp` + registry: "docker.io" + # -- project for zenoh-router image. ignored if `ros.rwm` is not `rmw_zenoh_cpp` + project: "robotnik" + # -- repository for zenoh-router image. ignored if `ros.rwm` is not `rmw_zenoh_cpp` + repository: "zenoh-rmw" + # -- version tag for zenoh-router image. ignored if `ros.rwm` is not `rmw_zenoh_cpp` + version: 0.0.1-rc00 gazebo: + # -- Map to use in the simulation. map: opil_factory +## @section Services parameters services: gazebo: + # -- service name. name: robots-gazebo + # -- service port. port: 11345 + zenoh: + # -- router service name. ignored if `ros.rwm` is not `rmw_zenoh_cpp` + name: zenoh-router + # -- router service port. ignored if `ros.rwm` is not `rmw_zenoh_cpp` + port: 7447 + # -- router service protocol. ignored if `ros.rwm` is not `rmw_zenoh_cpp` + proto: TCP From 2281b428817c48788798884b72015118f1488782 Mon Sep 17 00:00:00 2001 From: Guillem Gari Date: Thu, 25 Jul 2024 17:02:28 +0200 Subject: [PATCH 04/19] added documentation action --- .github/workflows/helm-doc.yaml | 34 +++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 .github/workflows/helm-doc.yaml diff --git a/.github/workflows/helm-doc.yaml b/.github/workflows/helm-doc.yaml new file mode 100644 index 0000000..bc4678e --- /dev/null +++ b/.github/workflows/helm-doc.yaml @@ -0,0 +1,34 @@ +--- +name: documentation + +on: + push: + branches: + - devel + workflow_dispatch: + +jobs: + release: + permissions: + contents: write + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Configure Git + run: | + git config user.name "$GITHUB_ACTOR" + git config user.email "$GITHUB_ACTOR@users.noreply.github.com" + - uses: addnab/docker-run-action@v3 + working-directory: ./charts + with: + options: -v ${{ github.workspace }}:/helm-docs -u $(id -u) + image: jnorwood/helm-docs:v1.14.2 + run: --skip-version-footer + # Commit all changed files back to the repository + - uses: stefanzweifel/git-auto-commit-action@v5 + with: + commit_message: Update Chart readme From c86551aa248ac63243cfa07972a7120a28ade9d7 Mon Sep 17 00:00:00 2001 From: Guillem Gari Date: Thu, 25 Jul 2024 17:03:39 +0200 Subject: [PATCH 05/19] Corrected action --- .github/workflows/helm-doc.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/helm-doc.yaml b/.github/workflows/helm-doc.yaml index bc4678e..d53b1db 100644 --- a/.github/workflows/helm-doc.yaml +++ b/.github/workflows/helm-doc.yaml @@ -23,9 +23,8 @@ jobs: git config user.name "$GITHUB_ACTOR" git config user.email "$GITHUB_ACTOR@users.noreply.github.com" - uses: addnab/docker-run-action@v3 - working-directory: ./charts with: - options: -v ${{ github.workspace }}:/helm-docs -u $(id -u) + options: -v ${{ github.workspace }}/charts:/helm-docs -u $(id -u) image: jnorwood/helm-docs:v1.14.2 run: --skip-version-footer # Commit all changed files back to the repository From 5209d625864b98faae88d52cd743bfb1657acf4a Mon Sep 17 00:00:00 2001 From: Guillem Gari Date: Thu, 25 Jul 2024 17:04:27 +0200 Subject: [PATCH 06/19] Corrected github action --- .github/workflows/helm-doc.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/helm-doc.yaml b/.github/workflows/helm-doc.yaml index d53b1db..f452464 100644 --- a/.github/workflows/helm-doc.yaml +++ b/.github/workflows/helm-doc.yaml @@ -30,4 +30,4 @@ jobs: # Commit all changed files back to the repository - uses: stefanzweifel/git-auto-commit-action@v5 with: - commit_message: Update Chart readme + commit_message: Update Chart readme From 6db5c963925b347005365100c8dcecf9da75bcb4 Mon Sep 17 00:00:00 2001 From: Guillem Gari Date: Thu, 25 Jul 2024 17:05:22 +0200 Subject: [PATCH 07/19] Corrected github action --- .github/workflows/helm-doc.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/helm-doc.yaml b/.github/workflows/helm-doc.yaml index f452464..34f43d2 100644 --- a/.github/workflows/helm-doc.yaml +++ b/.github/workflows/helm-doc.yaml @@ -24,7 +24,7 @@ jobs: git config user.email "$GITHUB_ACTOR@users.noreply.github.com" - uses: addnab/docker-run-action@v3 with: - options: -v ${{ github.workspace }}/charts:/helm-docs -u $(id -u) + options: -v ${{ github.workspace }}/charts:/helm-docs image: jnorwood/helm-docs:v1.14.2 run: --skip-version-footer # Commit all changed files back to the repository From 85eeebddb0032bd5bfdbde641d57b525a547efda Mon Sep 17 00:00:00 2001 From: Guillem Gari Date: Thu, 25 Jul 2024 17:06:46 +0200 Subject: [PATCH 08/19] Corrected github action --- .github/workflows/helm-doc.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/helm-doc.yaml b/.github/workflows/helm-doc.yaml index 34f43d2..d3dac3e 100644 --- a/.github/workflows/helm-doc.yaml +++ b/.github/workflows/helm-doc.yaml @@ -26,7 +26,7 @@ jobs: with: options: -v ${{ github.workspace }}/charts:/helm-docs image: jnorwood/helm-docs:v1.14.2 - run: --skip-version-footer + run: /usr/bin/helm-docs --skip-version-footer # Commit all changed files back to the repository - uses: stefanzweifel/git-auto-commit-action@v5 with: From 8c4578fc15574a765ba5ef047ed9ecc117669d84 Mon Sep 17 00:00:00 2001 From: ggari-robotnik Date: Thu, 25 Jul 2024 15:07:04 +0000 Subject: [PATCH 09/19] Update Chart readme --- charts/rb-theron-sim/README.md | 2 +- semicolon_delimited_script | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 semicolon_delimited_script diff --git a/charts/rb-theron-sim/README.md b/charts/rb-theron-sim/README.md index 31af429..3747fbd 100644 --- a/charts/rb-theron-sim/README.md +++ b/charts/rb-theron-sim/README.md @@ -1,6 +1,6 @@ # rb-theron-sim -![Version: 0.0.1](https://img.shields.io/badge/Version-0.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) +![Version: 0.0.2](https://img.shields.io/badge/Version-0.0.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) Robotnik RB-THERON Simulation on ROS2 diff --git a/semicolon_delimited_script b/semicolon_delimited_script new file mode 100644 index 0000000..bfcc2f7 --- /dev/null +++ b/semicolon_delimited_script @@ -0,0 +1 @@ +/usr/bin/helm-docs --skip-version-footer From 4115c4df90d83fb4376b9d59426ba224a0946db8 Mon Sep 17 00:00:00 2001 From: Guillem Gari Date: Thu, 25 Jul 2024 17:26:02 +0200 Subject: [PATCH 10/19] Upgraded github action --- .github/workflows/helm-doc.yaml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/helm-doc.yaml b/.github/workflows/helm-doc.yaml index d3dac3e..83f1ed1 100644 --- a/.github/workflows/helm-doc.yaml +++ b/.github/workflows/helm-doc.yaml @@ -27,7 +27,10 @@ jobs: options: -v ${{ github.workspace }}/charts:/helm-docs image: jnorwood/helm-docs:v1.14.2 run: /usr/bin/helm-docs --skip-version-footer - # Commit all changed files back to the repository - - uses: stefanzweifel/git-auto-commit-action@v5 - with: - commit_message: Update Chart readme + - run: | + git commit -m "Update Chart readme" + git push + # # Commit all changed files back to the repository + # - uses: stefanzweifel/git-auto-commit-action@v5 + # with: + # commit_message: Update Chart readme From 1c0d4480295228ac5c3c0609d465a882ab0064a3 Mon Sep 17 00:00:00 2001 From: Guillem Gari Date: Thu, 25 Jul 2024 17:30:49 +0200 Subject: [PATCH 11/19] Corrected github action --- .github/workflows/helm-doc.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/helm-doc.yaml b/.github/workflows/helm-doc.yaml index 83f1ed1..c8bf6ec 100644 --- a/.github/workflows/helm-doc.yaml +++ b/.github/workflows/helm-doc.yaml @@ -28,8 +28,13 @@ jobs: image: jnorwood/helm-docs:v1.14.2 run: /usr/bin/helm-docs --skip-version-footer - run: | - git commit -m "Update Chart readme" - git push + git add . + if ! git diff --cached --quiet; then + git commit -m "Update Chart readme" + git push + else + echo "No changes to commit." + fi # # Commit all changed files back to the repository # - uses: stefanzweifel/git-auto-commit-action@v5 # with: From aa82000d091ac9a1be4a6d06741af4284fbf4bba Mon Sep 17 00:00:00 2001 From: Guillem Gari Date: Thu, 25 Jul 2024 17:31:28 +0200 Subject: [PATCH 12/19] Corrected comments --- charts/rb-theron-sim/Chart.yaml | 3 ++- charts/rb-theron-sim/values-iron-zenoh.yaml | 10 +++++----- charts/rb-theron-sim/values.yaml | 10 +++++----- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/charts/rb-theron-sim/Chart.yaml b/charts/rb-theron-sim/Chart.yaml index 3907e14..150df19 100644 --- a/charts/rb-theron-sim/Chart.yaml +++ b/charts/rb-theron-sim/Chart.yaml @@ -21,6 +21,7 @@ icon: https://avatars.githubusercontent.com/u/7921985?s=200&v=4 maintainers: - name: Guillem Gari url: https://github.com/ggari-robotnik + email: ggari@robotnik.es annotations: artifacthub.io/changes: | - kind: Added @@ -28,4 +29,4 @@ annotations: artifacthub.io/license: BSD 3-Clause artifacthub.io/screenshots: | - title: Rviz interface - url: https://github.com/fluidos-project/robotic-logistics-use-case/blob/main/doc/rb-theron-rviz-02.png \ No newline at end of file + url: https://github.com/fluidos-project/robotic-logistics-use-case/blob/8c4578fc15574a765ba5ef047ed9ecc117669d84/doc/k8s-ros2-rb-theron-rviz-web.gif \ No newline at end of file diff --git a/charts/rb-theron-sim/values-iron-zenoh.yaml b/charts/rb-theron-sim/values-iron-zenoh.yaml index f7dcee5..7de2788 100644 --- a/charts/rb-theron-sim/values-iron-zenoh.yaml +++ b/charts/rb-theron-sim/values-iron-zenoh.yaml @@ -39,14 +39,14 @@ ros: ## @section Services parameters services: gazebo: - # -- service name. + # -- Gazebo service name. name: robots-gazebo - # -- service port. + # -- Gazebo service port. port: 11345 zenoh: - # -- router service name. ignored if `ros.rwm` is not `rmw_zenoh_cpp` + # -- Zenoh router service name. ignored if `ros.rwm` is not `rmw_zenoh_cpp` name: zenoh-router - # -- router service port. ignored if `ros.rwm` is not `rmw_zenoh_cpp` + # -- Zenoh router service port. ignored if `ros.rwm` is not `rmw_zenoh_cpp` port: 7447 - # -- router service protocol. ignored if `ros.rwm` is not `rmw_zenoh_cpp` + # -- Zenoh router service protocol. ignored if `ros.rwm` is not `rmw_zenoh_cpp` proto: TCP \ No newline at end of file diff --git a/charts/rb-theron-sim/values.yaml b/charts/rb-theron-sim/values.yaml index 8af9b14..18ca6f9 100644 --- a/charts/rb-theron-sim/values.yaml +++ b/charts/rb-theron-sim/values.yaml @@ -39,14 +39,14 @@ ros: ## @section Services parameters services: gazebo: - # -- service name. + # -- Gazebo service name. name: robots-gazebo - # -- service port. + # -- Gazebo service port. port: 11345 zenoh: - # -- router service name. ignored if `ros.rwm` is not `rmw_zenoh_cpp` + # -- Zenoh router service name. ignored if `ros.rwm` is not `rmw_zenoh_cpp` name: zenoh-router - # -- router service port. ignored if `ros.rwm` is not `rmw_zenoh_cpp` + # -- Zenoh router service port. ignored if `ros.rwm` is not `rmw_zenoh_cpp` port: 7447 - # -- router service protocol. ignored if `ros.rwm` is not `rmw_zenoh_cpp` + # -- Zenoh router service protocol. ignored if `ros.rwm` is not `rmw_zenoh_cpp` proto: TCP From 4952fa5f21b82c78cedf83b342b2b9eb3b2143e8 Mon Sep 17 00:00:00 2001 From: ggari-robotnik Date: Thu, 25 Jul 2024 15:31:49 +0000 Subject: [PATCH 13/19] Update Chart readme --- charts/rb-theron-sim/README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/charts/rb-theron-sim/README.md b/charts/rb-theron-sim/README.md index 3747fbd..37433b5 100644 --- a/charts/rb-theron-sim/README.md +++ b/charts/rb-theron-sim/README.md @@ -10,7 +10,7 @@ Robotnik RB-THERON Simulation on ROS2 | Name | Email | Url | | ---- | ------ | --- | -| Guillem Gari | | | +| Guillem Gari | | | ## Source Code @@ -34,8 +34,8 @@ Robotnik RB-THERON Simulation on ROS2 | ros.images.zenoh.repository | string | `"zenoh-rmw"` | repository for zenoh-router image. ignored if `ros.rwm` is not `rmw_zenoh_cpp` | | ros.images.zenoh.version | string | `"0.0.1-rc00"` | version tag for zenoh-router image. ignored if `ros.rwm` is not `rmw_zenoh_cpp` | | ros.rmw | string | `"rmw_cyclonedds_cpp"` | ROS MiddleWare Implementation. Allowed values: `rmw_cyclonedds_cpp` `rmw_fastrtps_cpp`, or `rmw_zenoh_cpp`. zenoh is only available in distro `iron` or above | -| services.gazebo.name | string | `"robots-gazebo"` | service name. | -| services.gazebo.port | int | `11345` | service port. | -| services.zenoh.name | string | `"zenoh-router"` | router service name. ignored if `ros.rwm` is not `rmw_zenoh_cpp` | -| services.zenoh.port | int | `7447` | router service port. ignored if `ros.rwm` is not `rmw_zenoh_cpp` | -| services.zenoh.proto | string | `"TCP"` | router service protocol. ignored if `ros.rwm` is not `rmw_zenoh_cpp` | +| services.gazebo.name | string | `"robots-gazebo"` | Gazebo service name. | +| services.gazebo.port | int | `11345` | Gazebo service port. | +| services.zenoh.name | string | `"zenoh-router"` | Zenoh router service name. ignored if `ros.rwm` is not `rmw_zenoh_cpp` | +| services.zenoh.port | int | `7447` | Zenoh router service port. ignored if `ros.rwm` is not `rmw_zenoh_cpp` | +| services.zenoh.proto | string | `"TCP"` | Zenoh router service protocol. ignored if `ros.rwm` is not `rmw_zenoh_cpp` | From 78f8c1d5b59c3cf7f2ea4a22dbf575d0c56012ea Mon Sep 17 00:00:00 2001 From: Guillem Gari Date: Thu, 25 Jul 2024 17:38:48 +0200 Subject: [PATCH 14/19] removed relase on devel --- .github/workflows/helm-doc.yaml | 2 +- .github/workflows/helm-releaser.yaml | 29 ---------------------------- 2 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 .github/workflows/helm-releaser.yaml diff --git a/.github/workflows/helm-doc.yaml b/.github/workflows/helm-doc.yaml index c8bf6ec..3e62fac 100644 --- a/.github/workflows/helm-doc.yaml +++ b/.github/workflows/helm-doc.yaml @@ -30,7 +30,7 @@ jobs: - run: | git add . if ! git diff --cached --quiet; then - git commit -m "Update Chart readme" + git commit -m "Automated chart README.md update" git push else echo "No changes to commit." diff --git a/.github/workflows/helm-releaser.yaml b/.github/workflows/helm-releaser.yaml deleted file mode 100644 index cc79654..0000000 --- a/.github/workflows/helm-releaser.yaml +++ /dev/null @@ -1,29 +0,0 @@ ---- -name: Release Charts - -on: - push: - branches: - - devel - workflow_dispatch: - -jobs: - release: - permissions: - contents: write - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Configure Git - run: | - git config user.name "$GITHUB_ACTOR" - git config user.email "$GITHUB_ACTOR@users.noreply.github.com" - - - name: Run chart-releaser - uses: helm/chart-releaser-action@v1.6.0 - env: - CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}" From d3e9e24ad4a9ef19d706c792b5815f4dd7d18f78 Mon Sep 17 00:00:00 2001 From: Guillem Gari Date: Thu, 25 Jul 2024 17:46:18 +0200 Subject: [PATCH 15/19] updated readme --- README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/README.md b/README.md index 9a998aa..095e259 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,18 @@ Kubernetes manifest files for simulation of a Robotnik RB-theron on ROS2 ### Helm chart +[Helm chart documentation](charts/rb-theron-sim/README.md) + +### helm repo + +```bash +helm repo add fluidos-robotic-uc https://fluidos-project.github.io/robotic-logistics-use-case +helm repo update +helm upgrade --install test fluidos-robotic-uc/rb-theron-sim +``` + +### local development + ```bash git clone https://github.com/fluidos-project/robotic-logistics-use-case.git cd robotic-logistics-use-case/helm From 3c42ee952202b44b0d8131f0683a71a1cab07ce6 Mon Sep 17 00:00:00 2001 From: Guillem Gari Date: Thu, 25 Jul 2024 17:50:55 +0200 Subject: [PATCH 16/19] removed artifacthub unneeded file --- charts/artifacthub-repo.yml | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 charts/artifacthub-repo.yml diff --git a/charts/artifacthub-repo.yml b/charts/artifacthub-repo.yml deleted file mode 100644 index 780d2b1..0000000 --- a/charts/artifacthub-repo.yml +++ /dev/null @@ -1,15 +0,0 @@ -# Artifact Hub repository metadata file -# -# Some settings like the verified publisher flag or the ignored packages won't -# be applied until the next time the repository is processed. Please keep in -# mind that the repository won't be processed if it has not changed since the -# last time it was processed. Depending on the repository kind, this is checked -# in a different way. For Helm http based repositories, we consider it has -# changed if the `index.yaml` file changes. For git based repositories, it does -# when the hash of the last commit in the branch you set up changes. This does -# NOT apply to ownership claim operations, which are processed immediately. -# -repositoryID: -owners: # (optional, used to claim repository ownership) - - name: ggari - email: ggari@robotnik.es From 811f3ea47ef79593726eea97318fe5d6d484c946 Mon Sep 17 00:00:00 2001 From: Guillem Gari Date: Thu, 25 Jul 2024 17:52:37 +0200 Subject: [PATCH 17/19] Version 0.0.3 --- charts/rb-theron-sim/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/rb-theron-sim/Chart.yaml b/charts/rb-theron-sim/Chart.yaml index 150df19..6edc17d 100644 --- a/charts/rb-theron-sim/Chart.yaml +++ b/charts/rb-theron-sim/Chart.yaml @@ -2,7 +2,7 @@ name: rb-theron-sim description: Robotnik RB-THERON Simulation on ROS2 type: application -version: 0.0.2 +version: 0.0.3 apiVersion: v2 keywords: - kubernetes @@ -25,7 +25,7 @@ maintainers: annotations: artifacthub.io/changes: | - kind: Added - description: "Added Readme content" + description: "Format and repository fixing" artifacthub.io/license: BSD 3-Clause artifacthub.io/screenshots: | - title: Rviz interface From 82befe651143b6341e81efac274ad6a11ee0986f Mon Sep 17 00:00:00 2001 From: ggari-robotnik Date: Thu, 25 Jul 2024 15:52:58 +0000 Subject: [PATCH 18/19] Automated chart README.md update --- charts/rb-theron-sim/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/rb-theron-sim/README.md b/charts/rb-theron-sim/README.md index 37433b5..02f135d 100644 --- a/charts/rb-theron-sim/README.md +++ b/charts/rb-theron-sim/README.md @@ -1,6 +1,6 @@ # rb-theron-sim -![Version: 0.0.2](https://img.shields.io/badge/Version-0.0.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) +![Version: 0.0.3](https://img.shields.io/badge/Version-0.0.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) Robotnik RB-THERON Simulation on ROS2 From 5bdd086c9d0c4d33b120ada26905577e5c6b29be Mon Sep 17 00:00:00 2001 From: Guillem Gari Date: Thu, 25 Jul 2024 18:03:26 +0200 Subject: [PATCH 19/19] added helm releaser workflow --- .github/workflows/helm-releaser.yaml | 29 ++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .github/workflows/helm-releaser.yaml diff --git a/.github/workflows/helm-releaser.yaml b/.github/workflows/helm-releaser.yaml new file mode 100644 index 0000000..19f7f67 --- /dev/null +++ b/.github/workflows/helm-releaser.yaml @@ -0,0 +1,29 @@ +--- +name: Release Charts + +on: + push: + tags: + - '*' # Triggers on any tag push + workflow_dispatch: + +jobs: + release: + permissions: + contents: write + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Configure Git + run: | + git config user.name "$GITHUB_ACTOR" + git config user.email "$GITHUB_ACTOR@users.noreply.github.com" + + - name: Run chart-releaser + uses: helm/chart-releaser-action@v1.6.0 + env: + CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"