Merge pull request #122157 from onixie/master

This commit is contained in:
Sandro 2021-05-23 17:10:28 +02:00 committed by GitHub
commit 70c5544861
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 45 additions and 0 deletions

View file

@ -7471,6 +7471,12 @@
githubId = 1538622;
name = "Michael Reilly";
};
onixie = {
email = "onixie@gmail.com";
github = "onixie";
githubId = 817073;
name = "Yc. Shen";
};
onsails = {
email = "andrey@onsails.com";
github = "onsails";

View file

@ -0,0 +1,37 @@
{ lib, fetchFromGitHub, buildGoModule }:
buildGoModule rec {
pname = "multus-cni";
version = "3.7.1";
src = fetchFromGitHub {
owner = "k8snetworkplumbingwg";
repo = pname;
rev = "v${version}";
sha256 = "04rn7ypd0cw2c33wqb9wqy1dp6ajvcp7rcv7zybffb1d40mdlds1";
};
buildFlagsArray = let
multus = "gopkg.in/intel/multus-cni.v3/pkg/multus";
commit = "f6298a3a294a79f9fbda0b8f175e521799d5f8d7";
in [
"-ldflags=-s -w -X '${multus}.version=v${version}' -X '${multus}.commit=${commit}'"
];
preInstall = ''
mv $GOPATH/bin/cmd $GOPATH/bin/multus
'';
vendorSha256 = null;
# Some of the tests require accessing a k8s cluster
doCheck = false;
meta = with lib; {
description = "Multus CNI is a container network interface (CNI) plugin for Kubernetes that enables attaching multiple network interfaces to pods. ";
homepage = "https://github.com/k8snetworkplumbingwg/multus-cni";
license = licenses.asl20;
platforms = platforms.linux;
maintainers = with maintainers; [ onixie ];
};
}

View file

@ -22848,6 +22848,8 @@ in
cni = callPackage ../applications/networking/cluster/cni {};
cni-plugins = callPackage ../applications/networking/cluster/cni/plugins.nix {};
multus-cni = callPackage ../applications/networking/cluster/multus-cni {};
cntr = callPackage ../applications/virtualization/cntr { };
communi = libsForQt5.callPackage ../applications/networking/irc/communi { };