Skip to content

Commit 74d0928

Browse files
authored
Fix dbrepository.go to avoid duplicate packages (kptdev#357)
1 parent f21e1b2 commit 74d0928

2 files changed

Lines changed: 10 additions & 1 deletion

File tree

deployments/local/kind_porch_test_cluster.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@ networking:
99
nodes:
1010
- role: control-plane
1111
image: kindest/node:v1.34.0@sha256:7416a61b42b1662ca6ca89f02028ac133a309a2a30ba309614e8ec94d976dc5a
12+
kubeadmConfigPatches:
13+
- |
14+
kind: ClusterConfiguration
15+
apiVersion: kubeadm.k8s.io/v1beta3
16+
apiServer:
17+
extraArgs:
18+
request-timeout: "300s"
1219
extraPortMappings:
1320
- containerPort: 30000 # Gitea NodePort
1421
hostPort: 3000

pkg/cache/dbcache/dbrepository.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,7 @@ func (r *dbRepository) DeletePackageRevision(ctx context.Context, pr2Delete repo
231231

232232
pk := repository.PackageKey{
233233
RepoKey: r.Key(),
234+
Path: pr2Delete.Key().PkgKey.Path,
234235
Package: pr2Delete.Key().PKey().Package,
235236
}
236237

@@ -288,9 +289,10 @@ func (r *dbRepository) ListPackages(ctx context.Context, filter repository.ListP
288289

289290
klog.V(5).Infof("ListPackages: listing packages in repository %+v with filter %+v", r.Key(), filter)
290291

292+
filter.Key.RepoKey = r.Key()
291293
foundPkgs, err := pkgListPkgsFromDB(ctx, filter)
292294
if err != nil {
293-
klog.Warningf("ListPackages: listing packagess in repository %+v with filter %+v failed: %q", r.Key(), filter, err)
295+
klog.Warningf("ListPackages: listing packages in repository %+v with filter %+v failed: %q", r.Key(), filter, err)
294296
return nil, err
295297
}
296298

0 commit comments

Comments
 (0)