Rename rancher agent to elemental agent

Dockerfile.image

@@ -1,5 +1,5 @@
 # ARGS go first if used on FROM
-ARG OPERATOR_IMAGE=quay.io/costoolkit/elemental-operator:v0.3.0
+ARG OPERATOR_IMAGE=quay.io/costoolkit/elemental-operator:latest
 ARG SYSTEM_AGENT_IMAGE=rancher/system-agent:v0.2.9
 # Binaries and files needed from elemental-toolkit repository
 ARG LUET_VERSION=0.32.5
@@ -10,7 +10,6 @@ SHELL ["/usr/bin/luet", "install", "-y", "--system-target", "/framework"]
 
 RUN utils/k9s
 RUN utils/nerdctl
-RUN utils/rancherd
 RUN toolchain/elemental-cli
 RUN toolchain/cosign
 RUN selinux/rancher
@@ -30,8 +29,8 @@ FROM registry.suse.com/suse/sle-micro-rancher/5.2:latest as default
 COPY --from=framework-build /framework /
 # Copy elemental-operator
 COPY --from=elemental-operator /usr/sbin/elemental-operator /usr/sbin/elemental-operator
-# Copy rancher-system-agent
-COPY --from=system-agent /usr/bin/rancher-system-agent /usr/sbin/rancher-system-agent
+# Copy rancher-system-agent as elemental-system-agent to avoid clashes
+COPY --from=system-agent /usr/bin/rancher-system-agent /usr/sbin/elemental-system-agent
 
 # Copy local framework files
 COPY framework/cos/ /

Makefile

@@ -9,7 +9,7 @@ SUDO?=sudo
 FRAMEWORK_PACKAGES?=meta/cos-light
 CLOUD_CONFIG_FILE?="iso/config"
 # This are the default images already in the dockerfile but we want to be able to override them
-OPERATOR_IMAGE?=quay.io/costoolkit/elemental-operator:v0.3.0
+OPERATOR_IMAGE?=quay.io/costoolkit/elemental-operator:latest
 SYSTEM_AGENT_IMAGE?=rancher/system-agent:v0.2.9
 TOOL_IMAGE?=quay.io/costoolkit/elemental-cli:v0.0.15-f1fabd4
 # Used to know if this is a release or just a normal dev build

framework/files/etc/systemd/system/multi-user.target.wants/elemental-system-agent.service

@@ -0,0 +1 @@
+/usr/lib/systemd/system/elemental-system-agent.service

framework/files/usr/lib/systemd/system/rancher-system-agent.service → framework/files/usr/lib/systemd/system/elemental-system-agent.service

@@ -1,19 +1,17 @@
 [Unit]
-Description=Rancher System Agent
+Description=Elemental System Agent
 Documentation=https://github.com/rancher/system-agent
 Wants=network-online.target
 After=network-online.target
 ConditionPathExists=!/run/cos/live_mode
-ConditionPathExists=!/opt/rancher-system-agent
+ConditionPathExists=!/etc/systemd/system/rancher-system-agent.service
 
 [Install]
 WantedBy=multi-user.target
 
 [Service]
-Type=simple
-Restart=always
-RestartSec=5s
+Type=oneshot
 StandardOutput=journal+console
 StandardError=journal+console
-Environment="CATTLE_AGENT_CONFIG=/etc/rancher/agent/config.yaml"
-ExecStart=/usr/sbin/rancher-system-agent sentinel
+Environment="CATTLE_AGENT_CONFIG=/etc/elemental/agent/config.yaml"
+ExecStart=/usr/sbin/elemental-system-agent sentinel