🌱 Split resolved configuration (#60)

* 🌱 Split resolved configuration

Signed-off-by: Ettore Di Giacinto <mudler@users.noreply.github.com>

* 🌱 Cleanup

Signed-off-by: Ettore Di Giacinto <mudler@users.noreply.github.com>

packages/initrd/build.yaml

@@ -25,13 +25,17 @@ copy:
   source: "/package/."
   destination: "/"
 {{ end }}
+{{ if and ( ne .Values.name "ubuntu-20-lts" ) ( ne .Values.name "ubuntu" ) ( ne .Values.name "ubuntu-22-lts" ) }}
+- package: 
+    category: "dracut"
+    name: "systemd-resolved"
+    version: ">=0"
+  source: "/package/."
+  destination: "/"
+{{ end }}
 - package: 
     category: "dracut"
-    {{ if or ( eq .Values.name "ubuntu-20-lts" ) ( eq .Values.name "ubuntu" ) ( eq .Values.name "ubuntu-22-lts" ) }}
-    name: "network-compat"
-    {{ else }}
     name: "network"
-    {{ end }}
     version: ">=0"
   source: "/package/."
   destination: "/"

packages/initrd/collection.yaml

@@ -1,13 +1,13 @@
 packages:
 - name: "opensuse-leap"
   category: "distro-initrd"
-  version: "0.19"
+  version: "0.20"
 # - name: "fedora"
 #   category: "distro-initrd"
 #   version: "0.11"
 - name: "ubuntu-20-lts"
   category: "distro-initrd"
-  version: "0.19"
+  version: "0.20"
 - name: "ubuntu"
   category: "distro-initrd"
-  version: "0.19"
+  version: "0.20"

packages/system/dracut/network/build.yaml

@@ -3,9 +3,5 @@ package_dir: "/package"
 steps:
 - mkdir -p /package/etc/systemd/network
 - mkdir -p /package/etc/dracut.conf.d
-{{ if eq .Values.name "network-compat" }}
-- cp -rfv conf-compat/* /package/etc/dracut.conf.d
-{{ else }}
 - cp -rfv conf/* /package/etc/dracut.conf.d
-{{ end }}
 - cp -rfv network/* /package/etc/systemd/network

packages/system/dracut/network/collection.yaml

@@ -1,7 +0,0 @@
-packages:
-- name: "network"
-  category: "dracut"
-  version: "0.9"
-- name: "network-compat"
-  category: "dracut"
-  version: "0.9"

packages/system/dracut/network/conf-compat/90-kairos-network-compat.conf

@@ -1,2 +0,0 @@
-install_items+=" /etc/systemd/network/20-dhcp.network /etc/systemd/network/21-dhcp-legacy.network "
-add_dracutmodules+=" systemd-networkd "

packages/system/dracut/network/conf/90-kairos-network.conf

@@ -1,2 +1,2 @@
 install_items+=" /etc/systemd/network/20-dhcp.network /etc/systemd/network/21-dhcp-legacy.network "
-add_dracutmodules+=" systemd-networkd systemd-resolved "
+add_dracutmodules+=" systemd-networkd "

packages/system/dracut/network/definition.yaml

@@ -0,0 +1,3 @@
+name: "network"
+category: "dracut"
+version: "0.11"

packages/system/dracut/systemd-resolved/build.yaml

@@ -0,0 +1,5 @@
+image: alpine
+package_dir: "/package"
+steps:
+- mkdir -p /package/etc/dracut.conf.d
+- cp -rfv conf/* /package/etc/dracut.conf.d

packages/system/dracut/systemd-resolved/conf/90-kairos-resolved.conf

@@ -0,0 +1 @@
+add_dracutmodules+=" systemd-resolved "

packages/system/dracut/systemd-resolved/definition.yaml

@@ -0,0 +1,3 @@
+name: "systemd-resolved"
+category: "dracut"
+version: "0.10"

packages/toolkit/build.yaml

@@ -1,31 +0,0 @@
-image: alpine
-
-copy:
-- image: "quay.io/luet/base:0.32.5"
-  source: "/usr/bin/luet"
-  destination: "/usr/bin/luet"
-
-prelude:
-- |
-   mkdir -p /etc/luet/repos.conf.d && \
-   luet repo add --type docker --reference "v{{.Values.tag}}-repository.yaml" --yes --url {{.Values.repo}} elemental
-package_dir: /framework
-steps:
-- |
-   /usr/bin/luet install -y --system-target /framework \
-            meta/cos-light \
-            cloud-config/recovery \
-            cloud-config/live \
-            cloud-config/network \
-            cloud-config/boot-assessment \
-            cloud-config/rootfs \
-            system-openrc/cos-setup
-#- mkdir -p /output/etc/dracut.conf.d/
-{{ if eq .Values.name "elemental-toolkit-opensuse" }}
-{{ if eq .Values.arch "amd64" }}
-- cp -rf sysext.conf /framework/etc/dracut.conf.d/20-sysext.conf
-{{ end }}
-{{ end }}
-excludes:
-- var/cache|var/cache/.*
-- usr/bin/elemental

packages/toolkit/collection.yaml

@@ -1,34 +0,0 @@
-packages:
-- name: "elemental-toolkit-opensuse"
-  category: "system"
-  repo: "quay.io/costoolkit/releases-teal"
-  version: "0.8.14-24"
-  tag: "0.8.14-22"
-  arch: "amd64"
-  license: "Apache License 2.0"
-  copyright: SUSE
-  labels:
-    github.repo: "elemental-toolkit"
-    github.owner: "rancher"
-- name: "elemental-toolkit-ubuntu"
-  repo: "quay.io/costoolkit/releases-orange"
-  category: "system"
-  version: "0.8.14-24"
-  arch: "amd64"
-  tag: "0.8.14-22"
-  license: "Apache License 2.0"
-  copyright: SUSE
-  labels:
-    github.repo: "elemental-toolkit"
-    github.owner: "rancher"
-- name: "elemental-toolkit-fedora"
-  repo: "quay.io/costoolkit/releases-blue"
-  category: "system"
-  arch: "amd64"
-  version: "0.8.14-24"
-  tag: "0.8.14-22"
-  license: "Apache License 2.0"
-  copyright: SUSE
-  labels:
-    github.repo: "elemental-toolkit"
-    github.owner: "rancher"

packages/toolkit/sysext.conf

@@ -1 +0,0 @@
-add_dracutmodules+=" systemd-sysext "