[release-1.32] Backports for 2025-02

.drone.yml

@@ -47,14 +47,6 @@ steps:
   - name: docker
     path: /var/run/docker.sock
 
-- name: validate-cross-compilation
-  image: rancher/dapper:v0.6.0
-  commands:
-  - dapper validate-cross-compilation
-  volumes:
-  - name: docker
-    path: /var/run/docker.sock
-
 - name: fossa
   image: rancher/drone-fossa:latest
   failure: ignore

.github/workflows/build-k3s.yaml

@@ -7,10 +7,6 @@ on:
       type: string
       description: 'Architecture to build'
       default: 'ubuntu-latest'
-    upload-repo:
-      type: boolean
-      required: false
-      default: false
     upload-image:
       type: boolean
       required: false
@@ -34,22 +30,11 @@ jobs:
     - name: Build K3s image
       if: inputs.upload-image == true
       run: make package-image
-    - name: bundle repo
-      if: inputs.upload-repo == true
-      run: |
-        tar -czvf ../k3s-repo.tar.gz .
-        mv ../k3s-repo.tar.gz .
-    - name: "Upload K3s directory"
-      if: inputs.upload-repo == true
-      uses: actions/upload-artifact@v4
-      with:
-        name: k3s-repo.tar.gz
-        path: k3s-repo.tar.gz
     - name: "Save K3s image"
       if: inputs.upload-image == true
       run: docker image save rancher/k3s -o ./dist/artifacts/k3s-image.tar
     - name: "Upload K3s Artifacts"
-      if: inputs.upload-repo == false && inputs.arch == 'ubuntu-latest'
+      if: inputs.arch == 'ubuntu-latest'
       uses: actions/upload-artifact@v4
       with:
         name: k3s
@@ -59,4 +44,21 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: k3s-arm64
-        path: dist/artifacts/k3s*
+        path: dist/artifacts/k3s*
+  build-windows:
+    name: Build (windows)
+    if: inputs.arch == 'ubuntu-latest'
+    runs-on: ${{ inputs.arch }} # defaults to ubuntu-latest, for arm64 use ubuntu-24.04-arm
+    timeout-minutes: 20
+    steps:
+    - name: Checkout K3s
+      uses: actions/checkout@v4
+    - name: Build K3s binary
+      run: |
+        DOCKER_BUILDKIT=1 SKIP_IMAGE=1 SKIP_AIRGAP=1 SKIP_VALIDATE=1 GOCOVER=1 GOOS=windows make
+        sha256sum dist/artifacts/k3s.exe | sed 's|dist/artifacts/||' > dist/artifacts/k3s.exe.sha256sum
+    - name: "Upload K3s Artifacts"
+      uses: actions/upload-artifact@v4
+      with:
+        name: k3s-windows
+        path: dist/artifacts/k3s*

.github/workflows/install.yaml

@@ -105,3 +105,29 @@ jobs:
         with:
           ## If no one connects after 5 minutes, shut down server.
           wait-timeout-minutes: 5
+  test-windows:
+    name: "Smoke Test (windows)"
+    needs: build
+    runs-on: windows-2022
+    timeout-minutes: 10
+    steps:
+      - name: "Checkout"
+        uses: actions/checkout@v4
+        with: {fetch-depth: 1}
+      - name: "Download k3s binary"
+        uses: actions/download-artifact@v4
+        with:
+          name: k3s-windows
+          path: dist/artifacts/
+      - name: "Run K3s"
+        timeout-minutes: 5
+        run: |
+          $ErrorActionPreference = "Continue"
+          $PSNativeCommandUseErrorActionPreference = $true
+          $Server = Start-Job -ScriptBlock { ./dist/artifacts/k3s.exe server --token=token --embedded-registry --disable=metrics-server }
+          Start-Sleep -Seconds 15
+          D:/var/lib/rancher/k3s/data/current/bin/k3s.exe kubectl get node -o wide
+          D:/var/lib/rancher/k3s/data/current/bin/k3s.exe kubectl get pod -A -o wide
+          Stop-Job -Job $Server
+          Receive-Job -Wait -Job $Server
+          Remove-Job -Job $Server

.github/workflows/unitcoverage.yaml

