From a3be80446a8fe36e2e134f7e3e9c3fd887024311 Mon Sep 17 00:00:00 2001 From: Stoyan Lachev Date: Tue, 6 Dec 2022 07:35:19 +0000 Subject: [PATCH 1/6] Update of Cargo.lock for kanto-auto-deployer Signed-off-by: Stoyan Lachev --- .../recipes-sdv/eclipse-leda/kanto-auto-deployer_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-leda-components/recipes-sdv/eclipse-leda/kanto-auto-deployer_git.bb b/meta-leda-components/recipes-sdv/eclipse-leda/kanto-auto-deployer_git.bb index 905c21f6..67146d04 100644 --- a/meta-leda-components/recipes-sdv/eclipse-leda/kanto-auto-deployer_git.bb +++ b/meta-leda-components/recipes-sdv/eclipse-leda/kanto-auto-deployer_git.bb @@ -26,8 +26,8 @@ inherit cargo kanto-auto-deployer RDEPENDS_${PN} += " grpc protobuf nativesdk-protobuf" DEPENDS += " protobuf protobuf-native grpc git-native" -SRCREV = "1a7ccb4d37c6ca6bbfce2d915c31aa4478623791" -PV:append = ".AUTOINC+1a7ccb4d37" +SRCREV = "e4882a8e64f6d172f212a241c58aa66e58faa741" +PV:append = ".AUTOINC+e4882a8e64f" SRC_URI = "gitsm://github.com/eclipse-leda/leda-utils;protocol=https;nobranch=0;branch=main" S = "${WORKDIR}/git" From 61651edabb83840cc76b98c53e76dc3b6927e655 Mon Sep 17 00:00:00 2001 From: Vasil Ivanov <59696861+vasilvas99@users.noreply.github.com> Date: Wed, 7 Dec 2022 15:19:23 +0200 Subject: [PATCH 2/6] Update commit hash for sdv-utils --- meta-leda-components/recipes-sdv/sdv-base/sdv-core-utils_0.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-leda-components/recipes-sdv/sdv-base/sdv-core-utils_0.1.bb b/meta-leda-components/recipes-sdv/sdv-base/sdv-core-utils_0.1.bb index b99dbf89..3c18a507 100644 --- a/meta-leda-components/recipes-sdv/sdv-base/sdv-core-utils_0.1.bb +++ b/meta-leda-components/recipes-sdv/sdv-base/sdv-core-utils_0.1.bb @@ -15,7 +15,7 @@ SUMMARY = "SDV Core Utilities" DESCRIPTION = "Core shell scripts" SRC_URI = "git://github.com/eclipse-leda/leda-utils;branch=main;protocol=https" -SRCREV = "586ef6da1b841efd76fb06b9821bae4277e325e0" +SRCREV = "c816c3a75dcc41a2962d34730b9fd0bc0084c79d" # According to https://wiki.yoctoproject.org/wiki/License_Infrastructure_Interest_Group LICENSE = "Apache-2.0" From 0da5d837caab2646dc9178ab781b3dfdd4c29cfd Mon Sep 17 00:00:00 2001 From: Stoyan Lachev Date: Thu, 8 Dec 2022 15:46:33 +0000 Subject: [PATCH 3/6] New containers sua, vum, seatservice Signed-off-by: Stoyan Lachev --- .../kanto-containers/databroker.json | 2 +- .../kanto-containers/seatservice.json | 81 ++++++++++++++++++ .../eclipse-leda/kanto-containers/sua.json | 84 +++++++++++++++++++ .../eclipse-leda/kanto-containers/vum.json | 78 +++++++++++++++++ .../eclipse-leda/sdv-default-containers.bb | 6 ++ 5 files changed, 250 insertions(+), 1 deletion(-) create mode 100644 meta-leda-components/recipes-sdv/eclipse-leda/kanto-containers/seatservice.json create mode 100644 meta-leda-components/recipes-sdv/eclipse-leda/kanto-containers/sua.json create mode 100644 meta-leda-components/recipes-sdv/eclipse-leda/kanto-containers/vum.json diff --git a/meta-leda-components/recipes-sdv/eclipse-leda/kanto-containers/databroker.json b/meta-leda-components/recipes-sdv/eclipse-leda/kanto-containers/databroker.json index 02c17533..a1aa459a 100644 --- a/meta-leda-components/recipes-sdv/eclipse-leda/kanto-containers/databroker.json +++ b/meta-leda-components/recipes-sdv/eclipse-leda/kanto-containers/databroker.json @@ -14,7 +14,7 @@ "hooks": [], "host_config": { "devices": [], - "network_mode": "host", + "network_mode": "bridge", "privileged": false, "restart_policy": { "maximum_retry_count": 0, diff --git a/meta-leda-components/recipes-sdv/eclipse-leda/kanto-containers/seatservice.json b/meta-leda-components/recipes-sdv/eclipse-leda/kanto-containers/seatservice.json new file mode 100644 index 00000000..9676e4cd --- /dev/null +++ b/meta-leda-components/recipes-sdv/eclipse-leda/kanto-containers/seatservice.json @@ -0,0 +1,81 @@ +{ + "id": "", + "name": "seatservice", + "image": { + "name": "ghcr.io/eclipse/kuksa.val.services/seat_service:v0.1.0", + "decrypt_config": null + }, + "host_name": "", + "domain_name": "", + "resolv_conf_path": "", + "hosts_path": "", + "hostname_path": "", + "mounts": [], + "hooks": [], + "host_config": { + "devices": [], + "network_mode": "bridge", + "privileged": false, + "restart_policy": { + "maximum_retry_count": 0, + "retry_timeout": 0, + "type": "unless-stopped" + }, + "runtime": "io.containerd.runc.v2", + "extra_hosts": [], + "port_mappings": [ + { + "protocol": "tcp", + "container_port": 50051, + "host_ip": "localhost", + "host_port": 50051, + "host_port_end": 50051 + } + ], + "log_config": { + "driver_config": { + "type": "json-file", + "max_files": 2, + "max_size": "100M", + "root_dir": "" + }, + "mode_config": { + "mode": "blocking", + "max_buffer_size": "" + } + }, + "resources": null + }, + "io_config": { + "attach_stderr": false, + "attach_stdin": false, + "attach_stdout": false, + "open_stdin": false, + "stdin_once": false, + "tty": false + }, + "config": { + "env": [ + "VEHICLEDATABROKER_DAPR_APP_ID=vehicledatabroker" + ], + "cmd": [] + }, + "network_settings": null, + "state": { + "pid": -1, + "started_at": "", + "error": "", + "exit_code": 0, + "finished_at": "", + "exited": false, + "dead": false, + "restarting": false, + "paused": false, + "running": false, + "status": "", + "oom_killed": false + }, + "created": "", + "manually_stopped": false, + "restart_count": 0 +} \ No newline at end of file diff --git a/meta-leda-components/recipes-sdv/eclipse-leda/kanto-containers/sua.json b/meta-leda-components/recipes-sdv/eclipse-leda/kanto-containers/sua.json new file mode 100644 index 00000000..362fcec8 --- /dev/null +++ b/meta-leda-components/recipes-sdv/eclipse-leda/kanto-containers/sua.json @@ -0,0 +1,84 @@ +{ + "id": "", + "name": "sua", + "image": { + "name": "ghcr.io/eclipse-leda/leda-contrib-self-update-agent/sua:testing", + "decrypt_config": null + }, + "host_name": "", + "domain_name": "", + "resolv_conf_path": "", + "hosts_path": "", + "hostname_path": "", + "mounts": [], + "hooks": [], + "host_config": { + "devices": [], + "network_mode": "bridge", + "privileged": false, + "restart_policy": { + "maximum_retry_count": 0, + "retry_timeout": 0, + "type": "unless-stopped" + }, + "runtime": "io.containerd.runc.v2", + "extra_hosts": [ + "mosquitto:host_ip" + ], + "port_mappings": [ + { + "protocol": "tcp", + "container_port": 50052, + "host_ip": "localhost", + "host_port": 50052, + "host_port_end": 50052 + } + ], + "log_config": { + "driver_config": { + "type": "json-file", + "max_files": 2, + "max_size": "100M", + "root_dir": "" + }, + "mode_config": { + "mode": "blocking", + "max_buffer_size": "" + } + }, + "resources": null + }, + "io_config": { + "attach_stderr": false, + "attach_stdin": false, + "attach_stdout": false, + "open_stdin": false, + "stdin_once": false, + "tty": false + }, + "config": { + "env": [ + "MQTT_CONN_BROKER=tcp://mosquitto:1883", + "LOG_LEVEL=DEBUG" + ], + "cmd": [] + }, + "network_settings": null, + "state": { + "pid": -1, + "started_at": "", + "error": "", + "exit_code": 0, + "finished_at": "", + "exited": false, + "dead": false, + "restarting": false, + "paused": false, + "running": false, + "status": "", + "oom_killed": false + }, + "created": "", + "manually_stopped": false, + "restart_count": 0 +} \ No newline at end of file diff --git a/meta-leda-components/recipes-sdv/eclipse-leda/kanto-containers/vum.json b/meta-leda-components/recipes-sdv/eclipse-leda/kanto-containers/vum.json new file mode 100644 index 00000000..81995282 --- /dev/null +++ b/meta-leda-components/recipes-sdv/eclipse-leda/kanto-containers/vum.json @@ -0,0 +1,78 @@ +{ + "id": "", + "name": "vum", + "image": { + "name": "ghcr.io/eclipse-leda/leda-contrib-vehicle-update-manager/vehicleupdatemanager:main-1d8dca55a755c4b3c7bc06eabfa06ad49e068a48", + "decrypt_config": null + }, + "host_name": "", + "domain_name": "", + "resolv_conf_path": "", + "hosts_path": "", + "hostname_path": "", + "mounts": [], + "hooks": [], + "host_config": { + "devices": [], + "network_mode": "bridge", + "privileged": false, + "restart_policy": { + "maximum_retry_count": 0, + "retry_timeout": 0, + "type": "unless-stopped" + }, + "runtime": "io.containerd.runc.v2", + "extra_hosts": [ + "mosquitto:host_ip" + ], + "port_mappings": [], + "log_config": { + "driver_config": { + "type": "json-file", + "max_files": 2, + "max_size": "100M", + "root_dir": "" + }, + "mode_config": { + "mode": "blocking", + "max_buffer_size": "" + } + }, + "resources": null + }, + "io_config": { + "attach_stderr": false, + "attach_stdin": false, + "attach_stdout": false, + "open_stdin": false, + "stdin_once": false, + "tty": false + }, + "config": { + "env": [ + "MQTT_CONN_BROKER=tcp://mosquitto:1883", + "LOG_LEVEL=DEBUG", + "SELF_UPDATE_TIMEOUT=30m", + "SELF_UPDATE_ENABLE_REBOOT=true" + ], + "cmd": [] + }, + "network_settings": null, + "state": { + "pid": -1, + "started_at": "", + "error": "", + "exit_code": 0, + "finished_at": "", + "exited": false, + "dead": false, + "restarting": false, + "paused": false, + "running": false, + "status": "", + "oom_killed": false + }, + "created": "", + "manually_stopped": false, + "restart_count": 0 +} \ No newline at end of file diff --git a/meta-leda-components/recipes-sdv/eclipse-leda/sdv-default-containers.bb b/meta-leda-components/recipes-sdv/eclipse-leda/sdv-default-containers.bb index 0ee4ce1c..27216a20 100644 --- a/meta-leda-components/recipes-sdv/eclipse-leda/sdv-default-containers.bb +++ b/meta-leda-components/recipes-sdv/eclipse-leda/sdv-default-containers.bb @@ -21,8 +21,14 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd do_install:append() { install -d ${D}${KANTO_MANIFESTS_DIR} install ${THISDIR}/kanto-containers/databroker.json ${D}${KANTO_MANIFESTS_DIR} + install ${THISDIR}/kanto-containers/seatservice.json ${D}${KANTO_MANIFESTS_DIR} + install ${THISDIR}/kanto-containers/vum.json ${D}${KANTO_MANIFESTS_DIR} + install ${THISDIR}/kanto-containers/sua.json ${D}${KANTO_MANIFESTS_DIR} } PACKAGES = "${PN}" FILES:${PN} += "${KANTO_MANIFESTS_DIR}/databroker.json" +FILES:${PN} += "${KANTO_MANIFESTS_DIR}/seatservice.json" +FILES:${PN} += "${KANTO_MANIFESTS_DIR}/vum.json" +FILES:${PN} += "${KANTO_MANIFESTS_DIR}/sua.json" From e58f082ff66c1fb6a5489a405c39232ad7c88f35 Mon Sep 17 00:00:00 2001 From: Stoyan Lachev Date: Fri, 9 Dec 2022 11:32:11 +0000 Subject: [PATCH 4/6] kanto-auto-deployer new SRCREV with usage Signed-off-by: Stoyan Lachev --- .../recipes-sdv/eclipse-leda/kanto-auto-deployer_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-leda-components/recipes-sdv/eclipse-leda/kanto-auto-deployer_git.bb b/meta-leda-components/recipes-sdv/eclipse-leda/kanto-auto-deployer_git.bb index 67146d04..b96b8028 100644 --- a/meta-leda-components/recipes-sdv/eclipse-leda/kanto-auto-deployer_git.bb +++ b/meta-leda-components/recipes-sdv/eclipse-leda/kanto-auto-deployer_git.bb @@ -26,8 +26,8 @@ inherit cargo kanto-auto-deployer RDEPENDS_${PN} += " grpc protobuf nativesdk-protobuf" DEPENDS += " protobuf protobuf-native grpc git-native" -SRCREV = "e4882a8e64f6d172f212a241c58aa66e58faa741" -PV:append = ".AUTOINC+e4882a8e64f" +SRCREV = "467e4cebd86dcfee686b1e676ed0f30ca741354a" +PV:append = ".AUTOINC+467e4cebd86" SRC_URI = "gitsm://github.com/eclipse-leda/leda-utils;protocol=https;nobranch=0;branch=main" S = "${WORKDIR}/git" From a8719342bce77b97128a7f520412b81bb8ce87ec Mon Sep 17 00:00:00 2001 From: Stoyan Lachev Date: Fri, 9 Dec 2022 13:30:54 +0000 Subject: [PATCH 5/6] Changes in SUA container Signed-off-by: Stoyan Lachev --- .../eclipse-leda/kanto-containers/sua.json | 13 ++++++++++++- .../eclipse-leda/sdv-default-containers.bb | 5 +++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/meta-leda-components/recipes-sdv/eclipse-leda/kanto-containers/sua.json b/meta-leda-components/recipes-sdv/eclipse-leda/kanto-containers/sua.json index 362fcec8..0bf5d86d 100644 --- a/meta-leda-components/recipes-sdv/eclipse-leda/kanto-containers/sua.json +++ b/meta-leda-components/recipes-sdv/eclipse-leda/kanto-containers/sua.json @@ -10,7 +10,18 @@ "resolv_conf_path": "", "hosts_path": "", "hostname_path": "", - "mounts": [], + "mounts": [ + { + "source": "/var/run/dbus/system_bus_socket", + "destination": "/var/run/dbus/system_bus_socket", + "propagation_mode": "rprivate" + }, + { + "source": "/data_temp/selfupdates", + "destination": "/RaucUpdate", + "propagation_mode": "rprivate" + } + ], "hooks": [], "host_config": { "devices": [], diff --git a/meta-leda-components/recipes-sdv/eclipse-leda/sdv-default-containers.bb b/meta-leda-components/recipes-sdv/eclipse-leda/sdv-default-containers.bb index 27216a20..c3b72c78 100644 --- a/meta-leda-components/recipes-sdv/eclipse-leda/sdv-default-containers.bb +++ b/meta-leda-components/recipes-sdv/eclipse-leda/sdv-default-containers.bb @@ -18,11 +18,15 @@ SRC_URI += "file://LICENSE" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" +# Will be changed for sua.json as well and be separated in a different recipe +SUA_DATA_DIR = "/data_temp/selfupdates" + do_install:append() { install -d ${D}${KANTO_MANIFESTS_DIR} install ${THISDIR}/kanto-containers/databroker.json ${D}${KANTO_MANIFESTS_DIR} install ${THISDIR}/kanto-containers/seatservice.json ${D}${KANTO_MANIFESTS_DIR} install ${THISDIR}/kanto-containers/vum.json ${D}${KANTO_MANIFESTS_DIR} + mkdir -p ${D}${SUA_DATA_DIR} install ${THISDIR}/kanto-containers/sua.json ${D}${KANTO_MANIFESTS_DIR} } @@ -30,5 +34,6 @@ PACKAGES = "${PN}" FILES:${PN} += "${KANTO_MANIFESTS_DIR}/databroker.json" FILES:${PN} += "${KANTO_MANIFESTS_DIR}/seatservice.json" FILES:${PN} += "${KANTO_MANIFESTS_DIR}/vum.json" +FILES:${PN} += "${SUA_DATA_DIR}" FILES:${PN} += "${KANTO_MANIFESTS_DIR}/sua.json" From 0843d0788bc962fd5506aaea517847ffdc3dea63 Mon Sep 17 00:00:00 2001 From: Stoyan Lachev Date: Fri, 9 Dec 2022 14:24:45 +0000 Subject: [PATCH 6/6] LOG_LEVEL=INFO Signed-off-by: Stoyan Lachev --- .../recipes-sdv/eclipse-leda/kanto-containers/sua.json | 2 +- .../recipes-sdv/eclipse-leda/kanto-containers/vum.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-leda-components/recipes-sdv/eclipse-leda/kanto-containers/sua.json b/meta-leda-components/recipes-sdv/eclipse-leda/kanto-containers/sua.json index 0bf5d86d..c023acb1 100644 --- a/meta-leda-components/recipes-sdv/eclipse-leda/kanto-containers/sua.json +++ b/meta-leda-components/recipes-sdv/eclipse-leda/kanto-containers/sua.json @@ -70,7 +70,7 @@ "config": { "env": [ "MQTT_CONN_BROKER=tcp://mosquitto:1883", - "LOG_LEVEL=DEBUG" + "LOG_LEVEL=INFO" ], "cmd": [] }, diff --git a/meta-leda-components/recipes-sdv/eclipse-leda/kanto-containers/vum.json b/meta-leda-components/recipes-sdv/eclipse-leda/kanto-containers/vum.json index 81995282..df35abb1 100644 --- a/meta-leda-components/recipes-sdv/eclipse-leda/kanto-containers/vum.json +++ b/meta-leda-components/recipes-sdv/eclipse-leda/kanto-containers/vum.json @@ -51,7 +51,7 @@ "config": { "env": [ "MQTT_CONN_BROKER=tcp://mosquitto:1883", - "LOG_LEVEL=DEBUG", + "LOG_LEVEL=INFO", "SELF_UPDATE_TIMEOUT=30m", "SELF_UPDATE_ENABLE_REBOOT=true" ],