Commit graph

106 commits

Author SHA1 Message Date
Peder Bergebakken Sundt 470614b671 treewide: Fix typos 2023-09-28 19:06:13 +02:00
Aaron Jheng 0188e42d0a k3s: vendorSha256 -> vendorHash 2023-09-22 17:35:32 +02:00
R. Ryantm 3efa224e58 k3s: 1.27.5+k3s1 -> 1.27.6+k3s1 2023-09-22 04:55:12 +00:00
Aaron Jheng d38485921a
treewide: vendorSha256 -> vendorHash (#256514) 2023-09-21 19:11:11 +02:00
R. Ryantm 2a19147aa4 k3s: 1.27.4+k3s1 -> 1.27.5+k3s1 2023-09-14 04:58:31 +00:00
R. Ryantm d24242d841 k3s: 1.27.3+k3s1 -> 1.27.4+k3s1 2023-07-28 06:06:48 +00:00
github-actions[bot] e048c645c9
Merge master into staging-next 2023-07-20 00:02:29 +00:00
Thomas Gerbet dbd0bd32f9
Merge pull request #242272 from euank/k3s-1-26-6
k3s_1_26: 1.26.5+k3s1 -> 1.26.6+k3s1
2023-07-19 22:46:21 +02:00
github-actions[bot] c796e255b3
Merge staging-next into staging 2023-07-14 00:03:13 +00:00
Artturin 1c29673fcc treewide: go-modules -> goModules
In 787af0f79f
I had to change ${go-modules} to $goModules to allow overrideAttrs to work;
However, env vars cannot contain -, so  i had to change go-modules too.
This in turn broke nix-update because it uses the go-modules attr.

Instead of making nix-update more complicated, make go-modules naming match cargoDeps.

`fd --type f | xargs sd '\bgo-modules\b' 'goModules'`
and revert change to pkgs/applications/misc/dstask/default.nix
and pkgs/servers/http/dave/default.nix
and pkgs/os-specific/darwin/plistwatch/default.nix

release note added
2023-07-14 00:18:06 +03:00
Demitri Tzitzon d629ca54b2 k3s: symlinks for kubectl crictl & ctr 2023-07-09 20:40:36 +02:00
Euan Kemp f4079a45d3 k3s_1_26: 1.26.5+k3s1 -> 1.26.6+k3s1 2023-07-08 21:41:16 +09:00
Ryan Lahfa a0930d1a13
Merge pull request #239030 from euank/euan/k3s-1-26-bump 2023-07-08 14:24:52 +02:00
R. Ryantm 7d725c77f8 k3s: 1.27.2+k3s1 -> 1.27.3+k3s1 2023-07-06 00:44:48 +00:00
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