Merge branch 'master' into trigger-cloud-uploads-on-new-tags

jimmykarily · web-flow · commit 3cb966e7f053 · 2025-04-07T11:21:38.000+03:00
diff --git a/.github/workflows/image-master-arm.yaml b/.github/workflows/image-master-arm.yaml
@@ -57,17 +57,11 @@ jobs:
           else
             echo "cache_available=false" >> $GITHUB_OUTPUT
           fi
-      - name: Get changed files
-        id: changed-files
-        run: |
-          # Get the list of files that were changed between the base branch and the current commit
-          CHANGED_FILES=$(git diff --name-only origin/$GITHUB_BASE_REF...HEAD | grep "^images/Dockerfile.nvidia")
-
-          if echo "$CHANGED_FILES"; then
-            echo "any_changed=true" >> $GITHUB_OUTPUT
-          else
-            echo "any_changed=false" >> $GITHUB_OUTPUT
-          fi
+      - uses: tj-actions/changed-files@v46
+        with:
+          files_yaml: |
+            nvidia:
+              - 'images/Dockerfile.nvidia'
       - name: Release space from worker
         if: ${{ steps.cache.outputs.cache_available == 'false' || steps.changed-files.outputs.nvidia_any_changed == 'true' }}
         run: |
diff --git a/.github/workflows/image-master.yaml b/.github/workflows/image-master.yaml
@@ -103,9 +103,9 @@ jobs:
           - "install-target"
           - "reset"
           - "upgrade-with-cli"
-          - "upgrade-latest"
+          - "upgrade-latest-with-cli"
         exclude:
-          - test: "upgrade-latest"
+          - test: "upgrade-latest-with-cli"
             base_image: "alpine:3.21"
         include:
           - test: "install"
@@ -132,9 +132,9 @@ jobs:
             base_image: "opensuse/leap:15.6"
           - test: "acceptance"
             base_image: "debian:12"
-          - test: "upgrade-latest"
+          - test: "upgrade-latest-with-cli"
             base_image: "alpine:3.21"
-            release-matcher: "kairos-alpine-3.19-core-amd64-generic-v3.3.1.iso"
+            release-matcher: "kairos-alpine-3.19-core-amd64-generic-*.iso"
   netboot-tests:
     name: ${{ matrix.base_image }}
     uses: ./.github/workflows/reusable-qemu-netboot-test.yaml
diff --git a/.github/workflows/image-pr.yaml b/.github/workflows/image-pr.yaml
@@ -68,9 +68,9 @@ jobs:
           - "install-target"
           - "reset"
           - "upgrade-with-cli"
-          - "upgrade-latest"
+          - "upgrade-latest-with-cli"
         exclude:
-          - test: "upgrade-latest"
+          - test: "upgrade-latest-with-cli"
             base_image: "alpine:3.21"
         include:
           - test: "install"
@@ -80,9 +80,9 @@ jobs:
             base_image: "ubuntu:24.04"
           - test: "bundles"
             base_image: "ubuntu:24.04"
-          - test: "upgrade-latest"
+          - test: "upgrade-latest-with-cli"
             base_image: "alpine:3.21"
-            release-matcher: "kairos-alpine-3.19-core-amd64-generic-v3.3.3.iso"
+            release-matcher: "kairos-alpine-3.19-core-amd64-generic-*.iso"
   netboot-tests:
     name: ${{ matrix.base_image }}
     uses: ./.github/workflows/reusable-qemu-netboot-test.yaml
diff --git a/.github/workflows/reusable-encryption-test.yaml b/.github/workflows/reusable-encryption-test.yaml
@@ -74,7 +74,7 @@ jobs:
           LUET_NOLOCK=true sudo -E luet install -y container/kubectl utils/k3d
       - name: Download ISO
         id: iso
-        uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
+        uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
         with:
           name: kairos-${{ steps.split.outputs.flavor }}-${{ steps.split.outputs.flavor_release }}-${{ inputs.variant }}-${{ inputs.arch }}-${{ inputs.model }}.iso.zip
       - name: Display structure of downloaded files
diff --git a/.github/workflows/reusable-qemu-netboot-test.yaml b/.github/workflows/reusable-qemu-netboot-test.yaml
@@ -75,7 +75,7 @@ jobs:
           cp ipxe/src/bin/ipxe.iso ipxe.iso
       - name: Download ISO
         id: iso
-        uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
+        uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
         with:
           name: kairos-${{ steps.split.outputs.flavor }}-${{ steps.split.outputs.flavor_release }}-${{ inputs.variant }}-${{ inputs.arch }}-${{ inputs.model }}.iso.zip
       - name: Extract ipxe artifacts for the ipxe server
diff --git a/.github/workflows/reusable-qemu-test.yaml b/.github/workflows/reusable-qemu-test.yaml
@@ -100,20 +100,20 @@ jobs:
           sudo apt-get install -y libvirt-clients libvirt-daemon-system libvirt-daemon virtinst bridge-utils qemu qemu-system-x86 qemu-system-x86 qemu-utils qemu-kvm acl udev mkisofs swtpm
           sudo setfacl -m u:runner:rwx /dev/kvm
       - name: Download artifacts
-        if: ${{ inputs.test != 'upgrade-latest' && inputs.test != 'provider-upgrade-latest-k8s-with-kubernetes' }}
-        uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
+        if: ${{ inputs.test != 'upgrade-latest-with-cli' && inputs.test != 'provider-upgrade-latest-k8s-with-kubernetes' }}
+        uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
         with:
           name: kairos-${{ steps.split.outputs.flavor }}-${{ steps.split.outputs.flavor_release }}-${{ inputs.variant }}-${{ inputs.arch }}-${{ inputs.model }}${{ inputs.kubernetes_distro != '' && format('-{0}', inputs.kubernetes_distro) || '' }}.iso.zip
       - name: Download latest release
         uses: robinraju/release-downloader@daf26c55d821e836577a15f77d86ddc078948b05 # v1.12
