Merge pull request #56589 from johanot/kubernetes-module-stabilization

nixos/kubernetes: minor module fixes
This commit is contained in:
Silvan Mosberger 2019-03-08 15:47:15 +01:00 committed by GitHub
commit 9fa52ae9a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions

View file

@ -350,7 +350,7 @@ in
listenPeerUrls = mkDefault ["https://0.0.0.0:2380"]; listenPeerUrls = mkDefault ["https://0.0.0.0:2380"];
advertiseClientUrls = mkDefault ["https://${top.masterAddress}:2379"]; advertiseClientUrls = mkDefault ["https://${top.masterAddress}:2379"];
initialCluster = mkDefault ["${top.masterAddress}=https://${top.masterAddress}:2380"]; initialCluster = mkDefault ["${top.masterAddress}=https://${top.masterAddress}:2380"];
name = top.masterAddress; name = mkDefault top.masterAddress;
initialAdvertisePeerUrls = mkDefault ["https://${top.masterAddress}:2380"]; initialAdvertisePeerUrls = mkDefault ["https://${top.masterAddress}:2380"];
}; };

View file

@ -131,7 +131,7 @@ in
${optionalString (cfg.tlsCertFile!=null) ${optionalString (cfg.tlsCertFile!=null)
"--tls-cert-file=${cfg.tlsCertFile}"} \ "--tls-cert-file=${cfg.tlsCertFile}"} \
${optionalString (cfg.tlsKeyFile!=null) ${optionalString (cfg.tlsKeyFile!=null)
"--tls-key-file=${cfg.tlsKeyFile}"} \ "--tls-private-key-file=${cfg.tlsKeyFile}"} \
${optionalString (elem "RBAC" top.apiserver.authorizationMode) ${optionalString (elem "RBAC" top.apiserver.authorizationMode)
"--use-service-account-credentials"} \ "--use-service-account-credentials"} \
${optionalString (cfg.verbosity != null) "--v=${toString cfg.verbosity}"} \ ${optionalString (cfg.verbosity != null) "--v=${toString cfg.verbosity}"} \

View file

@ -10,7 +10,7 @@ let
kind = "Config"; kind = "Config";
clusters = [{ clusters = [{
name = "local"; name = "local";
cluster.certificate-authority = cfg.caFile; cluster.certificate-authority = conf.caFile or cfg.caFile;
cluster.server = conf.server; cluster.server = conf.server;
}]; }];
users = [{ users = [{