Merge pull request #94438 from r-ryantm/auto-update/istioctl

istioctl: 1.6.5 -> 1.6.6
This commit is contained in:
Mario Rodas 2020-08-02 11:15:09 -05:00 committed by GitHub
commit 271e41eb8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,18 +1,18 @@
{ lib, buildGoModule, fetchFromGitHub, go-bindata }: { lib, buildGoModule, fetchFromGitHub, go-bindata, installShellFiles }:
buildGoModule rec { buildGoModule rec {
pname = "istioctl"; pname = "istioctl";
version = "1.6.5"; version = "1.6.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "istio"; owner = "istio";
repo = "istio"; repo = "istio";
rev = version; rev = version;
sha256 = "0xga0vjr2nfbxwbawly8vg9vnpavxbmc1agg2a3cp1ncmzfrgpcx"; sha256 = "0njchcb58lxk0cixk2rz4qj7b0zpp6zf3i5dda43j4hfsb37mifj";
}; };
vendorSha256 = "15l9z2a8p46jvmkl0vvm6s196mlics0qgmpm3yq3bn6cqnybdsij"; vendorSha256 = "0cc0lmjsxrn3f78k95wklf3yn5k7h8slwnwmssy1i1h0bkcg1bai";
nativeBuildInputs = [ go-bindata ]; nativeBuildInputs = [ go-bindata installShellFiles ];
# Bundle charts # Bundle charts
preBuild = '' preBuild = ''
@ -28,10 +28,17 @@ buildGoModule rec {
"istio.io/pkg/version.buildTag=${version}" "istio.io/pkg/version.buildTag=${version}"
"istio.io/pkg/version.buildHub=docker.io/istio" "istio.io/pkg/version.buildHub=docker.io/istio"
]; ];
in ["-ldflags=${lib.concatMapStringsSep " " (attr: "-X ${attr}") attrs}"]; in ["-ldflags=-s -w ${lib.concatMapStringsSep " " (attr: "-X ${attr}") attrs}"];
subPackages = [ "istioctl/cmd/istioctl" ]; subPackages = [ "istioctl/cmd/istioctl" ];
postInstall = ''
$out/bin/istioctl collateral --man --bash --zsh
installManPage *.1
installShellCompletion istioctl.bash
installShellCompletion --zsh _istioctl
'';
meta = with lib; { meta = with lib; {
description = "Istio configuration command line utility for service operators to debug and diagnose their Istio mesh"; description = "Istio configuration command line utility for service operators to debug and diagnose their Istio mesh";
homepage = "https://istio.io/latest/docs/reference/commands/istioctl"; homepage = "https://istio.io/latest/docs/reference/commands/istioctl";