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: bea1a232c615
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e2c11ad3c068
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 19, 2020

  1. nixos/kubernetes: allow configuring cfssl API server SANs

    @anmonteiro
    anmonteiro authored and Jon committed Jan 19, 2020
    Copy the full SHA
    e2c11ad View commit details
Showing with 10 additions and 0 deletions.
  1. +10 −0 nixos/modules/services/cluster/kubernetes/pki.nix
10 changes: 10 additions & 0 deletions nixos/modules/services/cluster/kubernetes/pki.nix
View file
Original file line number Diff line number Diff line change
@@ -20,6 +20,7 @@ let
size = 2048;
};
CN = top.masterAddress;
hosts = cfg.cfsslAPIExtraSANs;
});

cfsslAPITokenBaseName = "apitoken.secret";
@@ -66,6 +67,15 @@ in
type = bool;
};

cfsslAPIExtraSANs = mkOption {
description = ''
Extra x509 Subject Alternative Names to be added to the cfssl API webserver TLS cert.
'';
default = [];
example = [ "subdomain.example.com" ];
type = listOf str;
};

genCfsslAPIToken = mkOption {
description = ''
Whether to automatically generate cfssl API-token secret,