gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #194759 from hercules-ci/fqdn-or-hostname

Browse Source 
nixos: Add `networking.fqdnOrHostName`
This commit is contained in:
Robert Hensing
2022-11-09 13:53:57 +01:00
committed by GitHub
parent a8c4cb8835 18e3f431e1
commit 93a905ec4f
9 changed files with 36 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/modules/services/cluster/kubernetes/kubelet.nix
View File

@@ -177,8 +177,7 @@ in
hostname = mkOption {
description = lib.mdDoc "Kubernetes kubelet hostname override.";
default = config.networking.hostName;
defaultText = literalExpression "config.networking.hostName";
defaultText = literalExpression "config.networking.fqdnOrHostName";
type = str;
};
@@ -349,8 +348,8 @@ in
boot.kernelModules = ["br_netfilter" "overlay"];
services.kubernetes.kubelet.hostname = with config.networking;
mkDefault (hostName + optionalString (domain != null) ".${domain}");
services.kubernetes.kubelet.hostname =
mkDefault config.networking.fqdnOrHostName;
services.kubernetes.pki.certs = with top.lib; {
kubelet = mkCert {