-        if: ${{ (inputs.test == 'upgrade-latest' || inputs.test == 'provider-upgrade-latest-k8s-with-kubernetes') && inputs.release-matcher == '' }}
+        if: ${{ (inputs.test == 'upgrade-latest-with-cli' || inputs.test == 'provider-upgrade-latest-k8s-with-kubernetes') && inputs.release-matcher == '' }}
         with:
           latest: true
           fileName: 'kairos-${{ steps.split.outputs.flavor }}-${{ steps.split.outputs.flavor_release }}-${{ inputs.variant }}-${{ inputs.arch }}-${{ inputs.model }}-*.iso'
           out-file-path: ""
       - name: Download latest release with release matcher
         uses: robinraju/release-downloader@daf26c55d821e836577a15f77d86ddc078948b05 # v1.12
-        if: ${{ (inputs.test == 'upgrade-latest' || inputs.test == 'provider-upgrade-latest-k8s-with-kubernetes') && inputs.release-matcher != '' }}
+        if: ${{ (inputs.test == 'upgrade-latest-with-cli' || inputs.test == 'provider-upgrade-latest-k8s-with-kubernetes') && inputs.release-matcher != '' }}
         with:
           latest: true
           fileName: ${{ inputs.release-matcher }}
diff --git a/.github/workflows/upload-cloud-images.yaml b/.github/workflows/upload-cloud-images.yaml
@@ -169,14 +169,14 @@ jobs:
       shouldBuild: ${{ steps.checkPushed.outputs.shouldBuild }}
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         with:
           persist-credentials: false
       - run: |
           git fetch --prune --unshallow
       # https://github.com/Azure/login?tab=readme-ov-file#azure-login-action
       - name: Azure login
-        uses: azure/login@v2
+        uses: azure/login@a65d910e8af852a8061c627c456678983e180302 # v2
         with:
           client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
@@ -230,7 +230,7 @@ jobs:
               --set "state_dir=/aurora"
 
       - name: Azure CLI script
-        uses: azure/cli@v2
+        uses: azure/cli@089eac9d8cc39f5d003e94f8b65efc51076c9cbd # v2
         if: ${{ steps.checkPushed.outputs.shouldBuild == 'true' }}
         env:
           GCP_PROJECT: palette-kairos
diff --git a/examples/builds/fedora-fips/Dockerfile b/examples/builds/fedora-fips/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/kairos/kairos-init:v0.4.2 AS kairos-init
+FROM quay.io/kairos/kairos-init:v0.4.3 AS kairos-init
 
 FROM fedora:40
 ARG VERSION=v0.0.1
diff --git a/examples/builds/rockylinux-fips/Dockerfile b/examples/builds/rockylinux-fips/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/kairos/kairos-init:v0.4.2 AS kairos-init
+FROM quay.io/kairos/kairos-init:v0.4.3 AS kairos-init
 
 FROM rockylinux:9
 ARG VERSION=v0.0.1
diff --git a/examples/builds/ubuntu-fips/Dockerfile b/examples/builds/ubuntu-fips/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/kairos/kairos-init:v0.4.2 AS kairos-init
+FROM quay.io/kairos/kairos-init:v0.4.3 AS kairos-init
 
 FROM ubuntu:20.04
 ARG VERSION=v0.0.1
diff --git a/examples/builds/ubuntu-non-hwe/Dockerfile b/examples/builds/ubuntu-non-hwe/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/kairos/kairos-init:v0.4.2 AS kairos-init
+FROM quay.io/kairos/kairos-init:v0.4.3 AS kairos-init
 
 FROM ubuntu:22.04 AS base-kairos
 ARG VERSION=v0.0.1
diff --git a/images/Dockerfile b/images/Dockerfile
@@ -1,14 +1,14 @@
 ARG BASE_IMAGE=ubuntu:20.04
 
-FROM quay.io/kairos/kairos-init:v0.4.2 AS kairos-init
+FROM quay.io/kairos/kairos-init:v0.4.3 AS kairos-init
 
 FROM ${BASE_IMAGE} AS base-kairos
 ARG VARIANT=core
 ARG MODEL=generic
 ARG TRUSTED_BOOT=false
 ARG KUBERNETES_DISTRO=k3s
 ARG KUBERNETES_VERSION=latest
-ARG FRAMEWORK_VERSION=v2.18.2
+ARG FRAMEWORK_VERSION=v2.19.0
 ARG VERSION
 
 COPY --from=kairos-init /kairos-init /kairos-init
diff --git a/tests/uki_test.go b/tests/uki_test.go
@@ -77,8 +77,8 @@ var _ = Describe("kairos UKI test", Label("uki"), Ordered, func() {
 		By("installing kairos", func() {
 			// Install has already started, so we can use Eventually here to track the logs
 			Eventually(func() string {
-				out, err := vm.Sudo("cat /var/log/kairos/agent*.log")
-				Expect(err).ToNot(HaveOccurred())
+				out, err := vm.Sudo("journalctl -t kairos-agent")
+				Expect(err).ToNot(HaveOccurred(), out)
 				return out
 			}, 5*time.Minute).Should(And(
 				ContainSubstring("Running after-install hook"),

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM quay.io/kairos/kairos-init:v0.4.2 AS kairos-init`
	`1`	`+FROM quay.io/kairos/kairos-init:v0.4.3 AS kairos-init`
`2`	`2`
`3`	`3`	`FROM fedora:40`
`4`	`4`	`ARG VERSION=v0.0.1`