Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2832a89c38eb
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5831fe1f4a32
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Mar 8, 2019

  1. 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

(cherry picked from commit 80c4fd4)
    @infinisil
    Johan Thomsen authored and infinisil committed Mar 8, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    dywedir Vlad M.
    GPG key ID: 3B1AD98E3D65BD4D
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5831fe1 View commit details
2 changes: 1 addition & 1 deletion nixos/modules/services/cluster/kubernetes/apiserver.nix
View file
Original file line number Diff line number Diff line change
@@ -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"];
};

2 changes: 1 addition & 1 deletion nixos/modules/services/cluster/kubernetes/controller-manager.nix
View file
Original file line number Diff line number Diff line change
@@ -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}"} \
2 changes: 1 addition & 1 deletion nixos/modules/services/cluster/kubernetes/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 = [{