diff options
| author | Johan Thomsen <jth@dbc.dk> | 2019-02-28 15:12:58 +0100 |
|---|---|---|
| committer | Johan Thomsen <jth@dbc.dk> | 2019-03-08 09:18:51 +0100 |
| commit | 80c4fd4f8570bd921a44245e740b68256588ab1a (patch) | |
| tree | 2590428ff486ffecd94ff8c3f81676987dae5e27 /nixos | |
| parent | 90d1f9b095a714b095d82f578114f1c519baa90c (diff) | |
| download | nixpkgs-80c4fd4f8570bd921a44245e740b68256588ab1a.tar nixpkgs-80c4fd4f8570bd921a44245e740b68256588ab1a.tar.gz nixpkgs-80c4fd4f8570bd921a44245e740b68256588ab1a.tar.bz2 nixpkgs-80c4fd4f8570bd921a44245e740b68256588ab1a.tar.lz nixpkgs-80c4fd4f8570bd921a44245e740b68256588ab1a.tar.xz nixpkgs-80c4fd4f8570bd921a44245e740b68256588ab1a.tar.zst nixpkgs-80c4fd4f8570bd921a44245e740b68256588ab1a.zip | |
nixos/kubernetes: minor module fixes
- mkDefault etcd instance name - make sure ca-cert in mkKubeConfig can be overriden - fix controller-manager "tls-private-key-file" flag name
Diffstat (limited to 'nixos')
3 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/cluster/kubernetes/apiserver.nix b/nixos/modules/services/cluster/kubernetes/apiserver.nix index 81e45b417de..455d0239604 100644 --- a/nixos/modules/services/cluster/kubernetes/apiserver.nix +++ b/nixos/modules/services/cluster/kubernetes/apiserver.nix @@ -350,7 +350,7 @@ in listenPeerUrls = mkDefault ["https://0.0.0.0:2380"]; advertiseClientUrls = mkDefault ["https://${top.masterAddress}:2379"]; initialCluster = mkDefault ["${top.masterAddress}=https://${top.masterAddress}:2380"]; - name = top.masterAddress; + name = mkDefault top.masterAddress; initialAdvertisePeerUrls = mkDefault ["https://${top.masterAddress}:2380"]; }; diff --git a/nixos/modules/services/cluster/kubernetes/controller-manager.nix b/nixos/modules/services/cluster/kubernetes/controller-manager.nix index dff97f144d5..060fd9b78db 100644 --- a/nixos/modules/services/cluster/kubernetes/controller-manager.nix +++ b/nixos/modules/services/cluster/kubernetes/controller-manager.nix @@ -131,7 +131,7 @@ in ${optionalString (cfg.tlsCertFile!=null) "--tls-cert-file=${cfg.tlsCertFile}"} \ ${optionalString (cfg.tlsKeyFile!=null) - "--tls-key-file=${cfg.tlsKeyFile}"} \ + "--tls-private-key-file=${cfg.tlsKeyFile}"} \ ${optionalString (elem "RBAC" top.apiserver.authorizationMode) "--use-service-account-credentials"} \ ${optionalString (cfg.verbosity != null) "--v=${toString cfg.verbosity}"} \ diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix index 375e33e91b5..3e53d18f8bb 100644 --- a/nixos/modules/services/cluster/kubernetes/default.nix +++ b/nixos/modules/services/cluster/kubernetes/default.nix @@ -10,7 +10,7 @@ let kind = "Config"; clusters = [{ name = "local"; - cluster.certificate-authority = cfg.caFile; + cluster.certificate-authority = conf.caFile or cfg.caFile; cluster.server = conf.server; }]; users = [{ |