summary refs log tree commit diff
path: root/nixos/modules/services/cluster/kubernetes/apiserver.nix
diff options
context:
space:
mode:
authorSilvan Mosberger <contact@infinisil.com>2019-12-10 02:51:19 +0100
committerSilvan Mosberger <contact@infinisil.com>2019-12-10 02:51:19 +0100
commit4ee3e8b21dfeaf236b86a0c109953dd809a77e64 (patch)
tree79bf61d3635aa336cd88d215470be66f489cc267 /nixos/modules/services/cluster/kubernetes/apiserver.nix
parentcd9ace689274fedd7e95dabdc99041d4c799c3dc (diff)
downloadnixpkgs-4ee3e8b21dfeaf236b86a0c109953dd809a77e64.tar
nixpkgs-4ee3e8b21dfeaf236b86a0c109953dd809a77e64.tar.gz
nixpkgs-4ee3e8b21dfeaf236b86a0c109953dd809a77e64.tar.bz2
nixpkgs-4ee3e8b21dfeaf236b86a0c109953dd809a77e64.tar.lz
nixpkgs-4ee3e8b21dfeaf236b86a0c109953dd809a77e64.tar.xz
nixpkgs-4ee3e8b21dfeaf236b86a0c109953dd809a77e64.tar.zst
nixpkgs-4ee3e8b21dfeaf236b86a0c109953dd809a77e64.zip
nixos/treewide: Move rename.nix imports to their respective modules
A centralized list for these renames is not good because:
- It breaks disabledModules for modules that have a rename defined
- Adding/removing renames for a module means having to find them in the
central file
- Merge conflicts due to multiple people editing the central file
Diffstat (limited to 'nixos/modules/services/cluster/kubernetes/apiserver.nix')
-rw-r--r--nixos/modules/services/cluster/kubernetes/apiserver.nix12
1 files changed, 12 insertions, 0 deletions
diff --git a/nixos/modules/services/cluster/kubernetes/apiserver.nix b/nixos/modules/services/cluster/kubernetes/apiserver.nix
index 33796bf2e08..95bdb4c0d14 100644
--- a/nixos/modules/services/cluster/kubernetes/apiserver.nix
+++ b/nixos/modules/services/cluster/kubernetes/apiserver.nix
@@ -13,6 +13,18 @@ let
   )) + ".1");
 in
 {
+
+  imports = [
+    (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "admissionControl" ] [ "services" "kubernetes" "apiserver" "enableAdmissionPlugins" ])
+    (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "address" ] ["services" "kubernetes" "apiserver" "bindAddress"])
+    (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "port" ] ["services" "kubernetes" "apiserver" "insecurePort"])
+    (mkRemovedOptionModule [ "services" "kubernetes" "apiserver" "publicAddress" ] "")
+    (mkRenamedOptionModule [ "services" "kubernetes" "etcd" "servers" ] [ "services" "kubernetes" "apiserver" "etcd" "servers" ])
+    (mkRenamedOptionModule [ "services" "kubernetes" "etcd" "keyFile" ] [ "services" "kubernetes" "apiserver" "etcd" "keyFile" ])
+    (mkRenamedOptionModule [ "services" "kubernetes" "etcd" "certFile" ] [ "services" "kubernetes" "apiserver" "etcd" "certFile" ])
+    (mkRenamedOptionModule [ "services" "kubernetes" "etcd" "caFile" ] [ "services" "kubernetes" "apiserver" "etcd" "caFile" ])
+  ];
+
   ###### interface
   options.services.kubernetes.apiserver = with lib.types; {