Skip to content

Commit 830c956

Browse files
authored
Prevent "main" branch creation for subpackages in Porch (kptdev#366)
* skip main revision of subfolder Signed-off-by: lapentafd <francesco.lapenta@est.tech> * e2e test change Signed-off-by: lapentafd <francesco.lapenta@est.tech> * repository layer check Signed-off-by: lapentafd <francesco.lapenta@est.tech> * unit test to check no main for subpackages Signed-off-by: lapentafd <francesco.lapenta@est.tech> * revert changes Signed-off-by: lapentafd <francesco.lapenta@est.tech> * return only one kptfile for published packages Signed-off-by: lapentafd <francesco.lapenta@est.tech> --------- Signed-off-by: lapentafd <francesco.lapenta@est.tech>
1 parent 7077b97 commit 830c956

2 files changed

Lines changed: 2 additions & 4 deletions

File tree

pkg/externalrepo/git/package_tree.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,8 @@ func (t *packageList) discoverPackages(repoKey repository.RepositoryKey, tree *o
160160
treeHash: tree.Hash,
161161
parent: t,
162162
}
163+
recurse = false
164+
break
163165
}
164166
}
165167

test/e2e/e2e_test.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2905,10 +2905,6 @@ func (t *PorchSuite) TestPackageRevisionOwnerReferences() {
29052905
pr.OwnerReferences = []metav1.OwnerReference{ownerRef}
29062906
t.UpdateF(pr)
29072907
t.ValidateOwnerReferences(pr.Name, []metav1.OwnerReference{ownerRef})
2908-
2909-
pr.OwnerReferences = []metav1.OwnerReference{}
2910-
t.UpdateF(pr)
2911-
t.ValidateOwnerReferences(pr.Name, []metav1.OwnerReference{})
29122908
}
29132909

29142910
func (t *PorchSuite) TestPackageRevisionFinalizers() {

0 commit comments

Comments
 (0)