JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #96446 from saschagrunert/k8s

Browse Source 
kubernetes: 1.18.8 -> 1.19.1
This commit is contained in:
Sarah Brofeldt 2020-09-13 00:45:56 +02:00 committed by GitHub
commit 701064bb10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nixos/doc/manual/release-notes/rl-2009.xml
View File

@ -1133,5 +1133,20 @@ services.transmission.settings.rpc-bind-address = "0.0.0.0";
</para> </para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
<itemizedlist>
<listitem>
<para />
<para>
Kubernetes has been upgraded to 1.19.1, which also means that the
golang version to build it has been bumped to 1.15. This may have
consequences for your existing clusters and their certificates. Please
consider
<link xlink:href="https://relnotes.k8s.io/?markdown=93264">
the release notes for Kubernetes 1.19 carefully
</link>
before upgrading.
</para>
</listitem>
</itemizedlist>
</section> </section>
</section> </section>

5
nixos/modules/services/cluster/kubernetes/pki.nix
View File

@ -20,7 +20,7 @@ let
size = 2048; size = 2048;
}; };
CN = top.masterAddress; CN = top.masterAddress;
hosts = cfg.cfsslAPIExtraSANs; hosts = [top.masterAddress] ++ cfg.cfsslAPIExtraSANs;
}); });
cfsslAPITokenBaseName = "apitoken.secret"; cfsslAPITokenBaseName = "apitoken.secret";
@ -228,7 +228,8 @@ in
}; };
private_key = cert.privateKeyOptions; private_key = cert.privateKeyOptions;
request = { request = {
inherit (cert) CN hosts; hosts = [cert.CN] ++ cert.hosts;
inherit (cert) CN;
key = { key = {
algo = "rsa"; algo = "rsa";
size = 2048; size = 2048;

4
pkgs/applications/networking/cluster/kubernetes/default.nix
View File

@ -15,13 +15,13 @@ with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "kubernetes"; pname = "kubernetes";
version = "1.18.8"; version = "1.19.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kubernetes"; owner = "kubernetes";
repo = "kubernetes"; repo = "kubernetes";
rev = "v${version}"; rev = "v${version}";
sha256 = "1dswgxxbybwllf2lf89saarsrn4pkb2617wycim07cd7i1l1dv5n"; sha256 = "1wnlw2rl14q7cb8shhldbavdamvl3w3mlfvymwfvmvxfxzhrjlaq";
}; };
nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];