Skip to content

Commit 0925668

Browse files
authored
Merge pull request #26975 from stbenjam/revert-26883-invalid-ext-gateway-test
Revert "Add networking test for invalid external gateway"
2 parents 36ddf05 + ba8377f commit 0925668

File tree

3 files changed

+0
-69
lines changed

3 files changed

+0
-69
lines changed

test/extended/networking/external_gateway.go

-48
This file was deleted.

test/extended/networking/util.go

-19
Original file line numberDiff line numberDiff line change
@@ -248,25 +248,6 @@ func makeNamespaceScheduleToAllNodes(f *e2e.Framework) {
248248
}
249249
}
250250

251-
func makeNamespaceWithExternalGatewaySet(f *e2e.Framework, gatewayIP string) {
252-
for {
253-
ns, err := f.ClientSet.CoreV1().Namespaces().Get(context.Background(), f.Namespace.Name, metav1.GetOptions{})
254-
expectNoError(err)
255-
if ns.Annotations == nil {
256-
ns.Annotations = make(map[string]string)
257-
}
258-
ns.Annotations["k8s.ovn.org/routing-external-gws"] = gatewayIP
259-
_, err = f.ClientSet.CoreV1().Namespaces().Update(context.Background(), ns, metav1.UpdateOptions{})
260-
if err == nil {
261-
return
262-
}
263-
if kapierrs.IsConflict(err) {
264-
continue
265-
}
266-
expectNoError(err)
267-
}
268-
}
269-
270251
// findAppropriateNodes tries to find a source and destination for a type of node connectivity
271252
// test (same node, or different node).
272253
func findAppropriateNodes(f *e2e.Framework, nodeType NodeType) (*corev1.Node, *corev1.Node, error) {

test/extended/util/annotate/generated/zz_generated.annotations.go

-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)