Update Bluechi workload file image references and add sample workload…

…s files (#27)

* Updating bluechi images

* Add in-vehicle stack images

* Change service names in script

* change line endings

* Revert script change

* Adjust comments in script

* Add portions copyright header

* remove unchanged file

eclipse-bluechi/.devcontainer/devcontainer.json

@@ -8,6 +8,7 @@
     "workspaceMount": "source=${localWorkspaceFolder},target=/workspace/src/,type=bind",
     "workspaceFolder": "/workspace/src/",
     "mounts": [
-        "source=./workspace/workloads,target=/etc/containers/systemd,type=bind"
+        "source=./workspace/workloads,target=/etc/containers/systemd,type=bind",
+        "source=./../scenarios/smart_trailer/scripts,target=/workspace/src/smart_trailer/scripts,type=bind"
     ]
 }

eclipse-bluechi/README.md

@@ -1,6 +1,6 @@
 # Eclipse BlueChi
 
-![Smart trailer blueprint](../docs/diagrams/bluechi.png)
+![Smart trailer blueprint](../docs/diagrams/bluechi_impl.svg)
 
 This document describes how to run the Eclipse Software Orchestration blueprint using Eclipse BlueChi.
 
@@ -153,7 +153,7 @@ needs two essential files:
           hostNetwork: true
           containers:
             - name: local
