swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 20:39:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #222342 from superherointj/fluxcd-0.41.2

Browse source 
fluxcd: 0.41.1 -> 0.41.2
This commit is contained in:
superherointj 2023-03-21 20:33:43 -03:00 committed by GitHub
parent 901f07fa50 50649c9e02
commit 6664a6b76e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/applications/networking/cluster/fluxcd/default.nix
View file

@ -1,9 +1,9 @@
{ lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles, stdenv }:
let
version = "0.41.1";
sha256 = "0nrwhq336n0aj1c51difgxk9an8d1j4yfkxn9sgzw9dq50rrrinf";
manifestsSha256 = "1rrmdbaian8wskcyaa2nifp4mp4bz0nqgwz6ah5r0ywg48cfq2gm";
version = "0.41.2";
sha256 = "0c4in6k6l9kjskcapi6gap9jkbrrfd106z6nbs48afr30cv2wp24";
manifestsSha256 = "0kc9s5289s5b1slk2w3sr28yk9hg3lmrpy00mw3im3k6aqgrk9j0";
manifests = fetchzip {
url =
@ -23,13 +23,14 @@ in buildGoModule rec {
inherit sha256;
};
vendorSha256 = "sha256-Oh1FBTHkICQZ79qf8XCL7ifi5Wd3jrIDupBKzYo+AEA=";
vendorSha256 = "sha256-ez4yaFZ5JROdu9boN5wI/XGMqLo8OKW6b0FZsJeFw4w=";
postUnpack = ''
cp -r ${manifests} source/cmd/flux/manifests
'';
patches = [ ./patches/disable-tests-ssh_key.patch ];
# disable tests that require network access
rm source/cmd/flux/create_secret_git_test.go
'';
ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ];

19
pkgs/applications/networking/cluster/fluxcd/patches/disable-tests-ssh_key.patch
View file

@ -1,19 +0,0 @@
--- flux/cmd/flux/create_secret_git_test.go.orig 2021-12-07 13:46:21.196278468 +0100
+++ flux/cmd/flux/create_secret_git_test.go 2021-12-07 13:49:51.668566955 +0100
@@ -20,16 +20,6 @@
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/ecdsa.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/ecdsa-password.private --password=password --namespace=my-namespace --export",
- assert: assertGoldenFile("testdata/create_secret/git/git-ssh-secret-password.yaml"),
- },
}
for _, tt := range tests {