github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-18 04:54:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #133642 from danwinship/automated-cherry-pick-of-#133625-origin-release-1.33

Browse Source 
Automated cherry pick of #133625: Remove patch/update from ServiceCIDR API conformance test
This commit is contained in:
Kubernetes Prow Robot
2025-09-03 02:35:22 -07:00
committed by GitHub
parent 9b25105f02 9d09997311
commit 1363698a95
1 changed files with 0 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
test/e2e/network/service_cidrs.go
View File

@@ -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 {