summary refs log tree commit diff
path: root/nixos/modules/services/cluster
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2019-05-18 09:57:12 +0000
committerGitHub <noreply@github.com>2019-05-18 09:57:12 +0000
commita1dcac5104ed0eb93d92874f2fcad8642e972b61 (patch)
tree3b6f710e4004920042e52219cf3dd04cfdf54b6d /nixos/modules/services/cluster
parent6cf583cf2f8d3cb89fa8a4d6edd86f4236862ea6 (diff)
parentb278cd86e1ce74e16ab3478dd328d7ad13519670 (diff)
downloadnixpkgs-a1dcac5104ed0eb93d92874f2fcad8642e972b61.tar
nixpkgs-a1dcac5104ed0eb93d92874f2fcad8642e972b61.tar.gz
nixpkgs-a1dcac5104ed0eb93d92874f2fcad8642e972b61.tar.bz2
nixpkgs-a1dcac5104ed0eb93d92874f2fcad8642e972b61.tar.lz
nixpkgs-a1dcac5104ed0eb93d92874f2fcad8642e972b61.tar.xz
nixpkgs-a1dcac5104ed0eb93d92874f2fcad8642e972b61.tar.zst
nixpkgs-a1dcac5104ed0eb93d92874f2fcad8642e972b61.zip
Merge pull request #57523 from mayflower/kube-apiserver-preferred-address-types
nixos/kubernetes: Add preferredAddressTypes option to apiserver
Diffstat (limited to 'nixos/modules/services/cluster')
-rw-r--r--nixos/modules/services/cluster/kubernetes/apiserver.nix8
1 files changed, 8 insertions, 0 deletions
diff --git a/nixos/modules/services/cluster/kubernetes/apiserver.nix b/nixos/modules/services/cluster/kubernetes/apiserver.nix
index 0c04648355b..f293dd79f42 100644
--- a/nixos/modules/services/cluster/kubernetes/apiserver.nix
+++ b/nixos/modules/services/cluster/kubernetes/apiserver.nix
@@ -184,6 +184,12 @@ in
       type = bool;
     };
 
+    preferredAddressTypes = mkOption {
+      description = "List of the preferred NodeAddressTypes to use for kubelet connections.";
+      type = nullOr str;
+      default = null;
+    };
+
     proxyClientCertFile = mkOption {
       description = "Client certificate to use for connections to proxy.";
       default = null;
@@ -349,6 +355,8 @@ in
                 "--kubelet-client-certificate=${cfg.kubeletClientCertFile}"} \
               ${optionalString (cfg.kubeletClientKeyFile != null)
                 "--kubelet-client-key=${cfg.kubeletClientKeyFile}"} \
+              ${optionalString (cfg.preferredAddressTypes != null)
+                "--kubelet-preferred-address-types=${cfg.preferredAddressTypes}"} \
               ${optionalString (cfg.proxyClientCertFile != null)
                 "--proxy-client-cert-file=${cfg.proxyClientCertFile}"} \
               ${optionalString (cfg.proxyClientKeyFile != null)