Update source-controller with libgit2 race fixes

Also, removes the panic recovery code added in cloneInto() as the
underlying Checkout() in SC already has a panic handler. The issues were
due to goroutine panicking, which are now handled in the SC libgit
managed transport.

Signed-off-by: Sunny <[email protected]>

Author: darkowlzz

Makefile

@@ -21,7 +21,8 @@ CACHE := cache
 
 # Version of the source-controller from which to get the GitRepository CRD.
 # Pulls source-controller/api's version set in go.mod.
-SOURCE_VER ?= $(shell go list -m github.com/fluxcd/source-controller/api | awk '{print $$2}')
+# SOURCE_VER ?= $(shell go list -m github.com/fluxcd/source-controller/api | awk '{print $$2}')
+SOURCE_VER = v0.25.0
 
 # Version of the image-reflector-controller from which to get the ImagePolicy CRD.
 # Pulls image-reflector-controller/api's version set in go.mod.

controllers/imageupdateautomation_controller.go

@@ -542,9 +542,7 @@ func (r repoAccess) remoteCallbacks(ctx context.Context) libgit2.RemoteCallbacks
 // can be `nil`). It returns a `*libgit2.Repository` since that is used
 // for committing changes.
 func cloneInto(ctx context.Context, access repoAccess, ref *sourcev1.GitRepositoryRef,
-	path string) (_ *libgit2.Repository, err error) {
-	defer recoverPanic(&err)
-
+	path string) (*libgit2.Repository, error) {
 	opts := git.CheckoutOptions{}
 	if ref != nil {
 		opts.Tag = ref.Tag
@@ -983,9 +981,3 @@ func templateMsg(messageTemplate string, templateValues *TemplateData) (string,
 	}
 	return b.String(), nil
 }
-
-func recoverPanic(err *error) {
-	if r := recover(); r != nil {
-		*err = fmt.Errorf("recovered from git2go panic: %v", r)
-	}
-}

go.mod

@@ -15,8 +15,8 @@ require (
 	github.com/fluxcd/pkg/gittestserver v0.5.4
 	github.com/fluxcd/pkg/runtime v0.16.1
 	github.com/fluxcd/pkg/ssh v0.4.1
-	github.com/fluxcd/source-controller v0.25.0
-	github.com/fluxcd/source-controller/api v0.25.0
+	github.com/fluxcd/source-controller v0.25.1-0.20220602201518-7f7490ebf021
+	github.com/fluxcd/source-controller/api v0.25.1-0.20220602201518-7f7490ebf021
 	github.com/go-logr/logr v1.2.3
 	github.com/google/go-containerregistry v0.9.0
 	github.com/libgit2/git2go/v33 v33.0.9

go.sum

@@ -196,10 +196,10 @@ github.com/fluxcd/pkg/ssh v0.4.1 h1:O5FCjb5NIZ9PeRjdF2iL9jaPNM+RL+IjrMBZPkqF9W4=
 github.com/fluxcd/pkg/ssh v0.4.1/go.mod h1:KGgOUOy1uI6RC6+qxIBLvP1AeOOs/nLB25Ca6TZMIXE=
 github.com/fluxcd/pkg/version v0.1.0 h1:v+SmCanmCB5Tj2Cx9TXlj+kNRfPGbAvirkeqsp7ZEAQ=
 github.com/fluxcd/pkg/version v0.1.0/go.mod h1:V7Z/w8dxLQzv0FHqa5ox5TeyOd2zOd49EeuWFgnwyj4=
-github.com/fluxcd/source-controller v0.25.0 h1:57FnGVTeMGfGIoRyekSPkhqMqbg+haaW/k/GlxQI7v0=
-github.com/fluxcd/source-controller v0.25.0/go.mod h1:S/VQ8B0bsr5BqhQ5ts5yc662znMkhnNNF8k+De2NI3M=
-github.com/fluxcd/source-controller/api v0.25.0 h1:+uL+hQb/6h2MHuE9/Iq054TrDWF70puAuWBcoBrZK5M=
-github.com/fluxcd/source-controller/api v0.25.0/go.mod h1:tuMrqHHpRt7mxdLeRXGIMtTKAMufLwLTm5uXkEOJWFw=
+github.com/fluxcd/source-controller v0.25.1-0.20220602201518-7f7490ebf021 h1:ULVxVtcKtjOndJWx+oRQAsGhDItlP7Nl8Eg1mApPH8M=
+github.com/fluxcd/source-controller v0.25.1-0.20220602201518-7f7490ebf021/go.mod h1:S/VQ8B0bsr5BqhQ5ts5yc662znMkhnNNF8k+De2NI3M=
+github.com/fluxcd/source-controller/api v0.25.1-0.20220602201518-7f7490ebf021 h1:d/6UEayIf3P09shP7oTnhvbYRzHwjEnSLvrqUtge1LM=
+github.com/fluxcd/source-controller/api v0.25.1-0.20220602201518-7f7490ebf021/go.mod h1:tuMrqHHpRt7mxdLeRXGIMtTKAMufLwLTm5uXkEOJWFw=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
 github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
 github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=

tests/fuzz/oss_fuzz_build.sh

@@ -70,7 +70,8 @@ echo "replace github.com/fluxcd/image-automation-controller => ../../" >> go.mod
 
 # Version of the source-controller from which to get the GitRepository CRD.
 # Pulls source-controller/api's version set in go.mod.
-SOURCE_VER=$(go list -m github.com/fluxcd/source-controller/api | awk '{print $2}')
+# SOURCE_VER=$(go list -m github.com/fluxcd/source-controller/api | awk '{print $2}')
+SOURCE_VER=v0.25.0
 
 # Version of the image-reflector-controller from which to get the ImagePolicy CRD.
 # Pulls image-reflector-controller/api's version set in go.mod.