Skip to content

OCPBUGS-46422: Remove patch/update from ServiceCIDR API conformance test #2466

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

Open
wants to merge 1 commit into
base: release-4.20
Choose a base branch
from
Open

OCPBUGS-46422: Remove patch/update from ServiceCIDR API conformance test #2466

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
27 changes: 0 additions & 27 deletions test/e2e/network/service_cidrs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,33 +167,6 @@ var _ = common.SIGDescribe("ServiceCIDR and IPAddress API", func() {
framework.Failf("unexpected error getting default ServiceCIDR: %v", err)
}

ginkgo.By("patching")
patchedServiceCIDR, err := f.ClientSet.NetworkingV1().ServiceCIDRs().Patch(ctx, defaultservicecidr.DefaultServiceCIDRName, types.MergePatchType, []byte(`{"metadata":{"annotations":{"patched":"true"}}}`), metav1.PatchOptions{})
if err != nil {
framework.Failf("unexpected error patching IPAddress: %v", err)
}
if v, ok := patchedServiceCIDR.Annotations["patched"]; !ok || v != "true" {
framework.Failf("patched object should have the applied annotation")
}

ginkgo.By("updating")
var cidrToUpdate, updatedCIDR *networkingv1.ServiceCIDR
err = retry.RetryOnConflict(retry.DefaultRetry, func() error {
cidrToUpdate, err = f.ClientSet.NetworkingV1().ServiceCIDRs().Get(ctx, defaultservicecidr.DefaultServiceCIDRName, metav1.GetOptions{})
if err != nil {
return err
}
cidrToUpdate.Annotations["updated"] = "true"
updatedCIDR, err = f.ClientSet.NetworkingV1().ServiceCIDRs().Update(ctx, cidrToUpdate, metav1.UpdateOptions{})
return err
})
if err != nil {
framework.Failf("unexpected error updating IPAddress: %v", err)
}
if v, ok := updatedCIDR.Annotations["updated"]; !ok || v != "true" {
framework.Failf("updated object should have the applied annotation")
}

ginkgo.By("listing")
list, err := f.ClientSet.NetworkingV1().ServiceCIDRs().List(ctx, metav1.ListOptions{})
if err != nil {
Expand Down