Commit graph

348 commits

Author SHA1 Message Date
Wolfgang Walther 5cbdb94f3a
treewide: remove redundant parentheses
Auto-fixed by nixf-diagnose.

(cherry picked from commit 91a8fee3aa)
2025-10-05 12:59:25 +02:00
Wolfgang Walther aefcb0d50d
treewide: run nixfmt 1.0.0 2025-07-24 14:58:18 +02:00
Jost Alemann a91f59ad63 nixos/k3s: fix typo
(cherry picked from commit 3086227f72)
2025-07-12 14:46:24 +00:00
Morgan Jones adf964c0de kubernetes: use util-linuxMinimal instead of util-linux.withPatches
This, and commits to k3s and util-linux close #409339.
The util-linux.withPatches API was a temporary hack for the 25.05
release to fix Kubernetes, and is going away.

While we're at it, we should use util-linuxMinimal because we do not
need things such as systemd support for kubelet initialization.

(cherry picked from commit 949e299d24)
2025-07-05 02:24:36 +00:00
Morgan Jones 2870d0deb6 nixos/kubernetes: use util-linux.withPatches
(cherry picked from commit e14de85830)
2025-05-29 05:43:28 +00:00
Robert Rose 4baad06ecf nixos/k3s: add default hash for autoDeployCharts module 2025-04-26 13:45:00 +02:00
Robert Rose e77d893ef4 nixos/k3s: replace deprecated --no-deploy flag in option description 2025-04-03 11:01:47 +02:00
Silvan Mosberger 374e6bcc40 treewide: Format all Nix files
Format all Nix files using the officially approved formatter,
making the CI check introduced in the previous commit succeed:

  nix-build ci -A fmt.check

