Merge pull request #358 from youngtaekiim/demo25

init demo25

Author: youngtaekiim

.github/workflows/build.yml

@@ -1,8 +1,6 @@
 name: Build
 
 on:
-  schedule:
-    - cron: '0 16 * * *'
   workflow_dispatch:
 
 permissions:

.github/workflows/ci-dispatcher.yml

@@ -1,10 +1,6 @@
 name: CI Dispatcher
 
 on:
-  push:
-    branches: [ "main", "release", "debug" ]
-  pull_request:
-    branches: [ "refactoring","main", "release", "debug" ]
   workflow_dispatch:
 
 jobs:

Makefile

@@ -62,6 +62,7 @@ install:
 	-mkdir -p /etc/containers/systemd/piccolo/
 	-mkdir -p /etc/containers/systemd/piccolo/etcd-data/
 	-cp -r ./src/settings.yaml /etc/containers/systemd/piccolo/
+	-cp -r ./doc/scripts/version.txt /etc/containers/systemd/piccolo/
 	-cp -r ./containers/piccolo-*.* /etc/containers/systemd/piccolo/
 	-cp -r ./scripts/update_server_ip.sh /etc/containers/systemd/piccolo/
 
@@ -73,6 +74,7 @@ install:
 uninstall:
 	-systemctl stop piccolo-player
 	-systemctl stop piccolo-server
