feat: pass repoRecorder into helm* controllers

York Chen · York Chen · commit a02e7e0ffe17 · 2022-09-19T23:12:50.000-04:00
diff --git a/controllers/helmchart_controller.go b/controllers/helmchart_controller.go
@@ -128,6 +128,7 @@ type HelmChartReconciler struct {
 	Cache *cache.Cache
 	TTL   time.Duration
 	*cache.CacheRecorder
+	RepoRecorder *repository.Recorder
 }
 
 func (r *HelmChartReconciler) SetupWithManager(mgr ctrl.Manager) error {
@@ -585,7 +586,7 @@ func (r *HelmChartReconciler) buildFromHelmRepository(ctx context.Context, obj *
 			}
 		}
 	default:
-		httpChartRepo, err := repository.NewChartRepository(normalizedURL, r.Storage.LocalPath(*repo.GetArtifact()), r.Getters, tlsConfig, clientOpts,
+		httpChartRepo, err := repository.NewChartRepository(normalizedURL, r.Storage.LocalPath(*repo.GetArtifact()), r.Getters, tlsConfig, clientOpts, repo.Namespace, r.RepoRecorder,
 			repository.WithMemoryCache(r.Storage.LocalPath(*repo.GetArtifact()), r.Cache, r.TTL, func(event string) {
 				r.IncCacheEvents(event, obj.Name, obj.Namespace)
 			}))
@@ -1038,7 +1039,7 @@ func (r *HelmChartReconciler) namespacedChartRepositoryCallback(ctx context.Cont
 
 			chartRepo = ociChartRepo
 		} else {
-			httpChartRepo, err := repository.NewChartRepository(normalizedURL, "", r.Getters, tlsConfig, clientOpts)
+			httpChartRepo, err := repository.NewChartRepository(normalizedURL, "", r.Getters, tlsConfig, clientOpts, namespace, r.RepoRecorder)
 			if err != nil {
 				return nil, err
 			}
diff --git a/controllers/helmrepository_controller.go b/controllers/helmrepository_controller.go
@@ -109,6 +109,7 @@ type HelmRepositoryReconciler struct {
 	Cache *cache.Cache
 	TTL   time.Duration
 	*cache.CacheRecorder
+	RepoRecorder *repository.Recorder
 }
 
 type HelmRepositoryReconcilerOptions struct {
@@ -398,7 +399,7 @@ func (r *HelmRepositoryReconciler) reconcileSource(ctx context.Context, obj *sou
 	}
 
 	// Construct Helm chart repository with options and download index
-	newChartRepo, err := repository.NewChartRepository(obj.Spec.URL, "", r.Getters, tlsConfig, clientOpts)
+	newChartRepo, err := repository.NewChartRepository(obj.Spec.URL, "", r.Getters, tlsConfig, clientOpts, obj.Namespace, r.RepoRecorder)
 	if err != nil {
 		switch err.(type) {
 		case *url.Error:
diff --git a/controllers/helmrepository_controller_test.go b/controllers/helmrepository_controller_test.go
@@ -600,9 +600,9 @@ func TestHelmRepositoryReconciler_reconcileSource(t *testing.T) {
 				if serr != nil {
 					validSecret = false
 				}
-				newChartRepo, err = repository.NewChartRepository(obj.Spec.URL, "", testGetters, tOpts, clientOpts)
+				newChartRepo, err = repository.NewChartRepository(obj.Spec.URL, "", testGetters, tOpts, clientOpts, obj.Namespace, testRepoRecorder)
 			} else {
-				newChartRepo, err = repository.NewChartRepository(obj.Spec.URL, "", testGetters, nil, nil)
+				newChartRepo, err = repository.NewChartRepository(obj.Spec.URL, "", testGetters, nil, nil, obj.Namespace, testRepoRecorder)
 			}
 			g.Expect(err).ToNot(HaveOccurred())
 
@@ -736,7 +736,7 @@ func TestHelmRepositoryReconciler_reconcileArtifact(t *testing.T) {
 			g.Expect(err).ToNot(HaveOccurred())
 			g.Expect(cacheFile.Close()).ToNot(HaveOccurred())
 
-			chartRepo, err := repository.NewChartRepository(obj.Spec.URL, "", testGetters, nil, nil)
+			chartRepo, err := repository.NewChartRepository(obj.Spec.URL, "", testGetters, nil, nil, obj.Namespace, testRepoRecorder)
 			g.Expect(err).ToNot(HaveOccurred())
 			chartRepo.CachePath = cachePath
 

Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,7 @@ type HelmChartReconciler struct {`
`128`	`128`	`Cache *cache.Cache`
`129`	`129`	`TTL time.Duration`
`130`	`130`	`*cache.CacheRecorder`
	`131`	`+ RepoRecorder *repository.Recorder`
`131`	`132`	`}`
`132`	`133`
`133`	`134`	`func (r *HelmChartReconciler) SetupWithManager(mgr ctrl.Manager) error {`
`@@ -585,7 +586,7 @@ func (r HelmChartReconciler) buildFromHelmRepository(ctx context.Context, obj `
`585`	`586`	`}`
`586`	`587`	`}`
`587`	`588`	`default:`
`588`		`- httpChartRepo, err := repository.NewChartRepository(normalizedURL, r.Storage.LocalPath(*repo.GetArtifact()), r.Getters, tlsConfig, clientOpts,`
	`589`	`+ httpChartRepo, err := repository.NewChartRepository(normalizedURL, r.Storage.LocalPath(*repo.GetArtifact()), r.Getters, tlsConfig, clientOpts, repo.Namespace, r.RepoRecorder,`
`589`	`590`	`repository.WithMemoryCache(r.Storage.LocalPath(*repo.GetArtifact()), r.Cache, r.TTL, func(event string) {`
`590`	`591`	`r.IncCacheEvents(event, obj.Name, obj.Namespace)`
`591`	`592`	`}))`
`@@ -1038,7 +1039,7 @@ func (r *HelmChartReconciler) namespacedChartRepositoryCallback(ctx context.Cont`
`1038`	`1039`
`1039`	`1040`	`chartRepo = ociChartRepo`
`1040`	`1041`	`} else {`
`1041`		`- httpChartRepo, err := repository.NewChartRepository(normalizedURL, "", r.Getters, tlsConfig, clientOpts)`
	`1042`	`+ httpChartRepo, err := repository.NewChartRepository(normalizedURL, "", r.Getters, tlsConfig, clientOpts, namespace, r.RepoRecorder)`
`1042`	`1043`	`if err != nil {`
`1043`	`1044`	`return nil, err`
`1044`	`1045`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,7 @@ type HelmRepositoryReconciler struct {`
`109`	`109`	`Cache *cache.Cache`
`110`	`110`	`TTL time.Duration`
`111`	`111`	`*cache.CacheRecorder`
	`112`	`+ RepoRecorder *repository.Recorder`
`112`	`113`	`}`
`113`	`114`
`114`	`115`	`type HelmRepositoryReconcilerOptions struct {`
`@@ -398,7 +399,7 @@ func (r HelmRepositoryReconciler) reconcileSource(ctx context.Context, obj sou`
`398`	`399`	`}`
`399`	`400`
`400`	`401`	`// Construct Helm chart repository with options and download index`
`401`		`- newChartRepo, err := repository.NewChartRepository(obj.Spec.URL, "", r.Getters, tlsConfig, clientOpts)`
	`402`	`+ newChartRepo, err := repository.NewChartRepository(obj.Spec.URL, "", r.Getters, tlsConfig, clientOpts, obj.Namespace, r.RepoRecorder)`
`402`	`403`	`if err != nil {`
`403`	`404`	`switch err.(type) {`
`404`	`405`	`case *url.Error:`