diff options
| author | superherointj <5861043+superherointj@users.noreply.github.com> | 2023-03-21 08:46:10 -0300 |
|---|---|---|
| committer | superherointj <5861043+superherointj@users.noreply.github.com> | 2023-03-21 08:46:10 -0300 |
| commit | 50649c9e02c4313016697145cb3e326adc0a439c (patch) | |
| tree | 1c51b6e94cbeb61f1f280e4ed2d011a955045b46 /pkgs/applications/networking/cluster/fluxcd | |
| parent | 3d50e8355068c139197870753528954887656ccf (diff) | |
fluxcd: 0.41.1 -> 0.41.2
Diffstat (limited to 'pkgs/applications/networking/cluster/fluxcd')
| -rw-r--r-- | pkgs/applications/networking/cluster/fluxcd/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/applications/networking/cluster/fluxcd/patches/disable-tests-ssh_key.patch | 19 |
2 files changed, 7 insertions, 25 deletions
diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index dbfcebfe6d942..a6d04ad7005e9 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -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}" ]; diff --git a/pkgs/applications/networking/cluster/fluxcd/patches/disable-tests-ssh_key.patch b/pkgs/applications/networking/cluster/fluxcd/patches/disable-tests-ssh_key.patch deleted file mode 100644 index 3229cf333b406..0000000000000 --- a/pkgs/applications/networking/cluster/fluxcd/patches/disable-tests-ssh_key.patch +++ /dev/null @@ -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 { |