movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-09 19:13:26 +03:00
Code Issues Projects Releases Packages Wiki Activity

Revert "treewide: migrate nixos modules to networking.hosts"

Browse source 
This reverts commit cd64f1bd87.
This commit is contained in:
John Titor 2025-06-09 00:10:05 +05:30
parent 7c873c2d00
commit c87464cb0c
No known key found for this signature in database
GPG key ID: 29B0514F4E3C1CC0
4 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

9
nixos/modules/services/cluster/kubernetes/pki.nix
View file

@ -365,12 +365,9 @@ in
keyFile = mkDefault key;
trustedCaFile = mkDefault caCert;
};
networking.hosts = mkIf (config.services.etcd.enable) {
"127.0.0.1" = [
"etcd.${top.addons.dns.clusterDomain}"
"etcd.local"
];
};
networking.extraHosts = mkIf (config.services.etcd.enable) ''
127.0.0.1 etcd.${top.addons.dns.clusterDomain} etcd.local
'';
services.flannel = with cfg.certs.flannelClient; {
kubeconfig = top.lib.mkKubeConfig "flannel" {

10
nixos/modules/virtualisation/google-compute-config.nix
View file

@ -70,12 +70,10 @@ in
# Rely on GCP's firewall instead
networking.firewall.enable = mkDefault false;
networking.hosts = {
"169.254.169.254" = [
"metadata.google.internal"
"metadata"
];
};
# Configure default metadata hostnames
networking.extraHosts = ''
169.254.169.254 metadata.google.internal metadata
'';
networking.timeServers = [ "metadata.google.internal" ];

12
nixos/modules/virtualisation/nixos-containers.nix
View file

@ -1084,10 +1084,14 @@ in
) config.containers;
# Generate /etc/hosts entries for the containers.
networking.hosts = lib.mapAttrs' (name: cfg: {
name = head (splitString "/" cfg.localAddress);
value = lib.optionals (cfg.localAddress != null) [ "${name}.containers" ];
}) config.containers;
networking.extraHosts = concatStrings (
mapAttrsToList (
name: cfg:
optionalString (cfg.localAddress != null) ''
${head (splitString "/" cfg.localAddress)} ${name}.containers
''
) config.containers
);
networking.dhcpcd.denyInterfaces = [
"ve-*"