Commit graph

92 commits

Author SHA1 Message Date
Euan Kemp ddd0723d15 k3s_1_26: 1.26.4+k3s1 -> 1.26.5+k3s1
This also allowed us to drop 'multicallContainerd' as a variable since
1.27 and 1.26 both use it now.

See https://github.com/k3s-io/k3s/issues/7475 for context.
2023-07-06 09:24:40 +09:00
Euan Kemp b671c2774d k3s_1_27: 1.27.1+k3s1 -> 1.27.2+k3s1
This also required making a builder change.

See https://github.com/k3s-io/k3s/issues/7475 for context.

This applies to 1.26 and 1.27, it just happens that 1.27 also worked
without it
2023-07-05 21:23:17 +09:00
Euan Kemp dce6feaf77 k3s: update update-script to support multiple minor versions
This should let the update bot help us keep old versions up to date.

1.26 update incoming...
2023-07-05 21:22:30 +09:00
Zhaofeng Li fca3189a7a k3s: Fix override 2023-06-23 15:23:50 -06:00
Ryan Lahfa 127cefc2f0
Merge pull request #232963 from euank/k3s-1_27 2023-06-21 15:58:02 +02:00
Ryan Lahfa e215adf3b8
Merge pull request #224483 from euank/k3s-readme
k3s: add packaging README regarding release versioning
2023-05-22 10:46:59 +02:00
Euan Kemp 2257ccd544 k3s: name builder less confusingly
Per PR feedback
2023-05-22 17:18:23 +09:00
Euan Kemp c71ef26ecc k3s: init 1.27.1+k3s1
On unstable, we're now tracking

| version | EOL |
|---------|-----|
| 1.24    | 07/2023 |
| 1.25    | 10/2023 |
| 1.26    | 02/2024 |
| 1.27    | 06/2024 |

This commit adds 1.27 using the 1_26 builder introduced in the last
commit.

Notably, this commit also updates the 'update.sh' script to work for the
new setup I have here.
2023-05-20 16:24:27 +09:00
Euan Kemp 457f56813d k3s: add "1_26" builder which can be used for 1_27 too
This is meant to make it easier to maintain multiple versions of the
package without having to copy+paste folders every time.

