Merge pull request #64979 from tenx-tech/feature/update-helm

kubernetes-helm: 2.11 -> 2.14.2
This commit is contained in:
Andreas Rammhold 2019-07-20 23:24:44 +02:00 committed by GitHub
commit bd7f9b6057
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 616 additions and 274 deletions

View File

@ -1,14 +1,14 @@
{ stdenv, buildGoPackage, fetchFromGitHub }: { stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec { buildGoPackage rec {
version = "2.11.0"; version = "2.14.2";
name = "helm-${version}"; name = "helm-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "helm"; owner = "helm";
repo = "helm"; repo = "helm";
rev = "v${version}"; rev = "v${version}";
sha256 = "1z810a6mxyrrw4i908dip8aqsj95c0kmv6xpb1wwhskg1zmf85wk"; sha256 = "0hxfyfpmhgr5jilp2xm9d5vxiq5fcgqm2hh4g4izcgiz9bz7b6k0";
}; };
goPackagePath = "k8s.io/helm"; goPackagePath = "k8s.io/helm";
@ -18,7 +18,7 @@ buildGoPackage rec {
# Thsese are the original flags from the helm makefile # Thsese are the original flags from the helm makefile
buildFlagsArray = '' buildFlagsArray = ''
-ldflags=-X k8s.io/helm/pkg/version.Version=v${version} -ldflags=-X k8s.io/helm/pkg/version.Version=v${version} -X k8s.io/helm/pkg/version.GitTreeState=clean -X k8s.io/helm/pkg/version.BuildMetadata=
-w -w
-s -s
''; '';

File diff suppressed because it is too large Load Diff