summary refs log tree commit diff
path: root/nixos/modules/rename.nix
diff options
context:
space:
mode:
authorJohan Thomsen <jth@dbc.dk>2018-06-08 10:16:43 +0200
committerJohan Thomsen <jth@dbc.dk>2018-06-12 22:47:32 +0200
commit8d7ea96a13ab569d69aa7feaaa99f0d896b4f97a (patch)
tree9397f90b1e9829ee54405a0e882b91cfa2d4bb05 /nixos/modules/rename.nix
parentda8920622a8b8574a07feadf1f917da71509008b (diff)
downloadnixlib-8d7ea96a13ab569d69aa7feaaa99f0d896b4f97a.tar
nixlib-8d7ea96a13ab569d69aa7feaaa99f0d896b4f97a.tar.gz
nixlib-8d7ea96a13ab569d69aa7feaaa99f0d896b4f97a.tar.bz2
nixlib-8d7ea96a13ab569d69aa7feaaa99f0d896b4f97a.tar.lz
nixlib-8d7ea96a13ab569d69aa7feaaa99f0d896b4f97a.tar.xz
nixlib-8d7ea96a13ab569d69aa7feaaa99f0d896b4f97a.tar.zst
nixlib-8d7ea96a13ab569d69aa7feaaa99f0d896b4f97a.zip
nixos/kubernetes: improvements
- Added option 'cni.configDir' to allow for having CNI config outside of nix-store
  Existing behavior (writing verbatim CNI conf-files to nix-store) is still available.

- Removed unused option 'apiserver.publicAddress' and changed 'apiserver.address' to 'bindAddress'
  This conforms better to k8s docs and removes existing --bind-address hardcoding to 0.0.0.0

- Fixed c/p mistake in apiserver systemd unit description

- Updated 18.09 release notes to reflect changes to existing options
  And fixed some typos from previous PR

- Make docker images for Kubernetes Dashboard and kube-dns configurable
Diffstat (limited to 'nixos/modules/rename.nix')
-rw-r--r--nixos/modules/rename.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 9b9e9e7109de..2df737452fbc 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -32,6 +32,8 @@ with lib;
     (mkRenamedOptionModule [ "services" "i2pd" "extIp" ] [ "services" "i2pd" "address" ])
     (mkRenamedOptionModule [ "services" "kibana" "host" ] [ "services" "kibana" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "admissionControl" ] [ "services" "kubernetes" "apiserver" "enableAdmissionPlugins" ])
+    (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "address" ] ["services" "kubernetes" "apiserver" "bindAddress"])
+    (mkRemovedOptionModule [ "services" "kubernetes" "apiserver" "publicAddress" ] "")
     (mkRenamedOptionModule [ "services" "logstash" "address" ] [ "services" "logstash" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "mpd" "network" "host" ] [ "services" "mpd" "network" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "listenAddress" ])