We can still copy+paste if the builders diverge enough to warrant it.
2023-05-20 15:59:23 +09:00
R. Ryantm c78b944213 k3s: 1.26.3+k3s1 -> 1.26.4+k3s1 2023-04-21 07:37:02 +00:00
Euan Kemp c5f2c2c17e k3s_1_23: drop deprecated k3s version
This version is no longer supported, as of roughly 1 week ago, according to [k8s upstream docs](https://kubernetes.io/releases/patch-releases/#non-active-branch-history).

There's additional discussion about the future of k3s versioning in #222604. This gets the simple uncontroversial change out of the way first to ensure people can't accidentally pick this unsupported version.
2023-04-04 10:19:46 +09:00
Euan Kemp d3c39539a3 k3s: add packaging README regarding release versioning 2023-04-03 23:25:02 +09:00
superherointj 7e9223c08e k3s: remove superherointj as maintainer 2023-03-31 16:29:45 -03:00
R. Ryantm 72d8ae6e08 k3s: 1.26.2+k3s1 -> 1.26.3+k3s1 2023-03-29 12:00:56 +00:00
Lukas Niederbremer 27e04d8d66 k3s: Adjust tags to dynamically link against sqlite 2023-03-21 15:54:45 +01:00
R. Ryantm e1c8e49e43 k3s: 1.26.1+k3s1 -> 1.26.2+k3s1 2023-03-14 08:22:04 +00:00
Jairo Llopis ae9aa5972d
k3s_1_24: 1.24.4+k3s1 -> 1.24.10+k3s1
This is essentially the same as 7cf8b72ddd, but for 1.24.
2023-02-23 13:41:43 +00:00
Euan Kemp c154180073 k3s: add ipset runtime dependency
Fixes #176445

The included change to the k3s test fails without the package change.
2023-02-19 14:38:40 +09:00
superherointj e836805076
Merge pull request #215482 from moduon/k3s-test-all-versions
k3s: test all versions
2023-02-14 12:31:32 -03:00
Jairo Llopis f0a6595fe5
k3s: add passthru.tests to all derivations 2023-02-13 08:33:20 +00:00
Jairo Llopis 7cf8b72ddd
k3s_1_23: 1.23.6+k3s1 -> 1.23.16+k3s1
- Update to latest upstream release.
- Include some changes from 0f9165d8b6 to fix downloads.
- Add myself as maintainer.

@moduon MT-1718
2023-02-09 09:04:20 +00:00
superherointj ce2fdc9766 k3s: add multiple versions 2023-02-07 12:27:14 -03:00
superherointj 2fa6c09924 k3s: add superherointj as maintainer 2023-01-31 07:54:28 -03:00
R. Ryantm e28154dccd k3s: 1.26.0+k3s2 -> 1.26.1+k3s1 2023-01-28 04:03:45 +00:00
Shawn8901 0a1dd3ced1 treewide: remove global with lib; in pkgs/{misc,networking} 2023-01-24 17:29:20 +01:00
Euan Kemp 0f9165d8b6 k3s: 1.25.3+k3s1 -> 1.26.0+k3s2
We dropped behind on releases for a bit due to our automatic update
script breaking.

This happened because of the traefik chart packaging changing
considerably. See the related upstream PR https://github.com/k3s-io/k3s/pull/6519

This updates our packaging to work with the new setup. Conveniently,
this also lets us drop a patch since chart packaging upstream has
simplified some too.
2023-01-17 17:54:38 +09:00
Sandro Jäckel 04a1c0d7ad
treewide: fix quoting of GITHUB_TOKEN in curl 2022-12-17 23:32:43 +01:00
R. Ryantm 16b094714a k3s: 1.25.2+k3s1 -> 1.25.3+k3s1 2022-10-26 09:16:53 +00:00
superherointj 2e19f2fa53 maintainers: remove superherointj 2022-10-04 14:06:48 -03:00
superherointj 2d55e4d1ee k3s: 1.25.2+k3s1 -> 1.25.2+k3s1 2022-10-02 13:01:47 -03:00
superherointj 49b299074d k3s: convenience change to update script 2022-10-02 11:11:00 -03:00
Nick Cao 6a3d7aeb8e
k3s: fix cross compilation 2022-09-21 10:02:51 +08:00
R. Ryantm 59447eb5d3 k3s: 1.24.4+k3s1 -> 1.25.0+k3s1 2022-09-15 13:37:03 +00:00
superherointj 925f53cc98 k3s: 1.24.3+k3s1 -> 1.24.4+k3s1 2022-08-25 20:49:56 -03:00
Euan Kemp d5b1e25711 nixos/tests/k3s: reorganize test into a subdirectory
In preperation for more tests, coming soon.
2022-07-30 11:55:23 -07:00
R. Ryantm 642aeda7af k3s: 1.24.2+k3s2 -> 1.24.3+k3s1 2022-07-19 05:22:44 +00:00
R. Ryantm 7b29bfd3af k3s: 1.24.2+k3s1 -> 1.24.2+k3s2 2022-07-08 05:44:30 +00:00
R. Ryantm 567bcc9216 k3s: 1.24.1+k3s1 -> 1.24.2+k3s1 2022-06-28 06:15:37 +00:00
superherointj e7313b2243 k3s: 1.23.6+k3s1 -> 1.24.1+k3s1 2022-06-15 16:40:29 -03:00
superherointj a6a0c44760 k3s: remove docker support 2022-06-15 16:40:29 -03:00
Euan Kemp 527f2375d0 k3s: 1.23.5+k3s1 -> 1.23.6+k3s1
This updates k3s.

This one's done by hand rather than via the update bot since the
upstream repo ended up in a state where `go mod download` didn't work,
and we had `proxyVendor` set (which causes a `go mod download`).

Deleting `proxyVendor` works now though, and I didn't actually fully
understand why it was needed before, so I've removed that. Which
unblocks the update.

The actual update was done via `./update.sh` after removing
`proxyVendor` and the `k3sServerVendorSha256` variables.
2022-05-07 14:56:39 -07:00
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