fix gitea client timeout (#258)

cnoe-io · May 16, 2024 · 1ed5422 · 1ed5422
1 parent 3fa0784
commit 1ed5422
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/pkg/controllers/gitrepository/controller.go b/pkg/controllers/gitrepository/controller.go
@@ -70,8 +70,12 @@ func GetGitProvider(ctx context.Context, repo *v1alpha1.GitRepository, kubeClien
 	case v1alpha1.GitProviderGitea:
 		tr := &http.Transport{
 			TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
+			DialContext: (&net.Dialer{
+				Timeout:   gitTCPTimeout,
+				KeepAlive: 30 * time.Second, // from http.DefaultTransport
+			}).DialContext,
 		}
-		c := &http.Client{Transport: tr}
+		c := &http.Client{Transport: tr, Timeout: gitHTTPTimeout}
 		giteaClient, err := NewGiteaClient(repo.Spec.Provider.GitURL, gitea.SetHTTPClient(c))
 		if err != nil {
 			return nil, err

diff --git a/pkg/controllers/gitrepository/gitea.go b/pkg/controllers/gitrepository/gitea.go
@@ -83,7 +83,7 @@ func (g *giteaProvider) setProviderCredentials(ctx context.Context, repo *v1alph
 func (g *giteaProvider) getRepository(ctx context.Context, repo *v1alpha1.GitRepository) (repoInfo, error) {
 	resp, repoResp, err := g.giteaClient.GetRepo(getOrganizationName(*repo), getRepositoryName(*repo))
 	if err != nil {
-		if repoResp.StatusCode == 404 {
+		if repoResp != nil && repoResp.StatusCode == 404 {
 			return repoInfo{}, notFoundError{}
 		}
 		return repoInfo{}, err