Skip to content

Commit 1790189

Browse files
chore: revert dry-run admission tests (#2038)
* fix: allow administrator operations on tenant namespaces Signed-off-by: Oliver Baehler <oliver@sudo-i.net> * fix: allow administrator operations on tenant namespaces Signed-off-by: Oliver Baehler <oliver@sudo-i.net> * fix: allow administrator operations on tenant namespaces Signed-off-by: Oliver Baehler <oliver@sudo-i.net> * fix: allow administrator operations on tenant namespaces Signed-off-by: Oliver Baehler <oliver@sudo-i.net> * Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * fix: revert dry-run Signed-off-by: Oliver Baehler <oliver@sudo-i.net> * fix: revert dry-run Signed-off-by: Oliver Baehler <oliver@sudo-i.net> * fix: revert dry-run Signed-off-by: Oliver Baehler <oliver@sudo-i.net> * feat: implement namespace metadata enforcement Signed-off-by: Oliver Baehler <oliver@sudo-i.net> --------- Signed-off-by: Oliver Baehler <oliver@sudo-i.net> Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
1 parent abff646 commit 1790189

1 file changed

Lines changed: 11 additions & 8 deletions

File tree

e2e/config_namespace_hijacking_test.go

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ var _ = Describe("creating several Namespaces for a Tenant", Ordered, Label("con
399399
_, err = cs.CoreV1().Namespaces().UpdateStatus(
400400
context.TODO(),
401401
hijacked,
402-
metav1.UpdateOptions{DryRun: []string{metav1.DryRunAll}},
402+
metav1.UpdateOptions{},
403403
)
404404

405405
if err != nil {
@@ -484,7 +484,7 @@ var _ = Describe("creating several Namespaces for a Tenant", Ordered, Label("con
484484
_, err = cs.CoreV1().Namespaces().Finalize(
485485
context.TODO(),
486486
hijacked,
487-
metav1.UpdateOptions{DryRun: []string{metav1.DryRunAll}},
487+
metav1.UpdateOptions{},
488488
)
489489

490490
if err != nil {
@@ -525,7 +525,7 @@ var _ = Describe("creating several Namespaces for a Tenant", Ordered, Label("con
525525
_, err = cs.CoreV1().Namespaces().Update(
526526
context.TODO(),
527527
current,
528-
metav1.UpdateOptions{DryRun: []string{metav1.DryRunAll}},
528+
metav1.UpdateOptions{},
529529
)
530530

531531
Expect(err).To(HaveOccurred())
@@ -950,7 +950,10 @@ var _ = Describe("creating several Namespaces for a Tenant", Ordered, Label("con
950950
UID: tenant.GetUID(),
951951
}}
952952

953-
_, _ = cs.CoreV1().Namespaces().UpdateStatus(context.TODO(), statusNs, metav1.UpdateOptions{DryRun: []string{metav1.DryRunAll}})
953+
_, err = cs.CoreV1().Namespaces().UpdateStatus(context.TODO(), statusNs, metav1.UpdateOptions{})
954+
Expect(err).To(HaveOccurred())
955+
Expect(apierrors.IsForbidden(err)).To(BeTrue())
956+
Expect(err).To(MatchError(ContainSubstring("namespace can not be patched into a tenant")))
954957

955958
patch := []byte(fmt.Sprintf(
956959
`{"metadata":{"labels":{"%s":"%s"}}}`,
@@ -1219,7 +1222,7 @@ var _ = Describe("creating several Namespaces for a Tenant", Ordered, Label("con
12191222
},
12201223
}
12211224

1222-
_, err = cs.CoreV1().Namespaces().UpdateStatus(context.TODO(), statusNs, metav1.UpdateOptions{DryRun: []string{metav1.DryRunAll}})
1225+
_, err = cs.CoreV1().Namespaces().UpdateStatus(context.TODO(), statusNs, metav1.UpdateOptions{})
12231226
if err != nil {
12241227
expectOriginalTenantOwnership(ns.Name, tenant)
12251228

@@ -1261,7 +1264,7 @@ var _ = Describe("creating several Namespaces for a Tenant", Ordered, Label("con
12611264

12621265
statusNs.Labels[meta.TenantLabel] = randomName
12631266

1264-
_, err = cs.CoreV1().Namespaces().UpdateStatus(context.TODO(), statusNs, metav1.UpdateOptions{DryRun: []string{metav1.DryRunAll}})
1267+
_, err = cs.CoreV1().Namespaces().UpdateStatus(context.TODO(), statusNs, metav1.UpdateOptions{})
12651268
if err != nil {
12661269
expectOriginalTenantOwnership(ns.Name, tenant)
12671270

@@ -1312,7 +1315,7 @@ var _ = Describe("creating several Namespaces for a Tenant", Ordered, Label("con
13121315
},
13131316
}
13141317

1315-
_, err = cs.CoreV1().Namespaces().UpdateStatus(context.TODO(), statusNs, metav1.UpdateOptions{DryRun: []string{metav1.DryRunAll}})
1318+
_, err = cs.CoreV1().Namespaces().UpdateStatus(context.TODO(), statusNs, metav1.UpdateOptions{})
13161319
if err != nil {
13171320
retrievedNs := getNamespace(ns.Name)
13181321

@@ -1361,7 +1364,7 @@ var _ = Describe("creating several Namespaces for a Tenant", Ordered, Label("con
13611364
},
13621365
}
13631366

1364-
_, err = cs.CoreV1().Namespaces().UpdateStatus(context.TODO(), statusNs, metav1.UpdateOptions{DryRun: []string{metav1.DryRunAll}})
1367+
_, err = cs.CoreV1().Namespaces().UpdateStatus(context.TODO(), statusNs, metav1.UpdateOptions{})
13651368
if err != nil {
13661369
expectNoTenantOwnership(unmanaged.Name, tenant)
13671370

0 commit comments

Comments
 (0)