Browse Source

Merge pull request #96446 from saschagrunert/k8s

kubernetes: 1.18.8 -> 1.19.1
(cherry picked from commit 701064bb10)

Backport of #96446
wip-nanopi-m4v2
Sarah Brofeldt 6 years ago
committed by Sarah Brofeldt
parent
commit
5115acdc7e
3 changed files with 20 additions and 4 deletions
  1. +15
    -0
      nixos/doc/manual/release-notes/rl-2009.xml
  2. +3
    -2
      nixos/modules/services/cluster/kubernetes/pki.nix
  3. +2
    -2
      pkgs/applications/networking/cluster/kubernetes/default.nix

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

@@ -1406,5 +1406,20 @@ services.transmission.settings.rpc-bind-address = "0.0.0.0";
</para>
</listitem>
</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>

+ 3
- 2
nixos/modules/services/cluster/kubernetes/pki.nix View File

@@ -20,7 +20,7 @@ let
size = 2048;
};
CN = top.masterAddress;
hosts = cfg.cfsslAPIExtraSANs;
hosts = [top.masterAddress] ++ cfg.cfsslAPIExtraSANs;
});

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


+ 2
- 2
pkgs/applications/networking/cluster/kubernetes/default.nix View File

@@ -15,13 +15,13 @@ with lib;

stdenv.mkDerivation rec {
pname = "kubernetes";
version = "1.18.8";
version = "1.19.1";

src = fetchFromGitHub {
owner = "kubernetes";
repo = "kubernetes";
rev = "v${version}";
sha256 = "1dswgxxbybwllf2lf89saarsrn4pkb2617wycim07cd7i1l1dv5n";
sha256 = "1wnlw2rl14q7cb8shhldbavdamvl3w3mlfvymwfvmvxfxzhrjlaq";
};

nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];


Loading…
Cancel
Save