Skip to content

Commit 8de8d13

Browse files
authored
Remove Temporary Upgrade Code (#3055)
1 parent 8f0ea93 commit 8de8d13

File tree

2 files changed

+1
-16
lines changed

2 files changed

+1
-16
lines changed

porch/apiserver/pkg/registry/porch/background.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -153,14 +153,6 @@ func (b *background) runOnce(ctx context.Context) error {
153153
for i := range repositories.Items {
154154
repo := &repositories.Items[i]
155155

156-
if repo.Spec.Content == "PackageRevision" {
157-
// Upgrade to "Package"
158-
repo.Spec.Content = configapi.RepositoryContentPackage
159-
if err := b.coreClient.Update(ctx, repo); err != nil {
160-
klog.Errorf("Failed to upgrade Repo content PackageRevision --> Package: %v", err)
161-
}
162-
}
163-
164156
if err := b.cacheRepository(ctx, repo); err != nil {
165157
klog.Errorf("Failed to cache repository: %v", err)
166158
}

porch/repository/pkg/cache/cache.go

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -127,14 +127,7 @@ func (c *Cache) OpenRepository(ctx context.Context, repositorySpec *configapi.Re
127127
}
128128

129129
func isPackageContent(content configapi.RepositoryContent) bool {
130-
switch content {
131-
case "PackageRevision":
132-
return true // TODO: remove this once migration to "Package" is complete.
133-
case configapi.RepositoryContentPackage:
134-
return true
135-
default:
136-
return false
137-
}
130+
return content == configapi.RepositoryContentPackage
138131
}
139132

140133
func (c *Cache) CloseRepository(repositorySpec *configapi.Repository) error {

0 commit comments

Comments
 (0)