Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3cff2fbc0a37
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 589d270ce440
Choose a head ref
  • 3 commits
  • 2 files changed
  • 3 contributors

Commits on Oct 12, 2018

  1. minikube: 0.28.1 -> 0.29.0 

    Hard-code kubernetes version as the upstream python script is broken/not-up-to-date

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit ba98a7a)
Backport of #47765
    @vdemeester @srhb
    vdemeester authored and srhb committed Oct 12, 2018
    Copy the full SHA
    c0c5ea1 View commit details

  2. minikube: bump version 0.29.0 -> 0.30.0 

    This is a fix release for CVE-2018-1002103. More details in
kubernetes/minikube#3208

(cherry picked from commit e5ee89f)
Backport of #48256
    @periklis @srhb
    periklis authored and srhb committed Oct 12, 2018
    Copy the full SHA
    c0c867d View commit details

  3. nixos/network-interfaces-scripted: fix container networking bug 

    When a bridge interface was reconfigured, running containers using
this bridge lost connectivity: restarting network-addresses-brN.service
triggered a restart of network-setup.service via a "partOf" relationship
introduced in 07e0c0e.
This in turn restarted brN-netdev.service.
The bridge was thus destroyed and recreated with the same name but a new
interface id, causing attached veth interfaces to lose their connection.

This change removes the "partOf" relationship between
network-setup.service and network-addresses-brN.service for all bridges.

(cherry picked from commit 2742063)
    @xeji
    xeji committed Oct 12, 2018
    Copy the full SHA
    589d270 View commit details
Showing with 7 additions and 4 deletions.
  1. +2 −1 nixos/modules/tasks/network-interfaces-scripted.nix
  2. +5 −3 pkgs/applications/networking/cluster/minikube/default.nix
3 changes: 2 additions & 1 deletion nixos/modules/tasks/network-interfaces-scripted.nix
View file
Original file line number Diff line number Diff line change
@@ -85,7 +85,8 @@ let
after = [ "network-pre.target" "systemd-udevd.service" "systemd-sysctl.service" ];
before = [ "network.target" "shutdown.target" ];
wants = [ "network.target" ];
partOf = map (i: "network-addresses-${i.name}.service") interfaces;
# exclude bridges from the partOf relationship to fix container networking bug #47210
partOf = map (i: "network-addresses-${i.name}.service") (filter (i: !(hasAttr i.name cfg.bridges)) interfaces);
conflicts = [ "shutdown.target" ];
wantedBy = [ "multi-user.target" ] ++ optional hasDefaultGatewaySet "network-online.target";

8 changes: 5 additions & 3 deletions pkgs/applications/networking/cluster/minikube/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,15 +14,17 @@ let
in buildGoPackage rec {
pname = "minikube";
name = "${pname}-${version}";
version = "0.28.1";
version = "0.30.0";

kubernetesVersion = "1.11.2";

goPackagePath = "k8s.io/minikube";

src = fetchFromGitHub {
owner = "kubernetes";
repo = "minikube";
rev = "v${version}";
sha256 = "0c36rzsdzxf9q6l4hl506bsd4qwmw033i0k1xhqszv9agg7qjlmm";
sha256 = "02jxwh8qrvjn31rzjwx23908nd1i592drfdykxbc5b6a62fwp02z";
};

buildInputs = [ go-bindata makeWrapper gpgme ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin vmnet;
@@ -35,7 +37,7 @@ in buildGoPackage rec {
ISO_VERSION=$(grep "^ISO_VERSION" Makefile | sed "s/^.*\s//")
ISO_BUCKET=$(grep "^ISO_BUCKET" Makefile | sed "s/^.*\s//")
KUBERNETES_VERSION=$(${python}/bin/python hack/get_k8s_version.py --k8s-version-only 2>&1) || true
KUBERNETES_VERSION=${kubernetesVersion}
export buildFlagsArray="-ldflags=\
-X k8s.io/minikube/pkg/version.version=v${version} \