Merge branch 'master' into keylime

kairos-io · Nov 11, 2024 · 69b52ef · 69b52ef
2 parents e4e57d0 + 965a898
commit 69b52ef
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/.github/workflows/reusable-uki-test.yaml b/.github/workflows/reusable-uki-test.yaml
@@ -18,6 +18,9 @@ on:
       variant:
         required: true
         type: string
+      k3s_version:
+        required: false
+        type: string
 
 permissions: read-all
 jobs:
@@ -31,7 +34,7 @@ jobs:
     env:
       FLAVOR: ${{ inputs.flavor }}
       FLAVOR_RELEASE: ${{ inputs.flavor_release }}
-      TEMP_IMAGE: ttl.sh/${{ inputs.flavor }}-${{ inputs.flavor_release}}-${{ github.sha }}:6h
+      TEMP_IMAGE: ttl.sh/${{ inputs.flavor }}-${{ inputs.flavor_release}}-${{ inputs.variant }}-${{ github.sha }}:6h
     steps:
       - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
       - name: Install Go
@@ -69,7 +72,8 @@ jobs:
             --MODEL=generic \
             --VARIANT=${{ inputs.variant }} \
             --BASE_IMAGE=${{ inputs.base_image }} \
-            --BOOTLOADER=systemd-boot
+            --BOOTLOADER=systemd-boot \
+            --K3S_VERSION=${{ inputs.k3s_version }}
       - name: Push image to ttl.sh
         run: |
           docker tag $(cat build/IMAGE) $TEMP_IMAGE

diff --git a/.github/workflows/scorecards.yaml b/.github/workflows/scorecards.yaml
@@ -22,7 +22,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
 

diff --git a/.github/workflows/uki.yaml b/.github/workflows/uki.yaml
@@ -27,6 +27,7 @@ jobs:
             family: ubuntu
             base_image: ubuntu:24.04
             variant: standard
+            k3s_version: 1.31.1 # we need to use a matrix like we do in the other pipelines, but adding manually now just to see if this makes it work
           - flavor: fedora
             family: rhel
             flavor_release: 40

diff --git a/Earthfile b/Earthfile
@@ -6,11 +6,11 @@ ARG LUET_VERSION=0.35.5
 # renovate: datasource=docker depName=aquasec/trivy versioning=semver
 ARG TRIVY_VERSION=0.56.2
 # renovate: datasource=docker depName=anchore/grype versioning=semver
-ARG GRYPE_VERSION=v0.82.1
+ARG GRYPE_VERSION=v0.82.2
 # renovate: datasource=docker depName=quay.io/kairos/framework versioning=semver
 ARG KAIROS_FRAMEWORK_VERSION=v2.14.1
 # renovate: datasource=docker depName=quay.io/kairos/osbuilder-tools versioning=semver
-ARG OSBUILDER_VERSION=v0.400.2
+ARG OSBUILDER_VERSION=v0.400.3
 # renovate: datasource=docker depName=golang versioning=semver
 ARG GO_VERSION=1.22
 # renovate: datasource=docker depName=hadolint/hadolint