This is the next step of the of the [implementation](https://github.com/NixOS/nixfmt/issues/153)
of the accepted [RFC 166](https://github.com/NixOS/rfcs/pull/166).

This commit will lead to merge conflicts for a number of PRs,
up to an estimated ~1100 (~33%) among the PRs with activity in the past 2
months, but that should be lower than what it would be without the previous
[partial treewide format](https://github.com/NixOS/nixpkgs/pull/322537).

Merge conflicts caused by this commit can now automatically be resolved while rebasing using the
[auto-rebase script](8616af08d9/maintainers/scripts/auto-rebase).

If you run into any problems regarding any of this, please reach out to the
[formatting team](https://nixos.org/community/teams/formatting/) by
pinging @NixOS/nix-formatting.
2025-04-01 20:10:43 +02:00
Marcus Ramberg d07ebbab9b
nixos/k3s: add autoDeployCharts option and use systemd-tmpfiles for content activation (#374017) 2025-03-15 11:26:43 +01:00
Peder Bergebakken Sundt 953f72e76e nixos/*: tag manpage references 2025-01-27 02:47:01 +01:00
Robert Rose d3cd8299b4 nixos/k3s: use systemd-tmpfiles to activate k3s content
Formerly a `ExecStartPre` script was used to link k3s content.
Building the script got fairly messy and it had some footguns like
forgetting to create parent directories before linking or silent
overriding of existing links.
2025-01-23 16:34:35 +01:00
Robert Rose 95b894bad7 nixos/k3s: add autoDeployCharts option
The `autoDeployCharts` option further improves the auto deploying
capabilities of the k3s module by allowing to deploy and configure Helm charts
that are then instaled via the k3s Helm controller. Although this was
also previously possible by using auto deploying manifests, it required
some knowledge of the k3s Helm controller and led to a lot of
boilerplate code.
2025-01-23 16:34:35 +01:00
piegames dd7d5339f7 treewide: Fix incorrect string indentations 2025-01-07 19:49:28 +01:00
Alexandru Scvortov 66ddf84c33 kubernetes: kubelet.extraConfig should be attrsOf json.type 2025-01-02 18:59:24 +00:00
illustris 814015be43
nixos/hadoop: fix HBase 2024-12-20 12:30:03 +05:30
Sandro 12c53e4e68
nixos/hadoop: fix, hadoop: 3.4.0 -> 3.4.1 (#364992) 2024-12-17 23:56:12 +01:00
Christina Sørensen 5d48167f78
nixos/kubernetes/kubelet: Fix sandbox image load on containerd 2.x (#364558) 2024-12-14 12:45:14 +01:00
illustris c62ec80d1f
hadoop, nixos/hadoop, nixosTests/hadoop: nixfmt 2024-12-14 00:31:48 +05:30
illustris bdd10c641e
nixos/hadoop: fix failing yarn tests 2024-12-13 23:18:14 +05:30
illustris 61dd3fdae2
nixos/hadoop: fix lib function calls 2024-12-13 23:12:15 +05:30
Sarah Brofeldt 278f0be608 nixos/kubernetes/kubelet: Fix sandbox image load on containerd 2.x 2024-12-13 10:21:12 +01:00
Robert Rose 759d2b8646 nixos/k3s: make assertions about missing configuration options warnings
It is possible to configure k3s in various ways (cli flags, env
variables, single config file, multiple config files) and everything is
merged together in a final config. The nixos module cannot know if a
configuration option that is missing from the module point of view is
supplied in another way, so it shouldn't assert missing configuration
options.
2024-12-11 22:29:21 +01:00
Silvan Mosberger 4f0dadbf38 treewide: format all inactive Nix files
After final improvements to the official formatter implementation,
this commit now performs the first treewide reformat of Nix files using it.
This is part of the implementation of RFC 166.

Only "inactive" files are reformatted, meaning only files that
aren't being touched by any PR with activity in the past 2 months.
This is to avoid conflicts for PRs that might soon be merged.
Later we can do a full treewide reformat to get the rest,
which should not cause as many conflicts.

A CI check has already been running for some time to ensure that new and
already-formatted files are formatted, so the files being reformatted here
should also stay formatted.

This commit was automatically created and can be verified using

    nix-build a08b3a4d19.tar.gz \
      --argstr baseRev b32a094368
    result/bin/apply-formatting $NIXPKGS_PATH
2024-12-10 20:26:33 +01:00
Philip Taron 0311f6c40e
treewide/nixos: remove with lib; part 5 (#335647) 2024-12-09 16:04:21 -08:00
Marcus Ramberg 37da609352
nixos/k3s: add nftables to Path of k3s service (#360796) 2024-12-09 21:45:25 +01:00
nicoo d0e6b0e170 dockerTools.pullImage: accept hash parameter 2024-12-09 14:28:24 +01:00
RMT 7ece479f39
nixos/k3s: add extraKubeProxyConfig option to add nftables to k3s's path 2024-12-08 23:27:37 +08:00
Felix Buehler c41bc079d1 nixos/services.kubernetes.scheduler: remove with lib; 2024-12-08 13:21:50 +01:00
Felix Buehler ac653187c5 nixos/services.kubernetes: remove with lib; 2024-12-08 13:21:50 +01:00
Felix Buehler 697d1c3660 nixos/services.kubernetes.controllerManager: remove with lib; 2024-12-08 13:21:50 +01:00
Felix Buehler e75e6693b7 nixos/services.kubernetes.apiserver: remove with lib; 2024-12-08 13:21:50 +01:00
Felix Buehler 42a84adc1c nixos/services.kubernetes.addonManager: remove with lib; 2024-12-08 13:21:50 +01:00
Felix Buehler c1109e87b0 nixos/services.hadoop.yarn: remove with lib; 2024-12-08 13:21:49 +01:00
Felix Buehler e7e4c15a19 nixos/services.hadoop.hdfs: remove with lib; 2024-12-08 13:21:49 +01:00
Felix Buehler decec5eaa3 nixos/services.hadoop.hbase*: remove with lib; 2024-12-08 13:21:49 +01:00
Felix Buehler e5c3196d17 nixos/services.hadoop: remove with lib; 2024-12-08 13:21:49 +01:00
Felix Buehler ddcd8d565e nixos/services.corosync: remove with lib; 2024-12-08 13:21:49 +01:00
Felix Buehler 400d31aeb5 nixos/services.spark: remove with lib; 2024-09-15 10:43:48 +02:00
Felix Buehler 7e25c525fe nixos/services.rke2: remove with lib; 2024-09-15 10:43:48 +02:00
Felix Buehler 92566faf1c nixos/services.patroni: remove with lib; 2024-09-15 10:43:47 +02:00
Felix Buehler 7b141e6b8f nixos/services.pacemaker: remove with lib; 2024-09-15 10:43:47 +02:00
Felix Buehler 980a655feb nixos/services.kubernetes.addons.dns: remove with lib; 2024-09-15 10:43:47 +02:00
Felix Buehler 6ebec4f097 nixos/services.k3s: remove with lib; 2024-09-15 10:43:47 +02:00
Sarah Brofeldt 8a508485c4
nixos/kubernetes: add extraConfig to kubelet config (#338526) 2024-09-08 20:35:46 +02:00
Sarah Brofeldt a1863c871e nixos/kubernetes: amend dns addon clusterDns list
With 24.11, this is the required type, and we rely on this for the NixOS
tests
2024-09-01 15:13:11 +02:00
Tristan Gosselin-Hane 2d54b2b048 nixos/kubernetes: allow setting multiple kubelet dns resolvers
The current kubernetes module only allows you to set a single DNS
resolver for the kubelet. Historically, this has not mattered as the
value was passed to a cli argument as a string and as per the kubelet's
configuration parsing mechanism, multiple values could be passed as a
comma-delimited string. However, recently, the module was refactored to
make configure kubernetes components via configuration files rather than
the deprecated command-line arguments. These files more strongly-typed
than CLI arguments and to pass multiple values, one must define a list
in the file. When this change was made, an incorrect assumption was made
that only a single DNS server could be specified and forced a
single-item list into this configuration file. We need to introduce a
breaking change to the module in order to allow the user to supply their
own list with however many dns resolvers they wish to use.
2024-08-30 22:17:00 -04:00
Tristan Gosselin-Hane 5a03aa5a45 nixos/kubernetes: add extraConfig to kubelet config
Every now and then, kubernetes adds new configuration parameters to the
kubelet configuration. Since this is defined using a nix attrset which
is then converted to json/yaml, it would be nice to have an escape hatch
similar to the extraOpts one that exists for additional CLI arguments.
The typical use case would be to configure new settings before they are
officially supported in the nixos module.
2024-08-30 22:12:40 -04:00
Felix Buehler bff67892a7 nixos/services.kubernetes.flannel: remove with lib; 2024-08-30 00:30:38 +02:00
superherointj 3a158316b8
Merge pull request #332183 from codedownio/k3s-containerd-config
nixos/k3s: add containerdConfigTemplate option
2024-08-13 04:03:59 -03:00
Tom McLaughlin 81c0783c0e nixos/k3s: add containerdConfigTemplate option 2024-08-12 14:58:18 -07:00