mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-18 17:10:27 +00:00
Code Issues Wiki Activity

kubernetes: 1.10.5 -> 1.11.3

Browse source 
Fixed minor issue where kube-addon manager complaints about
/opt/namespace.yaml missing.

Added release notes with reference to Kubernetes 1.11 release notes.

closes #43882
This commit is contained in:
Johan Thomsen 2018-08-20 20:33:49 +02:00
parent 5048b0d1f9
commit a49f56c3b1
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
nixos/doc/manual/release-notes/rl-1809.xml
View file

@ -451,6 +451,14 @@ inherit (pkgs.nixos {
deprecated. Use <literal>networking.networkmanager.dns</literal> instead. deprecated. Use <literal>networking.networkmanager.dns</literal> instead.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
The Kubernetes package has been bumped to major version 1.11.
Please consult the
<link xlink:href="https://github.com/kubernetes/kubernetes/blob/release-1.11/CHANGELOG-1.11.md">release notes</link>
for details on new features and api changes.
</para>
</listitem>
<listitem> <listitem>
<para> <para>
The option The option

16
pkgs/applications/networking/cluster/kubernetes/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go_1_9, go-bindata, makeWrapper, rsync { stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go_1_10, go-bindata, makeWrapper, rsync
, components ? [ , components ? [
"cmd/kubeadm" "cmd/kubeadm"
"cmd/kubectl" "cmd/kubectl"
@ -15,17 +15,16 @@ with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "kubernetes-${version}"; name = "kubernetes-${version}";
version = "1.10.5"; version = "1.11.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kubernetes"; owner = "kubernetes";
repo = "kubernetes"; repo = "kubernetes";
rev = "v${version}"; rev = "v${version}";
sha256 = "1k6ayb43l68l0qw31cc4k1pwvm8aks3l2xm0gdxdxbbww1mnzix2"; sha256 = "1gwb5gs9l0adv3qc70wf8dwvbjh1mmgd3hh1jkwsbbnach28dvzb";
}; };
# Build using golang v1.9 in accordance with https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.10.md#external-dependencies buildInputs = [ removeReferencesTo makeWrapper which go_1_10 rsync go-bindata ];
buildInputs = [ removeReferencesTo makeWrapper which go_1_9 rsync go-bindata ];
outputs = ["out" "man" "pause"]; outputs = ["out" "man" "pause"];
@ -39,7 +38,7 @@ stdenv.mkDerivation rec {
patchShebangs ./hack patchShebangs ./hack
''; '';
WHAT="--use_go_build ${concatStringsSep " " components}"; WHAT="${concatStringsSep " " components}";
postBuild = '' postBuild = ''
./hack/generate-docs.sh ./hack/generate-docs.sh
@ -53,8 +52,11 @@ stdenv.mkDerivation rec {
cp build/pause/pause "$pause/bin/pause" cp build/pause/pause "$pause/bin/pause"
cp -R docs/man/man1 "$man/share/man" cp -R docs/man/man1 "$man/share/man"
cp cluster/addons/addon-manager/namespace.yaml $out/share
cp cluster/addons/addon-manager/kube-addons.sh $out/bin/kube-addons cp cluster/addons/addon-manager/kube-addons.sh $out/bin/kube-addons
patchShebangs $out/bin/kube-addons patchShebangs $out/bin/kube-addons
substituteInPlace $out/bin/kube-addons \
--replace /opt/namespace.yaml $out/share/namespace.yaml
wrapProgram $out/bin/kube-addons --set "KUBECTL_BIN" "$out/bin/kubectl" wrapProgram $out/bin/kube-addons --set "KUBECTL_BIN" "$out/bin/kubectl"
$out/bin/kubectl completion bash > $out/share/bash-completion/completions/kubectl $out/bin/kubectl completion bash > $out/share/bash-completion/completions/kubectl
@ -62,7 +64,7 @@ stdenv.mkDerivation rec {
''; '';
preFixup = '' preFixup = ''
find $out/bin $pause/bin -type f -exec remove-references-to -t ${go_1_9} '{}' + find $out/bin $pause/bin -type f -exec remove-references-to -t ${go_1_10} '{}' +
''; '';
meta = { meta = {