Rebase against main

Nordix · Nov 28, 2024 · bcb1c22 · bcb1c22
1 parent 99ff36e
commit bcb1c22
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/api/porch/v1alpha1/types.go b/api/porch/v1alpha1/types.go
@@ -523,6 +523,7 @@ type PackageRevisionResourcesStatus struct {
 	RenderStatus RenderStatus `json:"renderStatus,omitempty"`
 }
 
+
 // Package
 // +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
@@ -558,4 +559,4 @@ type PackageStatus struct {
 	// LatestRevision identifies the package revision that is the latest
 	// published package revision belonging to this package
 	LatestRevision string `json:"latestRevision,omitempty"`
-}
+}
diff --git a/pkg/cache/memory/cache.go b/pkg/cache/memory/cache.go
@@ -172,7 +172,7 @@ func (c *Cache) OpenRepository(ctx context.Context, repositorySpec *configapi.Re
 }
 
 func (c *Cache) CloseRepository(ctx context.Context, repositorySpec *configapi.Repository, allRepos []configapi.Repository) error {
-	_, span := tracer.Start(ctx, "Cache::CloseRepository", trace.WithAttributes())
+	_, span := tracer.Start(ctx, "Cache::OpenRepository", trace.WithAttributes())
 	defer span.End()
 
 	key, err := getCacheKey(repositorySpec)
@@ -181,7 +181,6 @@ func (c *Cache) CloseRepository(ctx context.Context, repositorySpec *configapi.R
 	}
 
 	// check if repositorySpec shares the underlying cached repo with another repository
-	// TODO: Do in a DB way
 	for _, r := range allRepos {
 		if r.Name == repositorySpec.Name && r.Namespace == repositorySpec.Namespace {
 			continue