Bump framework (#2932)

Earthfile

@@ -8,7 +8,7 @@ ARG TRIVY_VERSION=0.55.2
 # renovate: datasource=docker depName=anchore/grype versioning=semver
 ARG GRYPE_VERSION=v0.80.1
 # renovate: datasource=docker depName=quay.io/kairos/framework versioning=semver
-ARG KAIROS_FRAMEWORK_VERSION=v2.13.0
+ARG KAIROS_FRAMEWORK_VERSION=v2.14.0
 # renovate: datasource=docker depName=quay.io/kairos/osbuilder-tools versioning=semver
 ARG OSBUILDER_VERSION=v0.400.0
 # renovate: datasource=docker depName=golang versioning=semver

tests/assets/autoinstall.yaml

@@ -13,4 +13,6 @@ stages:
       users:
         kairos:
           passwd: "kairos"
+          groups:
+            - "admin"
       hostname: kairos-{{ trunc 4 .Random }}

tests/assets/config.yaml

@@ -10,5 +10,7 @@ stages:
       users:
         kairos:
           passwd: "kairos"
+          groups:
+            - "admin"
     - name: "Set hostname"
       hostname: kairos-{{ trunc 4 .Random }}

tests/assets/config_with_reboot.yaml

@@ -11,5 +11,7 @@ stages:
       users:
         kairos:
           passwd: "kairos"
+          groups:
+            - "admin"
     - name: "Set hostname"
       hostname: kairos-{{ trunc 4 .Random }}

tests/assets/live-overlay.yaml

@@ -6,4 +6,6 @@ stages:
       users:
         kairos:
           passwd: "kairos"
+          groups:
+            - "admin"
       hostname: kairos-{{ trunc 4 .Random }}

tests/assets/qrcode.yaml

@@ -6,6 +6,8 @@ stages:
    users:
     kairos:
      passwd: "kairos"
+     groups:
+       - "admin"
    hostname: kairos-{{ trunc 4 .Random }}
 kairos:
  network_token: "b3RwOgogIGRodDoKICAgIGludGVydmFsOiA5MDAwCiAgICBrZXk6IDI0SUpPS1pGS0g1R0tYUTNSNkdaQkNaS0lPTTNSWU9OT0pNRjIyRFFTM0VNT1BUWEdTTFEKICAgIGxlbmd0aDogMzIKICBjcnlwdG86CiAgICBpbnRlcnZhbDogOTAwMAogICAga2V5OiBQNklPMllEMzZaVFZRTkdUNk5ZREJNS0s0V09aQjJJN0RQMkRUQzRLVVU1UEhaTjRYSzVBCiAgICBsZW5ndGg6IDMyCnJvb206IEdPMkNRVDVYN080VFM3VEpFUVEyTDRXSTJZNURHNzZHUlNGU05FUVVZN1FBSjZSRzVUUFEKcmVuZGV6dm91czoga0taUE1pQU9TZWN6R1lDRXdTSEV0V21XUGZUaGxOa3QKbWRuczogT0FWY25LZXlPT3ZJQlhtQ0ZBYmhNSkxlbndJTEFxY2sKbWF4X21lc3NhZ2Vfc2l6ZTogMjA5NzE1MjAK"

tests/assets/raw_image.yaml

@@ -6,6 +6,8 @@
 users:
   - name: "kairos"
     passwd: "kairos"
+    groups:
+      - "admin"
 name: "Default deployment"
 stages:
   boot:

tests/assets/single.yaml

@@ -6,6 +6,8 @@ stages:
       users:
         kairos:
           passwd: kairos
+          groups:
+            - "admin"
 k3s:
   enabled: true
 write_files:

tests/assets/uki-install.yaml

@@ -15,6 +15,8 @@ stages:
       users:
         kairos:
           passwd: "kairos"
+          groups:
+            - "admin"
       hostname: kairos-{{ trunc 4 .Random }}
   after-reset:
       - commands:

tests/assets/zfs.yaml

@@ -6,6 +6,8 @@ stages:
       users:
         kairos:
           passwd: "kairos"
+          groups:
+            - "admin"
       hostname: kairos-{{ trunc 4 .Random }}
   rootfs:
     - modules:

tests/autoinstall_test.go

@@ -83,7 +83,9 @@ var _ = Describe("kairos autoinstall test", Label("autoinstall-test"), func() {
 				Expect(out).To(ContainSubstring("boot_assessment_blk"))
 
 				cmdline, _ := vm.Sudo("cat /proc/cmdline")
-				Expect(cmdline).To(ContainSubstring("rd.emergency=reboot rd.shell=0 panic=5"))
+				Expect(cmdline).To(ContainSubstring("rd.emergency=reboot rd.shell=0"))
+				Expect(cmdline).To(ContainSubstring("panic=5"))
+				Expect(cmdline).To(ContainSubstring("rd.shell=0"))
 			})
 
 			By("checking writeable tmp", func() {

tests/custom_partitioning_test.go

@@ -107,6 +107,8 @@ install:
 users:
   - name: "kairos"
     passwd: "kairos"
+    groups:
+      - "admin"
 
 stages:
   kairos-install.pre.before:

tests/encryption_test.go

@@ -86,6 +86,8 @@ stages:
       users:
         kairos:
           passwd: "kairos"
+          groups:
+            - "admin"
       hostname: kairos-{{ trunc 4 .Random }}
 `
 		})
@@ -131,6 +133,8 @@ hostname: metal-{{ trunc 4 .MachineID }}
 users:
 - name: kairos
   passwd: kairos
+  groups:
+    - "admin"
 
 install:
   encrypted_partitions:
@@ -219,6 +223,8 @@ stages:
       users:
         kairos:
           passwd: "kairos"
+          groups:
+            - "admin"
       hostname: kairos-{{ trunc 4 .Random }}
 
 install:
@@ -297,6 +303,8 @@ stages:
       users:
         kairos:
           passwd: "kairos"
+          groups:
+            - "admin"
       hostname: kairos-{{ trunc 4 .Random }}
 install:
   encrypted_partitions:
@@ -330,6 +338,8 @@ hostname: metal-{{ trunc 4 .MachineID }}
 users:
 - name: kairos
   passwd: kairos
+  groups:
+    - "admin"
 
 install:
   encrypted_partitions:

tests/install_test.go

@@ -89,6 +89,8 @@ stages:
     users:
       kairos:
          passwd: "kairos"
+         groups:
+           - "admin"
     commands:
     - echo "bar" > /etc/foo
 bundles:
@@ -140,10 +142,12 @@ bundles:
 		Context("with config_url", func() {
 			It("succeeds when config_url is accessible", func() {
 				testInstall(`#cloud-config
-config_url: "https://gist.githubusercontent.com/mudler/6db795bad8f9e29ebec14b6ae331e5c0/raw/01137c458ad62cfcdfb201cae2f8814db702c6f9/testgist.yaml"
+config_url: "https://gist.githubusercontent.com/Itxaka/c94e42bd52a67e2c9bffd11b8e633e38/raw/255d17fce7ed6857f82e907d261ce4a717662773/testgist.yaml"
 users:
 - name: "kairos"
   passwd: "kairos"
+  groups:
+    - "admin"
 `, vm)
 
 				Eventually(func() string {
@@ -159,6 +163,8 @@ config_url: "https://thisurldoesntexist.org"
 users:
 - name: "kairos"
   passwd: "kairos"
+  groups:
+    - "admin"
 `, vm)
 				Expect(out).ToNot(ContainSubstring("kairos-agent.service: Failed with result"))
 				Expect(out).To(ContainSubstring("WARNING: Couldn't fetch config_url"))