Merge remote-tracking branch 'upstream/staging-next' into staging

This commit is contained in:
John Ericson
2021-05-11 22:30:46 +00:00
47 changed files with 566 additions and 139 deletions
@@ -44,7 +44,7 @@ let
homepage = "https://github.com/kubernetes/kops";
changelog = "https://github.com/kubernetes/kops/tree/master/docs/releases";
license = licenses.asl20;
maintainers = with maintainers; [ offline zimbatm ];
maintainers = with maintainers; [ offline zimbatm diegolelis ];
platforms = platforms.unix;
};
} // attrs';
@@ -63,9 +63,14 @@ rec {
sha256 = "0fmrzjz163hda6sl1jkl7cmg8fw6mmqb9953048jnhmd3w428xlz";
};
kops_1_18 = mkKops rec {
kops_1_18 = mkKops {
version = "1.18.2";
sha256 = "17na83j6sfhk69w9ssvicc0xd1904z952ad3zzbpha50lcy6nlhp";
};
kops_1_19 = mkKops rec {
version = "1.19.2";
sha256 = "15csxih1xy8myky37n5dyzp5mc31pc4bq9asaw6zz51mgw8ad5r9";
rev = "v${version}";
};
}
@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kubeseal";
version = "0.15.0";
version = "0.16.0";
src = fetchFromGitHub {
owner = "bitnami-labs";
repo = "sealed-secrets";
rev = "v${version}";
sha256 = "sha256-wzaNFM/4V2mWqhkqeT70ieQuhgNK79U2b7PhxKqn/X0=";
sha256 = "sha256-+9yOBrq34VCy1yAkSh1iHbgtckuz2FcHokH/Cb/Heus=";
};
vendorSha256 = null;
@@ -22,5 +22,6 @@ buildGoModule {
homepage = "https://linkerd.io/";
license = licenses.asl20;
maintainers = with maintainers; [ Gonzih ];
broken = true;
};
}