Commit Graph

51 Commits

Author SHA1 Message Date
superherointj
f8dc166d73 k3s: 1.23.4+k3s1 -> 1.23.5+k3s1 2022-04-12 13:49:27 -03:00
R. Ryantm
4d35db2050 k3s: 1.23.3+k3s1 -> 1.23.4+k3s1 2022-03-15 04:42:53 +00:00
superherointj
fa6becdfa3 k3s: fix update script 2022-03-12 10:50:29 -03:00
superherointj
820d3be488 k3s: add superherointj to maintainers 2022-02-27 15:05:51 -08:00
superherointj
f79572f92f k3s: update script fixed 2022-02-27 15:05:51 -08:00
Euan Kemp
02f8cd56dc k3s: add mic92 as a maintainer
Per https://github.com/NixOS/nixpkgs/pull/158089#issuecomment-1033397045
2022-02-11 01:51:50 -08:00
Euan Kemp
7a7335d43e k3s: v1.22.3+k3s1 -> 1.23.3+k3s1
This PR also reworks the packaging of k3s significantly.

Notably, it makes the following changes:

1. buildGoModule instead of buildGoPackage + mkDerivation (for the final one)
2. Merges the final two derivations (k3s user binary + wrapper script stuff) into one
3. Reduces the amount of patching & usage of upstream packaging scripts

And of course updates to 1.23

I'm not really sure yet if this is significantly better than the
previous packaging model, but it at least seems a little nicer I guess?
buildGoModule is nice, even if we have to hack around it quite a bit to
get a 'go generate' in there.
2022-02-08 00:43:41 -08:00
Fabian Möller
4329d79dba
nixos/tests: link tests to their packages 2022-01-23 21:08:10 +01:00
R. Ryantm
2dafedfda4 k3s: 1.22.2+k3s2 -> 1.22.3+k3s1 2021-11-14 03:20:02 +00:00
superherointj
df4fac48fc maintainers: remove superherointj 2021-11-02 18:22:31 -07:00
github-actions[bot]
6bb6e64046
Merge master into staging-next 2021-10-26 12:01:25 +00:00
superherointj
451e72636e k3s: updateScript 6th fix 2021-10-23 10:33:17 -03:00
superherointj
834dec327f k3s: 1.21.4+k3s1 -> 1.22.2+k3s2 2021-10-23 10:32:28 -03:00
github-actions[bot]
872437b0f0
Merge master into staging-next 2021-10-21 00:01:47 +00:00
superherointj
5a1513b87f k3s: fix updateScript 5th attempt 2021-10-20 17:28:16 -03:00
Martin Weinelt
adf4e67dd4 Merge remote-tracking branch 'origin/staging' into staging-next 2021-10-15 01:34:36 +02:00
superherointj
235dccbfff k3s: update script fix #3 2021-10-14 15:17:45 -03:00
Florian Klink
b112f366fb
Merge pull request #81172 from misuzu/iptables-switch
iptables: switch from iptables-legacy to iptables-nftables-compat
2021-10-12 12:38:56 +02:00
superherointj
bc9b01fadd k3s: updateScript updated 2021-10-06 15:00:47 -03:00
superherointj
bf2a70691b fluxcd: fix escape on updateScript 2021-10-02 22:58:03 -03:00
superherointj
39f00331dd k3s: fix escape on updateScript 2021-10-02 22:57:59 -03:00
misuzu
f8235a5981 k3s: drop ipset for compatibility with iptables-nft 2021-09-28 10:47:50 +03:00
superherointj
000ae67128 k3s: add updateScript 2021-09-22 00:06:13 -03:00
superherointj
34fc789a94 k3s: 1.21.3+k3s1 -> 1.21.4+k3s1 2021-08-25 16:11:48 -03:00
superherointj
b675981126 k3s: 1.21.2+k3s1 -> 1.21.3+k3s1 2021-07-23 05:39:35 -03:00
superherointj
5494ab9fde k3s: 1.21.0+k3s1 -> 1.21.2+k3s1 2021-07-12 12:22:02 -03:00
superherointj
a10ede5a5a k3s: 1.20.6+k3s1 -> 1.21.0+k3s1 2021-05-11 06:36:41 -03:00
Euan Kemp
5cb6f477f4 k3s: 1.20.5+k3s1 -> 1.20.6+k3s1
Fixes CVE-2021-25735.
2021-04-21 00:07:08 -07:00
superherointj
8eaac77048 k3s: 1.20.4+k3s1 -> 1.20.5+k3s1
Extra:
@r-rmcgibbo bot requested 'makeWrapper' to be moved from buildInputs to nativeBuildInputs.
2021-04-08 14:04:04 -03:00
Sandro Jäckel
9378fdf87e
iproute: deprecate alias 2021-04-04 01:43:46 +02:00
Euan Kemp
f922b3016c k3s: 1.19.4+k3s2 -> 1.20.4+k3s1
Notably, this includes support for unified cgroups in k3s, which is
especially convenient given nixos has moved to them.

