Skip to content

Commit 82b56a1

Browse files
committed
UPSTREAM: 133625: Remove patch/update from ServiceCIDR API conformance test
They were already listed in ineligible_endpoints.yaml, so we shouldn't be testing them here anyway. (cherry picked from commit 9d09997)
1 parent a237dcb commit 82b56a1

File tree

1 file changed

+0
-27
lines changed

1 file changed

+0
-27
lines changed

test/e2e/network/service_cidrs.go

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -167,33 +167,6 @@ var _ = common.SIGDescribe("ServiceCIDR and IPAddress API", func() {
167167
framework.Failf("unexpected error getting default ServiceCIDR: %v", err)
168168
}
169169

170-
ginkgo.By("patching")
171-
patchedServiceCIDR, err := f.ClientSet.NetworkingV1().ServiceCIDRs().Patch(ctx, defaultservicecidr.DefaultServiceCIDRName, types.MergePatchType, []byte(`{"metadata":{"annotations":{"patched":"true"}}}`), metav1.PatchOptions{})
172-
if err != nil {
173-
framework.Failf("unexpected error patching IPAddress: %v", err)
174-
}
175-
if v, ok := patchedServiceCIDR.Annotations["patched"]; !ok || v != "true" {
176-
framework.Failf("patched object should have the applied annotation")
177-
}
178-
179-
ginkgo.By("updating")
180-
var cidrToUpdate, updatedCIDR *networkingv1.ServiceCIDR
181-
err = retry.RetryOnConflict(retry.DefaultRetry, func() error {
182-
cidrToUpdate, err = f.ClientSet.NetworkingV1().ServiceCIDRs().Get(ctx, defaultservicecidr.DefaultServiceCIDRName, metav1.GetOptions{})
183-
if err != nil {
184-
return err
185-
}
186-
cidrToUpdate.Annotations["updated"] = "true"
187-
updatedCIDR, err = f.ClientSet.NetworkingV1().ServiceCIDRs().Update(ctx, cidrToUpdate, metav1.UpdateOptions{})
188-
return err
189-
})
190-
if err != nil {
191-
framework.Failf("unexpected error updating IPAddress: %v", err)
192-
}
193-
if v, ok := updatedCIDR.Annotations["updated"]; !ok || v != "true" {
194-
framework.Failf("updated object should have the applied annotation")
195-
}
196-
197170
ginkgo.By("listing")
198171
list, err := f.ClientSet.NetworkingV1().ServiceCIDRs().List(ctx, metav1.ListOptions{})
199172
if err != nil {

0 commit comments

Comments
 (0)