+	-systemctl stop nodeagent
 	systemctl daemon-reload
 	-rm -rf /etc/piccolo/yaml
 	-rm -rf /etc/containers/systemd/*

containers/piccolo-player.yaml

@@ -13,15 +13,15 @@ spec:
   hostPid: true
   containers:
   - name: filtergateway
-    image: ghcr.io/eclipse-pullpiri/pullpiri:latest
+    image: ghcr.io/eclipse-pullpiri/pullpiri:$(VERSION)
     command: ["/piccolo/filtergateway"]
     volumeMounts:
     - name: piccolo-yaml
       mountPath: /root/piccolo_yaml
     - name: config-path
       mountPath: /etc/piccolo/settings.yaml
   - name: actioncontroller
-    image: ghcr.io/eclipse-pullpiri/pullpiri:latest
+    image: ghcr.io/eclipse-pullpiri/pullpiri:$(VERSION)
     command: ["/piccolo/actioncontroller"]
     volumeMounts:
     - name: piccolo-yaml
@@ -33,7 +33,7 @@ spec:
     - name: config-path
       mountPath: /etc/piccolo/settings.yaml
   - name: statemanager
-    image: ghcr.io/eclipse-pullpiri/pullpiri:latest
+    image: ghcr.io/eclipse-pullpiri/pullpiri:$(VERSION)
     command: ["/piccolo/statemanager"]
     volumeMounts:
     - name: piccolo-yaml

containers/piccolo-server.yaml

@@ -13,7 +13,7 @@ spec:
   hostPid: true
   containers:
   - name: etcd
-    image: gcr.io/etcd-development/etcd:v3.5.11
+    image: gcr.io/etcd-development/etcd:v3.5.24
     command: ["/usr/local/bin/etcd"]
     args: 
     - "--data-dir=/etcd-data"
@@ -23,27 +23,27 @@ spec:
     - name: etcd-data
       mountPath: /etcd-data
   - name: apiserver
-    image: ghcr.io/eclipse-pullpiri/pullpiri:latest
+    image: ghcr.io/eclipse-pullpiri/pullpiri:$(VERSION)
     command: ["/piccolo/apiserver"]
     volumeMounts:
     - name: piccolo-yaml
       mountPath: /etc/piccolo/yaml
     - name: config-path
       mountPath: /etc/piccolo/settings.yaml
   - name: policymanager
-    image: ghcr.io/eclipse-pullpiri/pullpiri:latest
+    image: ghcr.io/eclipse-pullpiri/pullpiri:$(VERSION)
     command: ["/piccolo/policymanager"]
   - name: monitoringserver
-    image: ghcr.io/eclipse-pullpiri/pullpiri:latest
+    image: ghcr.io/eclipse-pullpiri/pullpiri:$(VERSION)
     command: ["/piccolo/monitoringserver"]
     volumeMounts:
     - name: piccolo-yaml
       mountPath: /etc/piccolo/yaml
     - name: config-path
       mountPath: /etc/piccolo/settings.yaml
   - name: settingsservice
-    image: ghcr.io/eclipse-pullpiri/pullpiri:latest
-    command: ["/piccolo/settingsservice", "--bind-address=0.0.0.0", "--bind-port=8080", "--log-level=info"]
+    image: ghcr.io/eclipse-pullpiri/pullpiri:$(VERSION)
+    command: ["/piccolo/settingsservice", "--bind-address=$(HOST_IP)", "--bind-port=8080", "--log-level=debug"]
     volumeMounts:
     - name: piccolo-yaml
       mountPath: /etc/piccolo/yaml

doc/docs/getting-started.md

@@ -110,7 +110,7 @@ You can see container list via `podman ps`. (infra container is omitted.)
 ```Text
 [root@master pullpiri]# podman ps
 CONTAINER ID  IMAGE                                 COMMAND               CREATED         STATUS         PORTS          NAMES
-fd03b211e2ac  gcr.io/etcd-development/etcd:v3.5.11  --data-dir=/etcd-...  32 seconds ago  Up 32 seconds  2379-2380/tcp  piccolo-server-etcd
+fd03b211e2ac  gcr.io/etcd-development/etcd:v3.5.24  --data-dir=/etcd-...  32 seconds ago  Up 32 seconds  2379-2380/tcp  piccolo-server-etcd
 c6fbbb6feca5  localhost/pullpiri-server:latest                            32 seconds ago  Up 31 seconds                 piccolo-server-apiserver
 341edada2c33  localhost/pullpiri-agent:latest                             31 seconds ago  Up 31 seconds                 piccolo-agent-nodeagent
 eee2153bb581  localhost/pullpiri-player:latest                            31 seconds ago  Up 30 seconds                 piccolo-player-filtergateway

doc/scripts/download_etcdctl.sh

@@ -0,0 +1,10 @@
+wget https://github.com/etcd-io/etcd/releases/download/v3.5.24/etcd-v3.5.24-linux-amd64.tar.gz
+wget https://github.com/etcd-io/etcd/releases/download/v3.5.24/etcd-v3.5.24-linux-arm64.tar.gz
+
+tar -xvf etcd-v3.5.24-linux-amd64.tar.gz
+tar -xvf etcd-v3.5.24-linux-arm64.tar.gz
+
+cp etcd-v3.5.24-linux-amd64/etcdctl ./etcdctl-amd64
+cp etcd-v3.5.24-linux-arm64/etcdctl ./etcdctl-arm64
+
+rm -rf etcd-*

doc/scripts/install_nodeagent.sh

@@ -12,8 +12,8 @@ if [ "$(id -u)" -ne 0 ]; then
 fi
 
 # Initialize variables
-MASTER_IP=""
-NODE_IP=""
+MASTER_IP="172.31.26.216"
+NODE_IP="172.31.26.216"
 NODE_NAME=$(hostname)  # Always use system hostname
 NODE_ROLE="bluechi"  # Default node role (master, nodeagent, bluechi)
 NODE_TYPE="vehicle"  # Default node type (vehicle, cloud)
@@ -163,8 +163,10 @@ install_required_packages() {
 # MASTER_IP and NODE_IP are set from command line arguments
 GRPC_PORT="47004"
 #DOWNLOAD_URL="https://github.com/piccolo-framework/piccolo/releases/download/latest"
-DOWNLOAD_URL="https://github.com/eclipse-pullpiri/pullpiri/releases/latest/download"
 #DOWNLOAD_URL="https://raw.githubusercontent.com/eclipse-pullpiri/pullpiri/main/examples/binarys"
+VERSION_TXT="./version.txt"
+VERSION=$(cat "$VERSION_TXT")
+DOWNLOAD_URL="https://github.com/eclipse-pullpiri/pullpiri/releases/download/${VERSION}"
 CHECKSUM_URL="${DOWNLOAD_URL}"  # Define CHECKSUM_URL
 INSTALL_DIR="/opt/piccolo"
 CONFIG_DIR="/etc/piccolo"
@@ -247,11 +249,11 @@ chmod +x ${INSTALL_DIR}/${BINARY_NAME}
 echo "Downloading system check script..."
 SCRIPT_DOWNLOAD_SUCCESS=false
 if command -v curl &> /dev/null; then
-    if curl -L "${DOWNLOAD_URL}/scripts/node_ready_check.sh" -o /usr/local/bin/node_ready_check.sh --fail; then
+    if curl -L "${DOWNLOAD_URL}/node_ready_check.sh" -o /usr/local/bin/node_ready_check.sh --fail; then
         SCRIPT_DOWNLOAD_SUCCESS=true
     fi
 elif command -v wget &> /dev/null; then
-    if wget "${DOWNLOAD_URL}/scripts/node_ready_check.sh" -O /usr/local/bin/node_ready_check.sh; then
+    if wget "${DOWNLOAD_URL}/node_ready_check.sh" -O /usr/local/bin/node_ready_check.sh; then
         SCRIPT_DOWNLOAD_SUCCESS=true
     fi
 fi

doc/scripts/node_ready_check.sh

@@ -0,0 +1 @@
+v10.27.0-demo