ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-20 00:53:12 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #142655 from superherointj/package-fluxcd-0.19.1

Browse Source 
fluxcd: 0.18.3 -> 0.19.1
This commit is contained in:
Bobby Rong 2021-10-24 10:51:39 +08:00 committed by GitHub
commit 93bd760941
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/applications/networking/cluster/fluxcd/default.nix
View File

@ -1,9 +1,9 @@
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
let
version = "0.18.3";
sha256 = "0nvvjc0ml1irn7vxyq4m43qimp128cx8hczk21y5m39i2rg4yzx4";
manifestsSha256 = "1qgw9ij0b85vvdx03wmbbwanhq1hf69wphy58lsqwf33rdq0bb1m";
version = "0.19.1";
sha256 = "184f5q3aa4p6gjdmr8x6a97rzaj64ws8bf3q8sz4xjyznznwcpp0";
manifestsSha256 = "1xxf572yvjmik7dvijz810lxzfj7irddznl4icidn7hrljzjrv95";
manifests = fetchzip {
url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";
@ -23,22 +23,26 @@ buildGoModule rec {
inherit sha256;
};
vendorSha256 = "0vgi5cnvmc98xa2ibpgvvqlc90hf3gj3v17yqncid596ig3dnqsc";
nativeBuildInputs = [ installShellFiles ];
subPackages = [ "cmd/flux" ];
ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ];
vendorSha256 = "sha256-1ZIeS42LoreZKkzDNZxmF17HeDWWVo49CaZDrIR2U9g=";
postUnpack = ''
cp -r ${manifests} source/cmd/flux/manifests
'';
patches = [
./patches/disable-tests-ssh_key.patch
];
ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ];
subPackages = [ "cmd/flux" ];
# Required to workaround test error:
# panic: mkdir /homeless-shelter: permission denied
HOME="$TMPDIR";
nativeBuildInputs = [ installShellFiles ];
doInstallCheck = true;
installCheckPhase = ''
$out/bin/flux --version | grep ${version} > /dev/null

21
pkgs/applications/networking/cluster/fluxcd/patches/disable-tests-ssh_key.patch Normal file
View File

@ -0,0 +1,21 @@
diff --git a/cmd/flux/create_secret_git_test.go b/cmd/flux/create_secret_git_test.go
index afa34ba..0d22cce 100644
--- a/cmd/flux/create_secret_git_test.go
+++ b/cmd/flux/create_secret_git_test.go
@@ -20,16 +20,6 @@ func TestCreateGitSecret(t *testing.T) {
args: "create secret git podinfo-auth --url=https://github.com/stefanprodan/podinfo --username=my-username --password=my-password --namespace=my-namespace --export",
assert: assertGoldenFile("./testdata/create_secret/git/secret-git-basic.yaml"),
},
- {
- name: "ssh key",
- args: "create secret git podinfo-auth --url=ssh://git@github.com/stefanprodan/podinfo --private-key-file=./testdata/create_secret/git/rsa.private --namespace=my-namespace --export",
- assert: assertGoldenFile("testdata/create_secret/git/git-ssh-secret.yaml"),
- },
- {
- name: "ssh key with password",
- args: "create secret git podinfo-auth --url=ssh://git@github.com/stefanprodan/podinfo --private-key-file=./testdata/create_secret/git/rsa-password.private --password=password --namespace=my-namespace --export",
- assert: assertGoldenFile("testdata/create_secret/git/git-ssh-secret-password.yaml"),
- },
}
for _, tt := range tests {