Skip to content

Bug 1971590: Enable TestEndpointAdmission test only for OpenShift SDN #26223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Jul 27, 2021
Merged

Bug 1971590: Enable TestEndpointAdmission test only for OpenShift SDN #26223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions test/extended/networking/endpoint_admission.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,13 @@ var _ = g.Describe("[sig-network][endpoints] admission", func() {
defer g.GinkgoRecover()
oc := exutil.NewCLI("endpoint-admission")

g.It("TestEndpointAdmission", func() {
TestEndpointAdmission(g.GinkgoT(), oc)
InOpenShiftSDNContext(func() {
g.It("blocks manual creation of Endpoints pointing to the cluster or service network", func() {
TestEndpointAdmission(g.GinkgoT(), oc)
})
})
})

var exampleAddresses = map[string]string{
"cluster": "10.128.0.2",
"service": "172.30.0.2",
"external": "1.2.3.4",
}

func testOne(t g.GinkgoTInterface, oc *exutil.CLI, client kubernetes.Interface, addrType string, success bool) *corev1.Endpoints {
networkConfig, err := oc.AdminConfigClient().ConfigV1().Networks().Get(context.Background(), "cluster", metav1.GetOptions{})
o.Expect(err).NotTo(o.HaveOccurred())
Expand Down Expand Up @@ -113,7 +109,8 @@ func TestEndpointAdmission(t g.GinkgoTInterface, oc *exutil.CLI) {
if err != nil {
t.Fatalf("unexpected error updating endpoint annotation: %v", err)
}
ep.Subsets[0].Addresses[0].IP = exampleAddresses["service"]

ep.Subsets[0].Addresses[0].IP = "172.30.0.2"
ep, err = projectAdminClient.CoreV1().Endpoints(oc.Namespace()).Update(context.Background(), ep, metav1.UpdateOptions{})
if err == nil {
t.Fatalf("unexpected success modifying endpoint")
Expand Down
2 changes: 1 addition & 1 deletion test/extended/util/annotate/generated/zz_generated.annotations.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.