diff options
author | superherointj <5861043+superherointj@users.noreply.github.com> | 2021-06-16 16:37:21 -0300 |
---|---|---|
committer | superherointj <5861043+superherointj@users.noreply.github.com> | 2021-06-16 20:13:54 -0300 |
commit | 24b04ac4c607b601b5bda56287594e23ad314815 (patch) | |
tree | 9dd232251e7fa058d72a0cbc8f66c1cd8a8b96f4 /pkgs/applications/networking/cluster/linkerd | |
parent | d850550ec88e9a747901bf376afbad02bd1d5d87 (diff) | |
download | nixpkgs-24b04ac4c607b601b5bda56287594e23ad314815.tar nixpkgs-24b04ac4c607b601b5bda56287594e23ad314815.tar.gz nixpkgs-24b04ac4c607b601b5bda56287594e23ad314815.tar.bz2 nixpkgs-24b04ac4c607b601b5bda56287594e23ad314815.tar.lz nixpkgs-24b04ac4c607b601b5bda56287594e23ad314815.tar.xz nixpkgs-24b04ac4c607b601b5bda56287594e23ad314815.tar.zst nixpkgs-24b04ac4c607b601b5bda56287594e23ad314815.zip |
linkerd: 2020-05-01 -> edge-21.6.2
linkerd.stable: init stable-2.9.5 linkerd.edge: init edge-21.6.2 Fixes #113218 This PR was a huge colaboration between many people: @NobbZ, @Kalbasit, @Tomberek, @ldesgoui, @Gonzih, @jnetod, @bryanasdev000, @AndersonTorres and more... And @jnetod won the crown by being the last one to put the nail in the coffin! Co-authored-by: bryanasdev000 <bryanasdev000@gmail.com> Co-authored-by: jnetod <jnetod@users.noreply.github.com> Co-authored-by: AndersonTorres <torres.anderson.85@protonmail.com>
Diffstat (limited to 'pkgs/applications/networking/cluster/linkerd')
-rw-r--r-- | pkgs/applications/networking/cluster/linkerd/default.nix | 84 |
1 files changed, 64 insertions, 20 deletions
diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix index 0dd6363d07e..eeab5a1d02e 100644 --- a/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/pkgs/applications/networking/cluster/linkerd/default.nix @@ -1,27 +1,71 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule, installShellFiles }: -buildGoModule { - pname = "linkerd-unstable"; - version = "2020-05-01"; +let generic = { channel, version, sha256, vendorSha256 }: + buildGoModule rec { + pname = "linkerd-${channel}"; + inherit version vendorSha256; - src = fetchFromGitHub { - owner = "linkerd"; - repo = "linkerd2"; - rev = "9e9f3bb1e2aeab8cf20f98f5cad159bbb6f24883"; - sha256 = "1pvj31wz1klwhcqga1m8kixdqsxwmppp9ix6r3wpp4dwfig45fm0"; - }; + src = fetchFromGitHub { + owner = "linkerd"; + repo = "linkerd2"; + rev = "${channel}-${version}"; + inherit sha256; + }; + + subPackages = [ "cli" ]; + runVend = true; + + preBuild = '' + env GOFLAGS="" go generate ./pkg/charts/static + env GOFLAGS="" go generate ./jaeger/static + env GOFLAGS="" go generate ./multicluster/static + env GOFLAGS="" go generate ./viz/static + ''; + + buildFlagsArray = [ + "-tags=prod" + ]; + + ldflags = [ + "-s" "-w" + "-X github.com/linkerd/linkerd2/pkg/version.Version=${src.rev}" + ]; - vendorSha256 = "0vls58ld50jca5yn73kvg3lx4z83cc7skky54a90pkbj737y58pz"; + nativeBuildInputs = [ installShellFiles ]; - doCheck = false; + postInstall = '' + mv $out/bin/cli $out/bin/linkerd + installShellCompletion --cmd linkerd \ + --bash <($out/bin/linkerd completion bash) \ + --zsh <($out/bin/linkerd completion zsh) \ + --fish <($out/bin/linkerd completion fish) + ''; - subPackages = [ "cli/cmd" ]; + doInstallCheck = true; + installCheckPhase = '' + $out/bin/linkerd version --client | grep ${src.rev} > /dev/null + ''; - meta = with lib; { - description = "A service mesh for Kubernetes and beyond"; - homepage = "https://linkerd.io/"; - license = licenses.asl20; - maintainers = with maintainers; [ Gonzih ]; - broken = true; + meta = with lib; { + description = "A simple Kubernetes service mesh that improves security, observability and reliability"; + downloadPage = "https://github.com/linkerd/linkerd2/"; + homepage = "https://linkerd.io/"; + license = licenses.asl20; + maintainers = with maintainers; [ Gonzih bryanasdev000 superherointj ]; + }; }; -} +in + { + stable = generic { + channel = "stable"; + version = "2.10.2"; + sha256 = "sha256-dOD0S4FJ2lXE+1VZooi8tKvC8ndGEHAxmAvSqoWI/m0="; + vendorSha256 = "sha256-Qb0FZOvKL9GgncfUl538PynkYbm3V8Q6lUpApUoIp5s="; + }; + edge = generic { + channel = "edge"; + version = "21.6.2"; + sha256 = "sha256-kgdKH+cIYRg5A3+wrJJ7jcY6Xl206EwBYa37PT3xn1k"; + vendorSha256 = "sha256-QVLg1ZRsNQPM4lERVHpZLbd+I32JZ1pbGNSGIVTbseg="; + }; + } |