diff options
| author | Robert Hensing <roberth@users.noreply.github.com> | 2022-11-09 13:53:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-09 13:53:57 +0100 |
| commit | 93a905ec4fbaf8d13d2debacb07b3ee2c2fc28fa (patch) | |
| tree | 0eb62975310020ab6341796c95614278c6efddab /nixos/modules/services/cluster | |
| parent | a8c4cb8835a5f91e9dd92397257452be8e551fe0 (diff) | |
| parent | 18e3f431e1b36d4f569ddddd415f95921e1b7748 (diff) | |
| download | nixpkgs-93a905ec4fbaf8d13d2debacb07b3ee2c2fc28fa.tar nixpkgs-93a905ec4fbaf8d13d2debacb07b3ee2c2fc28fa.tar.gz nixpkgs-93a905ec4fbaf8d13d2debacb07b3ee2c2fc28fa.tar.bz2 nixpkgs-93a905ec4fbaf8d13d2debacb07b3ee2c2fc28fa.tar.lz nixpkgs-93a905ec4fbaf8d13d2debacb07b3ee2c2fc28fa.tar.xz nixpkgs-93a905ec4fbaf8d13d2debacb07b3ee2c2fc28fa.tar.zst nixpkgs-93a905ec4fbaf8d13d2debacb07b3ee2c2fc28fa.zip | |
Merge pull request #194759 from hercules-ci/fqdn-or-hostname
nixos: Add `networking.fqdnOrHostName`
Diffstat (limited to 'nixos/modules/services/cluster')
| -rw-r--r-- | nixos/modules/services/cluster/kubernetes/kubelet.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix index 5dcd1829348..0898fee9bdb 100644 --- a/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -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 { |