Merge remote-tracking branch 'origin/main'

Author: zreigz

cloud-config.yaml

@@ -1,5 +1,5 @@
 #cloud-config
-hostname: plural-edge-{{ trunc 10 .MachineID }}
+hostname: plural-{{ trunc 10 .MachineID }}
 
 users:
   - name: @USERNAME@
@@ -20,13 +20,18 @@ write_files:
     permissions: "0644"
     content: |
       mirrors:
-        "*":  
+        "*":
+# TODO: Enable once it will be fixed.
+#  - path: /etc/plural-id
+#    permissions: "0644"
+#    content: |
+#      {{ uuidv4 }}
 
 k3s:
   enabled: true
   replace_args: true
   args:
-    - --node-name=kairos
+    - --node-name=plural-{{ trunc 10 .MachineID }}
     - --embedded-registry
     - --disable=traefik,servicelb
 

images/plural-bundle/run.sh

@@ -70,7 +70,7 @@ for FILE in assets/*; do
   templ "BASE_IMAGE" "${BASE_IMAGE}" "${FILE}"
   templ "TOKEN" "${TOKEN}" "${FILE}"
   templ "URL" "${URL}" "${FILE}"
-  templ "CLUSTER_NAME" "${CLUSTER_NAME_PREFIX}-$(cut -c1-10 < /etc/machine-id)" "${FILE}"
+  templ "CLUSTER_NAME" "${CLUSTER_NAME_PREFIX}-$(cut -c1-10 < /etc/plural-id)" "${FILE}"
   templ "PROJECT" "${PROJECT}" "${FILE}"
   templ "TAG" "${TAG}" "${FILE}"
 done;

plural-config.yaml

@@ -1,5 +1,6 @@
+#plural-config
 image: quay.io/kairos/alpine:3.19-standard-arm64-rpi4-v3.2.4-k3sv1.31.3-k3s1
 bundles:
-  plural-bundle: ghcr.io/pluralsh/kairos-plural-bundle:0.1.4
+  plural-bundle: ghcr.io/pluralsh/kairos-plural-bundle:0.1.4 # TODO: Use latest version once it will be fixed.
   plural-images-bundle: ghcr.io/pluralsh/kairos-plural-images-bundle:0.1.2
   plural-trust-manager-bundle: ghcr.io/pluralsh/kairos-plural-trust-manager-bundle:0.1.0