Fixes (at least partly) #111835
2021-03-26 06:31:49 +00:00
Sandro Jäckel
0c9db04497
k3s: Avoid string conversion 2021-02-05 12:51:21 +01:00
Ben Siraphob
5d566c43b4 pkgs/applications: pkgconfig -> pkg-config 2021-01-16 23:49:59 -08:00
Mario Rodas
895974a19a k3s: fix name
Fixes https://github.com/NixOS/nixpkgs/issues/107624
2020-12-26 06:50:00 -05:00
Florian Klink
02e058ed09
Merge pull request #106423 from euank/k3s-update-1.19.4
k3s: 1.19.2+k3s1 -> 1.19.4+k3s2
2020-12-09 21:14:32 +01:00
Euan Kemp
6eb941d8c4 k3s: propagate runtime dependencies of the k3s binary
Fixes #101734

Prior to this change, the k3s binary included a tarball containing
binaries like 'kubectl', but didn't keep a runtime reference to those
runtime dependencies in plaintext (since they were gzipped inside the
single combined k3s binary).

In order for nix's automatic runtime dependency detection to work, we
need to have a reference to them somewhere in $out.
propagatedBuildInputs seems to do the right thing for us here.
Running `nix-store -q --tree /nix/store/path/to/k3s` produces a
different output after this change which includes the `libseccomp`
reference I expect.
2020-12-09 00:08:15 -08:00
Euan Kemp
5ca87dcf73 k3s: 1.19.2+k3s1 -> 1.19.4+k3s2
This includes a fix for CVE-2020-15257, as described in the upstream
release notes: https://github.com/k3s-io/k3s/releases/tag/v1.19.4%2Bk3s2
2020-12-08 23:56:50 -08:00
Graham Christensen
bc49a0815a
utillinux: rename to util-linux 2020-11-24 12:42:06 -05:00
freezeboy
e3ca548320 k3s: add version field 2020-11-07 12:15:10 -08:00
Euan Kemp
7661b55417 k3s: add modprobe to k3s's PATH
Otherwise we get warnings like 'level=warning msg="failed to start
br_netfilter module"' in k3s's logs.

Adding modprobe to k3s's PATH fixes the warning at least. I'm not
certain if it fixes any real issue or not.
2020-10-26 01:40:36 -07:00
Ben Siraphob
683a87dbeb treewide: remove periods from end of package descriptions 2020-10-17 08:22:31 -07:00
Christoph Herzog
549131de56 k3s: 1.18.8+k3s1 -> 1.19.2-k3s1 2020-10-10 16:17:22 +02:00
Euan Kemp
6781a5f784 k3s: 1.18.2 -> 1.18.8 2020-09-07 00:42:00 -07:00
Euan Kemp
a432801ff3 k3s: 1.17.3 -> 1.18.2
Fairly straightforward update. I properly git format-patch'd the
patches too.
2020-05-31 19:13:09 -07:00
Euan Kemp
e61dc85117 k3s: fix build for aarch64
The upstream project already builds and releases for aarch64. This makes
the couple small tweaks that I found necessary for k3s to cross-compile
for aarch64.

I also ran it through nixpkgs-fmt.
2020-05-09 08:37:06 +02:00
zowoq
b5dc07a4b4 treewide: use $out instead of $bin with buildGoPackage 2020-04-28 20:30:29 +10:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Euan Kemp
617fa430d7 k3s: update maintainers, per pr comment 2020-04-06 21:45:59 -07:00
Euan Kemp
83f827cba7 k3s: remove extra buildInputs
In the intial version of this package, I missed a few inputs that
weren't needed including a debug hook.
2020-04-06 21:45:59 -07:00
Michael Bishop
f03c088a36
k3s: fix https://hydra.nixos.org/build/116132269 2020-04-05 15:45:46 -03:00