Merge pull request #7565 from cert-manager-bot/cherry-pick-7549-to-re…

…lease-1.17

[release-1.17] chore(issuer/cloudflare): ensure we set ZoneID

pkg/issuer/acme/dns/cloudflare/cloudflare.go

@@ -233,6 +233,10 @@ func (c *DNSProvider) findTxtRecord(ctx context.Context, fqdn, content string) (
 
 	for _, rec := range records {
 		if rec.Name == util.UnFqdn(fqdn) && rec.Content == content {
+			// Cloudflare made a breaking change to their API and removed the ZoneID from responses:
+			// https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#2024-11-30
+			// The simplest fix is to set the ZoneID manually here
+			rec.ZoneID = zoneID
 			return &rec, nil
 		}
 	}