pyrox.dev / nixpkgs
lol
fork atom

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

fluxcd: 0.18.3 -> 0.19.1

authored by

Bobby Rong and committed by
GitHub 93bd7609 ce24ebd3

+34 -9
unified split
+13 -9
pkgs/applications/networking/cluster/fluxcd/default.nix
··· 1 { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: 2 3 let 4 - version = "0.18.3"; 5 - sha256 = "0nvvjc0ml1irn7vxyq4m43qimp128cx8hczk21y5m39i2rg4yzx4"; 6 - manifestsSha256 = "1qgw9ij0b85vvdx03wmbbwanhq1hf69wphy58lsqwf33rdq0bb1m"; 7 8 manifests = fetchzip { 9 url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz"; ··· 23 inherit sha256; 24 }; 25 26 - vendorSha256 = "0vgi5cnvmc98xa2ibpgvvqlc90hf3gj3v17yqncid596ig3dnqsc"; 27 28 - nativeBuildInputs = [ installShellFiles ]; 29 30 - subPackages = [ "cmd/flux" ]; 31 32 ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ]; 33 34 - postUnpack = '' 35 - cp -r ${manifests} source/cmd/flux/manifests 36 - ''; 37 38 # Required to workaround test error: 39 # panic: mkdir /homeless-shelter: permission denied 40 HOME="$TMPDIR"; 41 42 doInstallCheck = true; 43 installCheckPhase = ''
··· 1 { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: 2 3 let 4 + version = "0.19.1"; 5 + sha256 = "184f5q3aa4p6gjdmr8x6a97rzaj64ws8bf3q8sz4xjyznznwcpp0"; 6 + manifestsSha256 = "1xxf572yvjmik7dvijz810lxzfj7irddznl4icidn7hrljzjrv95"; 7 8 manifests = fetchzip { 9 url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz"; ··· 23 inherit sha256; 24 }; 25 26 + vendorSha256 = "sha256-1ZIeS42LoreZKkzDNZxmF17HeDWWVo49CaZDrIR2U9g="; 27 28 + postUnpack = '' 29 + cp -r ${manifests} source/cmd/flux/manifests 30 + ''; 31 32 + patches = [ 33 + ./patches/disable-tests-ssh_key.patch 34 + ]; 35 36 ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ]; 37 38 + subPackages = [ "cmd/flux" ]; 39 40 # Required to workaround test error: 41 # panic: mkdir /homeless-shelter: permission denied 42 HOME="$TMPDIR"; 43 + 44 + nativeBuildInputs = [ installShellFiles ]; 45 46 doInstallCheck = true; 47 installCheckPhase = ''
+21
pkgs/applications/networking/cluster/fluxcd/patches/disable-tests-ssh_key.patch
···
··· 1 + diff --git a/cmd/flux/create_secret_git_test.go b/cmd/flux/create_secret_git_test.go 2 + index afa34ba..0d22cce 100644 3 + --- a/cmd/flux/create_secret_git_test.go 4 + +++ b/cmd/flux/create_secret_git_test.go 5 + @@ -20,16 +20,6 @@ func TestCreateGitSecret(t *testing.T) { 6 + args: "create secret git podinfo-auth --url=https://github.com/stefanprodan/podinfo --username=my-username --password=my-password --namespace=my-namespace --export", 7 + assert: assertGoldenFile("./testdata/create_secret/git/secret-git-basic.yaml"), 8 + }, 9 + - { 10 + - name: "ssh key", 11 + - 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", 12 + - assert: assertGoldenFile("testdata/create_secret/git/git-ssh-secret.yaml"), 13 + - }, 14 + - { 15 + - name: "ssh key with password", 16 + - 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", 17 + - assert: assertGoldenFile("testdata/create_secret/git/git-ssh-secret-password.yaml"), 18 + - }, 19 + } 20 + 21 + for _, tt := range tests {