-              image: ghcr.io/ladatz/sdvblueprint/eclipse-freyja/local-with-ibeji:0.1.0
+              image: ghcr.io/eclipse-sdv-blueprints/software-orchestration/eclipse-freyja/local-with-ibeji:0.1.0
               imagePullPolicy: IfNotPresent
     ```
 

eclipse-bluechi/workspace/workloads/agemo.yml

@@ -1,5 +1,6 @@
   # /********************************************************************************
 # * Copyright (c) 2024 Leonardo Rossetti <[email protected]>
+# * Portions Copyright (c) Microsoft Corporation.
 # *
 # * This program and the accompanying materials are made available under the 2
 # * terms of the Apache License 2.0 which is available at
@@ -30,5 +31,5 @@ spec:
       hostNetwork: true
       containers:
         - name: pub-sub-service
-          image: ghcr.io/ladatz/sdvblueprint/eclipse-agemo/pub-sub-service:0.1.1
+          image: ghcr.io/eclipse-sdv-blueprints/software-orchestration/eclipse-agemo/pub-sub-service:0.1.2
           imagePullPolicy: IfNotPresent

eclipse-bluechi/workspace/workloads/freyja.yml

@@ -1,5 +1,6 @@
 # /********************************************************************************
 # * Copyright (c) 2024 Leonardo Rossetti <[email protected]>
+# * Portions Copyright (c) Microsoft Corporation.
 # *
 # * This program and the accompanying materials are made available under the 2
 # * terms of the Apache License 2.0 which is available at
@@ -30,5 +31,5 @@ spec:
       hostNetwork: true
       containers:
         - name: local-cloud-sync
-          image: ghcr.io/ladatz/sdvblueprint/eclipse-freyja/local-with-ibeji:0.1.0
+          image: ghcr.io/eclipse-sdv-blueprints/software-orchestration/eclipse-freyja/local-with-ibeji:0.1.0
           imagePullPolicy: IfNotPresent

eclipse-bluechi/workspace/workloads/ibeji.yml

@@ -1,5 +1,6 @@
 # /********************************************************************************
 # * Copyright (c) 2024 Leonardo Rossetti <[email protected]>
+# * Portions Copyright (c) Microsoft Corporation.
 # *
 # * This program and the accompanying materials are made available under the 2
 # * terms of the Apache License 2.0 which is available at
@@ -30,5 +31,5 @@ spec:
       hostNetwork: true
       containers:
         - name: invehicle-digital-twin
-          image: ghcr.io/ladatz/sdvblueprint/eclipse-ibeji/invehicle-digital-twin:0.1.0
+          image: ghcr.io/eclipse-sdv-blueprints/software-orchestration/eclipse-ibeji/invehicle-digital-twin:0.1.1
           imagePullPolicy: IfNotPresent 

eclipse-bluechi/workspace/workloads/mosquitto.yml

@@ -1,5 +1,6 @@
 # /********************************************************************************
 # * Copyright (c) 2024 Leonardo Rossetti <[email protected]>
+# * Portions Copyright (c) Microsoft Corporation.
 # *
 # * This program and the accompanying materials are made available under the 2
 # * terms of the Apache License 2.0 which is available at
@@ -30,5 +31,5 @@ spec:
       hostNetwork: true
       containers:
         - name: mqtt-broker
-          image: ghcr.io/ladatz/sdvblueprint/eclipse-mosquitto/mqtt-broker:latest
+          image: ghcr.io/eclipse-sdv-blueprints/software-orchestration/eclipse-mosquitto/mqtt-broker-agemo-config:0.1.2
           imagePullPolicy: IfNotPresent 

eclipse-bluechi/workspace/workloads/smart_trailer_application.kube

@@ -0,0 +1,13 @@
+# /********************************************************************************
+# * Copyright (c) Microsoft Corporation.
+# * Licensed under the Apache License, Version 2.0
+# * SPDX-License-Identifier: Apache-2.0
+# ********************************************************************************/
+
+# https://docs.podman.io/en/latest/markdown/podman-systemd.unit.5.html
+[Kube]
+Yaml=smart_trailer_application.yml
+
+# Commented to disable the service to automatically start
+[Install]
+WantedBy=default.target

eclipse-bluechi/workspace/workloads/smart_trailer_application.yml

@@ -0,0 +1,27 @@
+# /********************************************************************************
+# * Copyright (c) Microsoft Corporation.
+# * Licensed under the Apache License, Version 2.0
+# * SPDX-License-Identifier: Apache-2.0
+# ********************************************************************************/
+---
+apiversion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: smart-trailer-application
+  name: smart-trailer-application
+spec:
+  replicas: 1
+  selector:
+    matchlabels:
+      app: smart-trailer-application
+  template:
+    metadata:
+      labels:
+        app: smart-trailer-application
+    spec:
+      hostNetwork: true
+      containers:
+        - name: smart-trailer-application
+          image: ghcr.io/eclipse-sdv-blueprints/software-orchestration/invehicle-stack/smart-trailer-application:0.1.0
+          imagePullPolicy: IfNotPresent 

eclipse-bluechi/workspace/workloads/trailer_connected_provider.kube

@@ -0,0 +1,13 @@
+# /********************************************************************************
+# * Copyright (c) Microsoft Corporation.
+# * Licensed under the Apache License, Version 2.0
+# * SPDX-License-Identifier: Apache-2.0
+# ********************************************************************************/
+
+# https://docs.podman.io/en/latest/markdown/podman-systemd.unit.5.html
+[Kube]
+Yaml=trailer_connected_provider.yml
+
+# Commented to disable the service to automatically start
+# [Install]
+# WantedBy=default.target

eclipse-bluechi/workspace/workloads/trailer_connected_provider.yml

@@ -0,0 +1,22 @@
+---
+apiversion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: trailer-connected-provider
+  name: trailer-connected-provider
+spec:
+  replicas: 1
+  selector:
+    matchlabels:
+      app: trailer-connected-provider
+  template:
+    metadata:
+      labels:
+        app: trailer-connected-provider
+    spec:
+      hostNetwork: true
+      containers:
+        - name: trailer-connected-provider
+          image: ghcr.io/eclipse-sdv-blueprints/software-orchestration/invehicle-stack/trailer-connected-provider:0.1.0
+          imagePullPolicy: IfNotPresent 

eclipse-bluechi/workspace/workloads/trailer_properties_provider.kube

@@ -0,0 +1,13 @@
+# /********************************************************************************
+# * Copyright (c) Microsoft Corporation.
+# * Licensed under the Apache License, Version 2.0
+# * SPDX-License-Identifier: Apache-2.0
+# ********************************************************************************/
+
+# https://docs.podman.io/en/latest/markdown/podman-systemd.unit.5.html
+[Kube]
+Yaml=trailer_properties_provider.yml
+
+# Commented to disable the service to automatically start
+# [Install]
+# WantedBy=default.target

eclipse-bluechi/workspace/workloads/trailer_properties_provider.yml

@@ -0,0 +1,27 @@
+# /********************************************************************************
+# * Copyright (c) Microsoft Corporation.
+# * Licensed under the Apache License, Version 2.0
+# * SPDX-License-Identifier: Apache-2.0
+# ********************************************************************************/
+---
+apiversion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: trailer-properties-provider
+  name: trailer-properties-provider
+spec:
+  replicas: 1
+  selector:
+    matchlabels:
+      app: trailer-properties-provider
+  template:
+    metadata:
+      labels:
+        app: trailer-properties-provider
+    spec:
+      hostNetwork: true
+      containers:
+        - name: trailer-properties-provider
+          image: ghcr.io/eclipse-sdv-blueprints/software-orchestration/invehicle-stack/trailer-properties-provider:0.1.0
+          imagePullPolicy: IfNotPresent 

scenarios/smart_trailer/scripts/start_trailer_applications_bluechi.sh

@@ -84,11 +84,11 @@ do
         # The service.kube and service.yml files for these two services are included in the BlueChi devcontainer
         # See /etc/containers/systemd for these files
         # Start up the other workloads using systemctl
-        systemctl start trailer-properties
-        systemctl start smart-trailer
+        systemctl start trailer_properties_provider
+        systemctl start smart_trailer_application
 
         echo "Called systemctl to start the Trailer Properties Digital Twin Provider and Smart Trailer Application"
-        echo "Check systemctl status with 'systemctl status trailer-properties' and 'systemctl status smart-trailer' for status"
+        echo "Check systemctl status with 'systemctl status trailer_properties_provider' and 'systemctl status smart_trailer_application' for status"
         rm "${PROTO_PATH}/${PROTO}"
         exit 0
       fi