From b6465d40f2f15c89dd419515d7912751d1773ac3 Mon Sep 17 00:00:00 2001 From: Nicusor Huhulea Date: Mon, 25 Nov 2024 13:46:26 +0200 Subject: [PATCH] debian: upgrade to 1.31.1+k3s1 * update the go version in order for the k3s.service to start and the build to succeed. * preset DRONE_TAG in order to use the correct tag in the version script The official k3s build process is using dapper which we had to disable due to debian incompatibilities. DRONE_TAG is used by dapper therefore this was missing and the version part was falling back to a derived version which does not include the "k3s1" suffix. To ensure the proper versioning DRONE_TAG is initialized to the git tag version Signed-off-by: Nicusor Huhulea --- Makefile | 2 +- debian/changelog | 14 ++++++++++---- debian/control | 2 +- debian/copyright | 3 +++ debian/rules | 7 +++++++ debian/source/lintian-overrides | 2 +- go.mod | 2 +- 7 files changed, 24 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 23be742e613c..fbf2175b2863 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ TARGETS := $(shell ls scripts | grep -v \\.sh) GO_FILES ?= $$(find . -name '*.go' | grep -v generated) -GO_VERSION ?= 1.20.4 +GO_VERSION ?= 1.22.6 USE_DAPPER ?= 1 UNAME := $(shell uname -m) SHELL = /bin/bash diff --git a/debian/changelog b/debian/changelog index 6bd4eb7bedbd..02fb83071fe5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,25 +1,31 @@ +k3s (1.31.1+k3s1+ind1) UNRELEASED; urgency=medium + + * upgrade k3s + + -- Industrial OS Team Tue, 10 Dec 2024 13:46:00 +0200 + k3s (1.27.2+k3s1+mel4) UNRELEASED; urgency=medium * set HOME in rules to allow successful go builds - -- Joe MacDonald Fri, 14 Jul 2023 16:06:00 -0400 + -- Industrial OS Team Fri, 14 Jul 2023 16:06:00 -0400 k3s (1.27.2+k3s1+mel3) UNRELEASED; urgency=medium * Add git to Build-Depends since debian/source/format requires it - -- Mentor Embedded Tue, 11 Jul 2023 07:30:00 +0100 + -- Industrial OS Team Tue, 11 Jul 2023 07:30:00 +0100 k3s (1.27.2+k3s1+mel2) UNRELEASED; urgency=medium * local package * Correct service file exec locations - -- Joe MacDonald Tue, 04 Jul 2023 07:47:19 -0400 + -- Industrial OS Team Tue, 04 Jul 2023 07:47:19 -0400 k3s (1.27.2+k3s1+mel1) UNRELEASED; urgency=medium * local package * Packaging k3s from meta-virtualization for Sokol Linux - -- Joe MacDonald Thu, 20 Apr 2023 16:14:13 -0400 + -- Industrial OS Team Thu, 20 Apr 2023 16:14:13 -0400 diff --git a/debian/control b/debian/control index c48c9790d830..eddfbd5d4117 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Rules-Requires-Root: no Package: k3s Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ca-certificates, conntrack-tools, iproute2, ipset, iptables, libc6 (>= 2.37), containerd +Depends: ${shlibs:Depends}, ${misc:Depends}, ca-certificates, conntrack, iproute2, ipset, iptables, libc6 (>= 2.36), runc, libipset13, containerd Description: Lightweight Kubernetes client binary (k3s) K3s - Lightweight Kubernetes - is a portable, extensible, open-source platform for managing containerized workloads and services, that diff --git a/debian/copyright b/debian/copyright index 13e368695676..2e1444fdbc39 100644 --- a/debian/copyright +++ b/debian/copyright @@ -19,3 +19,6 @@ License: Apache-2.0 . On Debian systems, the complete text of the Apache version 2.0 license can be found in "/usr/share/common-licenses/Apache-2.0". + +Files: debian/* +Copyright: 2024, Siemens diff --git a/debian/rules b/debian/rules index 12d2b28c22a5..4b0ccbcdb30c 100755 --- a/debian/rules +++ b/debian/rules @@ -10,6 +10,10 @@ export USE_DAPPER ?= 0 # default solution to this problem for some packages: # https://lists.debian.org/debian-mentors/2018/08/msg00003.html export HOME = $(CURDIR) +# DRONE_TAG is used by dapper, which gets the version from the git tag, +# but because dapper is not used in the build process will initialize it +# here based on the git tag +DRONE_TAG=v1.31.1+k3s1 %: dh $@ @@ -22,6 +26,9 @@ override_dh_auto_configure: make generate endif +override_dh_auto_build: + dh_auto_build -- DRONE_TAG=$(DRONE_TAG) + override_dh_auto_test: @echo Skipping tests diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides index 4d5b846de3fb..de00adfd5ee0 100644 --- a/debian/source/lintian-overrides +++ b/debian/source/lintian-overrides @@ -38,4 +38,4 @@ unsupported-source-format # upstream sources aren't part of the git source format empty-upstream-sources # this is the formatting used by the k3s.io project for their releases -malformed-debian-changelog-version 1.27.2+k3s1+mel1 (for non-native) +malformed-debian-changelog-version 1.31.1+k3s1+mel5 (for non-native) diff --git a/go.mod b/go.mod index 3e922385d27c..e75765b7404a 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/k3s-io/k3s -go 1.22.5 +go 1.22.6 replace ( github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.11.7