@@ -26,8 +26,8 @@ permissions:
   contents: read
 
 jobs:
-  test:
-    name: Unit Tests
+  test-unit-linux:
+    name: Unit Tests (linux)
     runs-on: ubuntu-24.04
     timeout-minutes: 20
     steps:
@@ -38,8 +38,8 @@ jobs:
     - name: Install Go
       uses: ./.github/actions/setup-go
     - name: Run Unit Tests
-      run: | 
-        go test -coverpkg=./... -coverprofile=coverage.out ./pkg/... -run Unit
+      run: |
+        go test -coverpkg ./pkg/... -coverprofile coverage.out ./pkg/... -run Unit
         go tool cover -func coverage.out
     - name: On Failure, Launch Debug Session
       if: ${{ failure() }}
@@ -53,3 +53,25 @@ jobs:
         files: ./coverage.out
         flags: unittests # optional
         verbose: true # optional (default = false)
+  test-unit-windows:
+    name: Unit Tests (windows)
+    runs-on: windows-2022
+    timeout-minutes: 20
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 1
+    - name: Install Go
+      uses: actions/setup-go@v5
+    - name: Run Unit Tests
+      run: |
+        go test -coverpkg ./pkg/... -coverprofile coverage.out ./pkg/... -run Unit
+        go tool cover -func coverage.out
+    - name: Upload Results To Codecov
+      uses: codecov/codecov-action@v5
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}
+        files: ./coverage.out
+        flags: unittests # optional
+        verbose: true # optional (default = false)

.gitignore

@@ -21,7 +21,7 @@
 /image/go_build_agent
 /image/main.squashfs
 /package/k3s
-/package/data.tar.zst
+/package/data-*
 /pkg/data/zz_generated_bindata.go
 __pycache__
 /tests/.pytest_cache/

Dockerfile.dapper

@@ -52,7 +52,7 @@ ENV SELINUX=${SELINUX}
 
 # Set Dapper configuration variables
 ENV DAPPER_RUN_ARGS="--privileged -v k3s-cache:/go/src/github.com/k3s-io/k3s/.cache -v trivy-cache:/root/.cache/trivy" \
-    DAPPER_ENV="REPO TAG DRONE_TAG IMAGE_NAME SKIP_VALIDATE SKIP_IMAGE SKIP_AIRGAP AWS_SECRET_ACCESS_KEY AWS_ACCESS_KEY_ID GITHUB_TOKEN GOLANG GOCOVER DEBUG" \
+    DAPPER_ENV="REPO TAG DRONE_TAG IMAGE_NAME SKIP_VALIDATE SKIP_IMAGE SKIP_AIRGAP AWS_SECRET_ACCESS_KEY AWS_ACCESS_KEY_ID GITHUB_TOKEN GOLANG GOCOVER GOOS DEBUG" \
     DAPPER_SOURCE="/go/src/github.com/k3s-io/k3s/" \
     DAPPER_OUTPUT="./bin ./dist ./build/out ./build/static ./pkg/static ./pkg/deploy" \
     DAPPER_DOCKER_SOCKET=true \

Makefile

@@ -1,5 +1,6 @@
 TARGETS := $(shell ls scripts | grep -v \\.sh)
 GO_FILES ?= $$(find . -name '*.go' | grep -v generated)
+SHELL := /bin/bash
 
 
 .dapper:
@@ -9,7 +10,11 @@ GO_FILES ?= $$(find . -name '*.go' | grep -v generated)
 	@./.dapper.tmp -v
 	@mv .dapper.tmp .dapper
 
-$(TARGETS): .dapper
+.PHONY: docker.sock
+docker.sock:
+	while ! docker version 1>/dev/null; do sleep 1; done
+
+$(TARGETS): .dapper docker.sock
 	./.dapper $@
 
 .PHONY: deps
@@ -42,4 +47,4 @@ format:
 local:
 	DOCKER_BUILDKIT=1 docker build \
 		--build-arg="REPO TAG GITHUB_TOKEN GOLANG GOCOVER DEBUG" \
-		-t k3s-local -f Dockerfile.local --output=. .
+		-t k3s-local -f Dockerfile.local --output=. .