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

Merge pull request #21125 from moretea/update-k8s-to-1.5

Browse Source 
kubernetes: 1.4.6 -> 1.5.1
This commit is contained in:
Jaka Hudoklin 2017-01-15 13:44:42 +01:00 committed by GitHub
commit e35212ac64
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/cluster/kubernetes.nix
View File

@ -737,6 +737,8 @@ in {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "kube-apiserver.service" ]; after = [ "kube-apiserver.service" ];
serviceConfig = { serviceConfig = {
RestartSec = "30s";
Restart = "on-failure";
ExecStart = ''${cfg.package}/bin/kube-controller-manager \ ExecStart = ''${cfg.package}/bin/kube-controller-manager \
--address=${cfg.controllerManager.address} \ --address=${cfg.controllerManager.address} \
--port=${toString cfg.controllerManager.port} \ --port=${toString cfg.controllerManager.port} \

1
nixos/tests/kubernetes.nix
View File

@ -59,6 +59,7 @@ in {
virtualisation.diskSize = 2048; virtualisation.diskSize = 2048;
programs.bash.enableCompletion = true; programs.bash.enableCompletion = true;
environment.systemPackages = with pkgs; [ netcat bind ];
services.kubernetes.roles = ["master" "node"]; services.kubernetes.roles = ["master" "node"];
virtualisation.docker.extraOptions = "--iptables=false --ip-masq=false -b cbr0"; virtualisation.docker.extraOptions = "--iptables=false --ip-masq=false -b cbr0";

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

@ -17,13 +17,13 @@ with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "kubernetes-${version}"; name = "kubernetes-${version}";
version = "1.4.6"; version = "1.5.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kubernetes"; owner = "kubernetes";
repo = "kubernetes"; repo = "kubernetes";
rev = "v${version}"; rev = "v${version}";
sha256 = "1n5ppzr9hnn7ljfdgx40rnkn6n6a9ya0qyrhjhpnbfwz5mdp8ws3"; sha256 = "1ps9bn5gqknyjv0b9jvp7xg3cyd4anq11j785p22347al0b8w81v";
}; };
buildInputs = [ makeWrapper which go rsync go-bindata ]; buildInputs = [ makeWrapper which go rsync go-bindata ];
@ -33,8 +33,9 @@ stdenv.mkDerivation rec {
postPatch = '' postPatch = ''
substituteInPlace "hack/lib/golang.sh" --replace "_cgo" "" substituteInPlace "hack/lib/golang.sh" --replace "_cgo" ""
substituteInPlace "hack/generate-docs.sh" --replace "make" "make SHELL=${stdenv.shell}" substituteInPlace "hack/generate-docs.sh" --replace "make" "make SHELL=${stdenv.shell}"
substituteInPlace "hack/update-munge-docs.sh" --replace "make" "make SHELL=${stdenv.shell}" # hack/update-munge-docs.sh only performs some tests on the documentation.
substituteInPlace "hack/update-munge-docs.sh" --replace "kube::util::git_upstream_remote_name" "echo origin" # They broke building k8s; disabled for now.
echo "true" > "hack/update-munge-docs.sh"
patchShebangs ./hack patchShebangs ./hack
''; '';