diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml
index 1626dd512a8..80181170c90 100644
--- a/.semaphore/semaphore.yml
+++ b/.semaphore/semaphore.yml
@@ -567,7 +567,7 @@ blocks:
             - ./.semaphore/end-to-end/scripts/test_scripts/e2e-validation.sh
   - name: E2E tests
     run:
-      when: "change_in(['/.semaphore/semaphore.yml.d/01-preamble.yml','/.semaphore/semaphore.yml.d/02-global_job_config.yml','/.semaphore/semaphore.yml.d/03-promotions.yml','/.semaphore/semaphore.yml.d/09-blocks.yml','/.semaphore/semaphore.yml.d/99-after_pipeline.yml','/.semaphore/semaphore.yml.d/blocks/20-e2e.yml','/api/pkg/apis/projectcalico/v3/*.go','/api/pkg/lib/numorstring/*.go','/api/pkg/openapi/*.go','/apiserver/cmd/apiserver/*.go','/apiserver/cmd/apiserver/server/*.go','/apiserver/pkg/apiserver/*.go','/apiserver/pkg/printers/projectcalico/*.go','/apiserver/pkg/rbac/*.go','/apiserver/pkg/registry/projectcalico/authorizer/*.go','/apiserver/pkg/registry/projectcalico/bgpconfiguration/*.go','/apiserver/pkg/registry/projectcalico/bgpfilter/*.go','/apiserver/pkg/registry/projectcalico/bgppeer/*.go','/apiserver/pkg/registry/projectcalico/blockaffinity/*.go','/apiserver/pkg/registry/projectcalico/caliconodestatus/*.go','/apiserver/pkg/registry/projectcalico/clusterinformation/*.go','/apiserver/pkg/registry/projectcalico/felixconfig/*.go','/apiserver/pkg/registry/projectcalico/globalnetworkset/*.go','/apiserver/pkg/registry/projectcalico/globalpolicy/*.go','/apiserver/pkg/registry/projectcalico/hostendpoint/*.go','/apiserver/pkg/registry/projectcalico/ipamconfig/*.go','/apiserver/pkg/registry/projectcalico/ippool/*.go','/apiserver/pkg/registry/projectcalico/ipreservation/*.go','/apiserver/pkg/registry/projectcalico/kubecontrollersconfig/*.go','/apiserver/pkg/registry/projectcalico/networkpolicy/*.go','/apiserver/pkg/registry/projectcalico/networkset/*.go','/apiserver/pkg/registry/projectcalico/profile/*.go','/apiserver/pkg/registry/projectcalico/rest/*.go','/apiserver/pkg/registry/projectcalico/server/*.go','/apiserver/pkg/registry/projectcalico/stagedglobalnetworkpolicy/*.go','/apiserver/pkg/registry/projectcalico/stagedkubernetesnetworkpolicy/*.go','/apiserver/pkg/registry/projectcalico/stagednetworkpolicy/*.go','/apiserver/pkg/registry/projectcalico/tier/*.go','/apiserver/pkg/registry/projectcalico/util/*.go','/apiserver/pkg/storage/calico/*.go','/apiserver/pkg/storage/etcd/*.go','/app-policy/checker/*.go','/app-policy/policystore/*.go','/app-policy/types/*.go','/calicoctl/calicoctl/*.go','/calicoctl/calicoctl/commands/*.go','/calicoctl/calicoctl/commands/argutils/*.go','/calicoctl/calicoctl/commands/clientmgr/*.go','/calicoctl/calicoctl/commands/cluster/*.go','/calicoctl/calicoctl/commands/common/*.go','/calicoctl/calicoctl/commands/constants/*.go','/calicoctl/calicoctl/commands/datastore/*.go','/calicoctl/calicoctl/commands/datastore/migrate/*.go','/calicoctl/calicoctl/commands/file/*.go','/calicoctl/calicoctl/commands/ipam/*.go','/calicoctl/calicoctl/commands/node/*.go','/calicoctl/calicoctl/resourcemgr/*.go','/calicoctl/calicoctl/util/*.go','/calicoctl/calicoctl/util/yaml/*.go','/calicoctl/tests/fv/helper/*.go','/cni-plugin/cmd/calico/*.go','/cni-plugin/cmd/install/*.go','/cni-plugin/internal/pkg/azure/*.go','/cni-plugin/internal/pkg/utils/*.go','/cni-plugin/internal/pkg/utils/cri/*.go','/cni-plugin/pkg/dataplane/*.go','/cni-plugin/pkg/dataplane/grpc/*.go','/cni-plugin/pkg/dataplane/grpc/proto/*.go','/cni-plugin/pkg/dataplane/linux/*.go','/cni-plugin/pkg/install/*.go','/cni-plugin/pkg/ipamplugin/*.go','/cni-plugin/pkg/k8s/*.go','/cni-plugin/pkg/plugin/*.go','/cni-plugin/pkg/types/*.go','/cni-plugin/pkg/upgrade/*.go','/cni-plugin/pkg/wait/*.go','/cni-plugin/tests/*.go','/confd/etc','/confd/pkg/backends/*.go','/confd/pkg/backends/calico/*.go','/confd/pkg/backends/types/*.go','/confd/pkg/config/*.go','/confd/pkg/log/*.go','/confd/pkg/resource/template/*.go','/confd/pkg/run/*.go','/crypto/pkg/tls/*.go','/e2e/**','/felix/aws/*.go','/felix/bpf-apache','/felix/bpf-gpl','/felix/bpf/*.go','/felix/bpf/arp/*.go','/felix/bpf/asm/*.go','/felix/bpf/bpfdefs/*.go','/felix/bpf/bpfmap/*.go','/felix/bpf/conntrack/*.go','/felix/bpf/conntrack/cleanupv1/*.go','/felix/bpf/conntrack/timeouts/*.go','/felix/bpf/conntrack/v2/*.go','/felix/bpf/conntrack/v3/*.go','/felix/bpf/conntrack/v4/*.go','/felix/bpf/consistenthash/*.go','/felix/bpf/counters/*.go','/felix/bpf/events/*.go','/felix/bpf/failsafes/*.go','/felix/bpf/filter/*.go','/felix/bpf/hook/*.go','/felix/bpf/ifstate/*.go','/felix/bpf/ipsets/*.go','/felix/bpf/jump/*.go','/felix/bpf/legacy/*.go','/felix/bpf/libbpf/*.go','/felix/bpf/maps/*.go','/felix/bpf/nat/*.go','/felix/bpf/perf/*.go','/felix/bpf/polprog/*.go','/felix/bpf/profiling/*.go','/felix/bpf/proxy/*.go','/felix/bpf/qos/*.go','/felix/bpf/routes/*.go','/felix/bpf/state/*.go','/felix/bpf/tc/*.go','/felix/bpf/tc/defs/*.go','/felix/bpf/utils/*.go','/felix/bpf/xdp/*.go','/felix/cachingmap/*.go','/felix/calc/*.go','/felix/cmd/calico-bpf/commands/*.go','/felix/collector/*.go','/felix/collector/flowlog/*.go','/felix/collector/goldmane/*.go','/felix/collector/local/*.go','/felix/collector/types/*.go','/felix/collector/types/counter/*.go','/felix/collector/types/endpoint/*.go','/felix/collector/types/metric/*.go','/felix/collector/types/tuple/*.go','/felix/collector/utils/*.go','/felix/config/*.go','/felix/conntrack/*.go','/felix/daemon/*.go','/felix/dataplane/*.go','/felix/dataplane/common/*.go','/felix/dataplane/external/*.go','/felix/dataplane/inactive/*.go','/felix/dataplane/ipsets/*.go','/felix/dataplane/linux/*.go','/felix/dataplane/linux/dataplanedefs/*.go','/felix/dataplane/linux/qos/*.go','/felix/deltatracker/*.go','/felix/dispatcher/*.go','/felix/environment/*.go','/felix/ethtool/*.go','/felix/generictables/*.go','/felix/hashutils/*.go','/felix/idalloc/*.go','/felix/ifacemonitor/*.go','/felix/ip/*.go','/felix/ipsets/*.go','/felix/iptables/*.go','/felix/iptables/cmdshim/*.go','/felix/jitter/*.go','/felix/k8sutils/*.go','/felix/labelindex/*.go','/felix/labelindex/ipsetmember/*.go','/felix/labelindex/labelnamevalueindex/*.go','/felix/labelindex/labelrestrictionindex/*.go','/felix/linkaddrs/*.go','/felix/logutils/*.go','/felix/markbits/*.go','/felix/multidict/*.go','/felix/netlinkshim/*.go','/felix/netlinkshim/handlemgr/*.go','/felix/nfnetlink/*.go','/felix/nfnetlink/nfnl/*.go','/felix/nfnetlink/pkt/*.go','/felix/nftables/*.go','/felix/policysync/*.go','/felix/proto/*.go','/felix/proto/protoconv/*.go','/felix/routerule/*.go','/felix/routetable/*.go','/felix/routetable/ownershippol/*.go','/felix/rules/*.go','/felix/serviceindex/*.go','/felix/statusrep/*.go','/felix/stringutils/*.go','/felix/throttle/*.go','/felix/timeshim/*.go','/felix/types/*.go','/felix/usagerep/*.go','/felix/vxlanfdb/*.go','/felix/wireguard/*.go','/goldmane/cmd/*.go','/goldmane/cmd/flowgen/*.go','/goldmane/cmd/health/*.go','/goldmane/cmd/stream/*.go','/goldmane/pkg/client/*.go','/goldmane/pkg/daemon/*.go','/goldmane/pkg/emitter/*.go','/goldmane/pkg/flowgen/*.go','/goldmane/pkg/goldmane/*.go','/goldmane/pkg/internal/flowcache/*.go','/goldmane/pkg/internal/utils/*.go','/goldmane/pkg/server/*.go','/goldmane/pkg/storage/*.go','/goldmane/pkg/stream/*.go','/goldmane/pkg/types/*.go','/goldmane/proto/*.go','/hack/test/certs/','/kube-controllers/cmd/check-status/*.go','/kube-controllers/cmd/kube-controllers/*.go','/kube-controllers/cmd/wrapper/*.go','/kube-controllers/pkg/cache/*.go','/kube-controllers/pkg/config/*.go','/kube-controllers/pkg/controllers/controller/*.go','/kube-controllers/pkg/controllers/flannelmigration/*.go','/kube-controllers/pkg/controllers/loadbalancer/*.go','/kube-controllers/pkg/controllers/namespace/*.go','/kube-controllers/pkg/controllers/networkpolicy/*.go','/kube-controllers/pkg/controllers/node/*.go','/kube-controllers/pkg/controllers/pod/*.go','/kube-controllers/pkg/controllers/serviceaccount/*.go','/kube-controllers/pkg/controllers/utils/*.go','/kube-controllers/pkg/converter/*.go','/kube-controllers/pkg/status/*.go','/lib.Makefile','/lib/httpmachinery/pkg/apiutil/*.go','/lib/httpmachinery/pkg/codec/*.go','/lib/httpmachinery/pkg/context/*.go','/lib/httpmachinery/pkg/header/*.go','/lib/httpmachinery/pkg/server/*.go','/lib/httpmachinery/pkg/server/adaptors/gorilla/*.go','/lib/std/chanutil/*.go','/lib/std/time/*.go','/lib/std/uniquelabels/*.go','/lib/std/uniquestr/*.go','/libcalico-go/config/*.go','/libcalico-go/lib/apiconfig/*.go','/libcalico-go/lib/apis/v1/*.go','/libcalico-go/lib/apis/v1/unversioned/*.go','/libcalico-go/lib/apis/v3/*.go','/libcalico-go/lib/backend/*.go','/libcalico-go/lib/backend/api/*.go','/libcalico-go/lib/backend/encap/*.go','/libcalico-go/lib/backend/etcdv3/*.go','/libcalico-go/lib/backend/k8s/*.go','/libcalico-go/lib/backend/k8s/conversion/*.go','/libcalico-go/lib/backend/k8s/resources/*.go','/libcalico-go/lib/backend/k8s/scheme/*.go','/libcalico-go/lib/backend/model/*.go','/libcalico-go/lib/backend/syncersv1/bgpsyncer/*.go','/libcalico-go/lib/backend/syncersv1/dedupebuffer/*.go','/libcalico-go/lib/backend/syncersv1/felixsyncer/*.go','/libcalico-go/lib/backend/syncersv1/nodestatussyncer/*.go','/libcalico-go/lib/backend/syncersv1/tunnelipsyncer/*.go','/libcalico-go/lib/backend/syncersv1/updateprocessors/*.go','/libcalico-go/lib/backend/watchersyncer/*.go','/libcalico-go/lib/clientv3/*.go','/libcalico-go/lib/consistenthash/*.go','/libcalico-go/lib/debugserver/*.go','/libcalico-go/lib/dispatcher/*.go','/libcalico-go/lib/epstatusfile/*.go','/libcalico-go/lib/errors/*.go','/libcalico-go/lib/hash/*.go','/libcalico-go/lib/health/*.go','/libcalico-go/lib/ipam/*.go','/libcalico-go/lib/json/*.go','/libcalico-go/lib/logutils/*.go','/libcalico-go/lib/metricsserver/*.go','/libcalico-go/lib/multireadbuf/*.go','/libcalico-go/lib/names/*.go','/libcalico-go/lib/namespace/*.go','/libcalico-go/lib/net/*.go','/libcalico-go/lib/netlinkutils/*.go','/libcalico-go/lib/options/*.go','/libcalico-go/lib/packedmap/*.go','/libcalico-go/lib/prometheus/*.go','/libcalico-go/lib/readlogger/*.go','/libcalico-go/lib/resources/*.go','/libcalico-go/lib/scope/*.go','/libcalico-go/lib/selector/*.go','/libcalico-go/lib/selector/parser/*.go','/libcalico-go/lib/selector/tokenizer/*.go','/libcalico-go/lib/set/*.go','/libcalico-go/lib/validator/v1/*.go','/libcalico-go/lib/validator/v3/*.go','/libcalico-go/lib/watch/*.go','/libcalico-go/lib/winutils/*.go','/libcalico-go/lib/writelogger/*.go','/metadata.mk','/node/cmd/calico-ipam/*.go','/node/cmd/calico-node/*.go','/node/cmd/calico-node/bpf/*.go','/node/cmd/calico/*.go','/node/cmd/mountns/*.go','/node/pkg/allocateip/*.go','/node/pkg/calicoclient/*.go','/node/pkg/cni/*.go','/node/pkg/flowlogs/*.go','/node/pkg/health/*.go','/node/pkg/health/bird/*.go','/node/pkg/hostpathinit/*.go','/node/pkg/lifecycle/shutdown/*.go','/node/pkg/lifecycle/startup/*.go','/node/pkg/lifecycle/startup/autodetection/*.go','/node/pkg/lifecycle/startup/autodetection/ipv4/*.go','/node/pkg/lifecycle/utils/*.go','/node/pkg/nodeinit/*.go','/node/pkg/status/*.go','/node/pkg/status/populators/*.go','/node/windows-packaging/tests/*.go','/pkg/buildinfo/*.go','/pkg/cmdwrapper/*.go','/pod2daemon/binder/*.go','/pod2daemon/csidriver/*.go','/pod2daemon/csidriver/driver/*.go','/pod2daemon/flexvol/*.go','/pod2daemon/flexvol/creds/*.go','/pod2daemon/nodeagent/*.go','/pod2daemon/proto/*.go','/pod2daemon/workloadapi/*.go','/typha/cmd/calico-typha/*.go','/typha/cmd/typha-client/*.go','/typha/pkg/calc/*.go','/typha/pkg/config/*.go','/typha/pkg/daemon/*.go','/typha/pkg/discovery/*.go','/typha/pkg/jitter/*.go','/typha/pkg/k8s/*.go','/typha/pkg/logutils/*.go','/typha/pkg/promutils/*.go','/typha/pkg/snapcache/*.go','/typha/pkg/syncclient/*.go','/typha/pkg/syncclientutils/*.go','/typha/pkg/syncproto/*.go','/typha/pkg/syncserver/*.go','/typha/pkg/tlsutils/*.go','/whisker','/whisker-backend/cmd/*.go','/whisker-backend/cmd/app/*.go','/whisker-backend/pkg/apis/v1/*.go','/whisker-backend/pkg/config/*.go','/whisker-backend/pkg/handlers/v1/*.go','apiserver/**/*Dockerfile*','apiserver/Makefile','apiserver/deps.txt','calicoctl/**/*Dockerfile*','calicoctl/Makefile','calicoctl/deps.txt','cni-plugin/**/*Dockerfile*','cni-plugin/Makefile','cni-plugin/deps.txt','goldmane/**/*Dockerfile*','goldmane/Makefile','goldmane/deps.txt','kube-controllers/**/*Dockerfile*','kube-controllers/Makefile','kube-controllers/deps.txt','node/**/*Dockerfile*','node/Makefile','node/deps.txt','pod2daemon/**/*Dockerfile*','pod2daemon/Makefile','pod2daemon/deps.txt','typha/**/*Dockerfile*','typha/Makefile','typha/deps.txt','whisker-backend/**/*Dockerfile*','whisker-backend/Makefile','whisker-backend/deps.txt','whisker/**/*Dockerfile*','whisker/Makefile','whisker/deps.txt'], {pipeline_file: 'ignore', exclude: ['/**/*.md','/**/.gitignore','/**/AUTHORS*','/**/CONTRIBUTING*','/**/DEVELOPER_GUIDE*','/**/LICENSE*','/**/README*','/**/SECURITY.md','/api/**/*_test.go','/apiserver/**/*_test.go','/app-policy/**/*_test.go','/calicoctl/**/*_test.go','/cni-plugin/**/*_test.go','/confd/**/*_test.go','/crypto/**/*_test.go','/felix/**/*_test.go','/goldmane/**/*_test.go','/kube-controllers/**/*_test.go','/lib/**/*_test.go','/libcalico-go/**/*_test.go','/node/**/*_test.go','/pkg/**/*_test.go','/pod2daemon/**/*_test.go','/typha/**/*_test.go','/whisker-backend/**/*_test.go']})"
+      when: "change_in(['/.semaphore/semaphore.yml.d/01-preamble.yml','/.semaphore/semaphore.yml.d/02-global_job_config.yml','/.semaphore/semaphore.yml.d/03-promotions.yml','/.semaphore/semaphore.yml.d/09-blocks.yml','/.semaphore/semaphore.yml.d/99-after_pipeline.yml','/.semaphore/semaphore.yml.d/blocks/20-e2e.yml','/api/pkg/apis/projectcalico/v3/*.go','/api/pkg/lib/numorstring/*.go','/api/pkg/openapi/*.go','/apiserver/cmd/apiserver/*.go','/apiserver/cmd/apiserver/server/*.go','/apiserver/pkg/apiserver/*.go','/apiserver/pkg/printers/projectcalico/*.go','/apiserver/pkg/rbac/*.go','/apiserver/pkg/registry/projectcalico/authorizer/*.go','/apiserver/pkg/registry/projectcalico/bgpconfiguration/*.go','/apiserver/pkg/registry/projectcalico/bgpfilter/*.go','/apiserver/pkg/registry/projectcalico/bgppeer/*.go','/apiserver/pkg/registry/projectcalico/blockaffinity/*.go','/apiserver/pkg/registry/projectcalico/caliconodestatus/*.go','/apiserver/pkg/registry/projectcalico/clusterinformation/*.go','/apiserver/pkg/registry/projectcalico/felixconfig/*.go','/apiserver/pkg/registry/projectcalico/globalnetworkset/*.go','/apiserver/pkg/registry/projectcalico/globalpolicy/*.go','/apiserver/pkg/registry/projectcalico/hostendpoint/*.go','/apiserver/pkg/registry/projectcalico/ipamconfig/*.go','/apiserver/pkg/registry/projectcalico/ippool/*.go','/apiserver/pkg/registry/projectcalico/ipreservation/*.go','/apiserver/pkg/registry/projectcalico/kubecontrollersconfig/*.go','/apiserver/pkg/registry/projectcalico/networkpolicy/*.go','/apiserver/pkg/registry/projectcalico/networkset/*.go','/apiserver/pkg/registry/projectcalico/profile/*.go','/apiserver/pkg/registry/projectcalico/rest/*.go','/apiserver/pkg/registry/projectcalico/server/*.go','/apiserver/pkg/registry/projectcalico/stagedglobalnetworkpolicy/*.go','/apiserver/pkg/registry/projectcalico/stagedkubernetesnetworkpolicy/*.go','/apiserver/pkg/registry/projectcalico/stagednetworkpolicy/*.go','/apiserver/pkg/registry/projectcalico/tier/*.go','/apiserver/pkg/registry/projectcalico/util/*.go','/apiserver/pkg/storage/calico/*.go','/apiserver/pkg/storage/etcd/*.go','/app-policy/checker/*.go','/app-policy/policystore/*.go','/app-policy/types/*.go','/calicoctl/calicoctl/*.go','/calicoctl/calicoctl/commands/*.go','/calicoctl/calicoctl/commands/argutils/*.go','/calicoctl/calicoctl/commands/clientmgr/*.go','/calicoctl/calicoctl/commands/cluster/*.go','/calicoctl/calicoctl/commands/common/*.go','/calicoctl/calicoctl/commands/constants/*.go','/calicoctl/calicoctl/commands/datastore/*.go','/calicoctl/calicoctl/commands/datastore/migrate/*.go','/calicoctl/calicoctl/commands/file/*.go','/calicoctl/calicoctl/commands/ipam/*.go','/calicoctl/calicoctl/commands/node/*.go','/calicoctl/calicoctl/resourcemgr/*.go','/calicoctl/calicoctl/util/*.go','/calicoctl/calicoctl/util/yaml/*.go','/calicoctl/tests/fv/helper/*.go','/cni-plugin/cmd/calico/*.go','/cni-plugin/cmd/install/*.go','/cni-plugin/internal/pkg/azure/*.go','/cni-plugin/internal/pkg/utils/*.go','/cni-plugin/internal/pkg/utils/cri/*.go','/cni-plugin/pkg/dataplane/*.go','/cni-plugin/pkg/dataplane/grpc/*.go','/cni-plugin/pkg/dataplane/grpc/proto/*.go','/cni-plugin/pkg/dataplane/linux/*.go','/cni-plugin/pkg/install/*.go','/cni-plugin/pkg/ipamplugin/*.go','/cni-plugin/pkg/k8s/*.go','/cni-plugin/pkg/plugin/*.go','/cni-plugin/pkg/types/*.go','/cni-plugin/pkg/upgrade/*.go','/cni-plugin/pkg/wait/*.go','/cni-plugin/tests/*.go','/confd/etc','/confd/pkg/backends/*.go','/confd/pkg/backends/calico/*.go','/confd/pkg/backends/types/*.go','/confd/pkg/config/*.go','/confd/pkg/log/*.go','/confd/pkg/resource/template/*.go','/confd/pkg/run/*.go','/crypto/pkg/tls/*.go','/e2e/**','/felix/aws/*.go','/felix/bpf-apache','/felix/bpf-gpl','/felix/bpf/*.go','/felix/bpf/arp/*.go','/felix/bpf/asm/*.go','/felix/bpf/bpfdefs/*.go','/felix/bpf/bpfmap/*.go','/felix/bpf/conntrack/*.go','/felix/bpf/conntrack/cleanupv1/*.go','/felix/bpf/conntrack/timeouts/*.go','/felix/bpf/conntrack/v2/*.go','/felix/bpf/conntrack/v3/*.go','/felix/bpf/conntrack/v4/*.go','/felix/bpf/consistenthash/*.go','/felix/bpf/counters/*.go','/felix/bpf/events/*.go','/felix/bpf/failsafes/*.go','/felix/bpf/filter/*.go','/felix/bpf/hook/*.go','/felix/bpf/ifstate/*.go','/felix/bpf/ipfrags/*.go','/felix/bpf/ipsets/*.go','/felix/bpf/jump/*.go','/felix/bpf/legacy/*.go','/felix/bpf/libbpf/*.go','/felix/bpf/maps/*.go','/felix/bpf/nat/*.go','/felix/bpf/perf/*.go','/felix/bpf/polprog/*.go','/felix/bpf/profiling/*.go','/felix/bpf/proxy/*.go','/felix/bpf/qos/*.go','/felix/bpf/routes/*.go','/felix/bpf/state/*.go','/felix/bpf/tc/*.go','/felix/bpf/tc/defs/*.go','/felix/bpf/utils/*.go','/felix/bpf/xdp/*.go','/felix/cachingmap/*.go','/felix/calc/*.go','/felix/cmd/calico-bpf/commands/*.go','/felix/collector/*.go','/felix/collector/flowlog/*.go','/felix/collector/goldmane/*.go','/felix/collector/local/*.go','/felix/collector/types/*.go','/felix/collector/types/counter/*.go','/felix/collector/types/endpoint/*.go','/felix/collector/types/metric/*.go','/felix/collector/types/tuple/*.go','/felix/collector/utils/*.go','/felix/config/*.go','/felix/conntrack/*.go','/felix/daemon/*.go','/felix/dataplane/*.go','/felix/dataplane/common/*.go','/felix/dataplane/external/*.go','/felix/dataplane/inactive/*.go','/felix/dataplane/ipsets/*.go','/felix/dataplane/linux/*.go','/felix/dataplane/linux/dataplanedefs/*.go','/felix/dataplane/linux/qos/*.go','/felix/deltatracker/*.go','/felix/dispatcher/*.go','/felix/environment/*.go','/felix/ethtool/*.go','/felix/generictables/*.go','/felix/hashutils/*.go','/felix/idalloc/*.go','/felix/ifacemonitor/*.go','/felix/ip/*.go','/felix/ipsets/*.go','/felix/iptables/*.go','/felix/iptables/cmdshim/*.go','/felix/jitter/*.go','/felix/k8sutils/*.go','/felix/labelindex/*.go','/felix/labelindex/ipsetmember/*.go','/felix/labelindex/labelnamevalueindex/*.go','/felix/labelindex/labelrestrictionindex/*.go','/felix/linkaddrs/*.go','/felix/logutils/*.go','/felix/markbits/*.go','/felix/multidict/*.go','/felix/netlinkshim/*.go','/felix/netlinkshim/handlemgr/*.go','/felix/nfnetlink/*.go','/felix/nfnetlink/nfnl/*.go','/felix/nfnetlink/pkt/*.go','/felix/nftables/*.go','/felix/policysync/*.go','/felix/proto/*.go','/felix/proto/protoconv/*.go','/felix/routerule/*.go','/felix/routetable/*.go','/felix/routetable/ownershippol/*.go','/felix/rules/*.go','/felix/serviceindex/*.go','/felix/statusrep/*.go','/felix/stringutils/*.go','/felix/throttle/*.go','/felix/timeshim/*.go','/felix/types/*.go','/felix/usagerep/*.go','/felix/vxlanfdb/*.go','/felix/wireguard/*.go','/goldmane/cmd/*.go','/goldmane/cmd/flowgen/*.go','/goldmane/cmd/health/*.go','/goldmane/cmd/stream/*.go','/goldmane/pkg/client/*.go','/goldmane/pkg/daemon/*.go','/goldmane/pkg/emitter/*.go','/goldmane/pkg/flowgen/*.go','/goldmane/pkg/goldmane/*.go','/goldmane/pkg/internal/flowcache/*.go','/goldmane/pkg/internal/utils/*.go','/goldmane/pkg/server/*.go','/goldmane/pkg/storage/*.go','/goldmane/pkg/stream/*.go','/goldmane/pkg/types/*.go','/goldmane/proto/*.go','/hack/test/certs/','/kube-controllers/cmd/check-status/*.go','/kube-controllers/cmd/kube-controllers/*.go','/kube-controllers/cmd/wrapper/*.go','/kube-controllers/pkg/cache/*.go','/kube-controllers/pkg/config/*.go','/kube-controllers/pkg/controllers/controller/*.go','/kube-controllers/pkg/controllers/flannelmigration/*.go','/kube-controllers/pkg/controllers/loadbalancer/*.go','/kube-controllers/pkg/controllers/namespace/*.go','/kube-controllers/pkg/controllers/networkpolicy/*.go','/kube-controllers/pkg/controllers/node/*.go','/kube-controllers/pkg/controllers/pod/*.go','/kube-controllers/pkg/controllers/serviceaccount/*.go','/kube-controllers/pkg/controllers/utils/*.go','/kube-controllers/pkg/converter/*.go','/kube-controllers/pkg/status/*.go','/lib.Makefile','/lib/httpmachinery/pkg/apiutil/*.go','/lib/httpmachinery/pkg/codec/*.go','/lib/httpmachinery/pkg/context/*.go','/lib/httpmachinery/pkg/header/*.go','/lib/httpmachinery/pkg/server/*.go','/lib/httpmachinery/pkg/server/adaptors/gorilla/*.go','/lib/std/chanutil/*.go','/lib/std/time/*.go','/lib/std/uniquelabels/*.go','/lib/std/uniquestr/*.go','/libcalico-go/config/*.go','/libcalico-go/lib/apiconfig/*.go','/libcalico-go/lib/apis/v1/*.go','/libcalico-go/lib/apis/v1/unversioned/*.go','/libcalico-go/lib/apis/v3/*.go','/libcalico-go/lib/backend/*.go','/libcalico-go/lib/backend/api/*.go','/libcalico-go/lib/backend/encap/*.go','/libcalico-go/lib/backend/etcdv3/*.go','/libcalico-go/lib/backend/k8s/*.go','/libcalico-go/lib/backend/k8s/conversion/*.go','/libcalico-go/lib/backend/k8s/resources/*.go','/libcalico-go/lib/backend/k8s/scheme/*.go','/libcalico-go/lib/backend/model/*.go','/libcalico-go/lib/backend/syncersv1/bgpsyncer/*.go','/libcalico-go/lib/backend/syncersv1/dedupebuffer/*.go','/libcalico-go/lib/backend/syncersv1/felixsyncer/*.go','/libcalico-go/lib/backend/syncersv1/nodestatussyncer/*.go','/libcalico-go/lib/backend/syncersv1/tunnelipsyncer/*.go','/libcalico-go/lib/backend/syncersv1/updateprocessors/*.go','/libcalico-go/lib/backend/watchersyncer/*.go','/libcalico-go/lib/clientv3/*.go','/libcalico-go/lib/consistenthash/*.go','/libcalico-go/lib/debugserver/*.go','/libcalico-go/lib/dispatcher/*.go','/libcalico-go/lib/epstatusfile/*.go','/libcalico-go/lib/errors/*.go','/libcalico-go/lib/hash/*.go','/libcalico-go/lib/health/*.go','/libcalico-go/lib/ipam/*.go','/libcalico-go/lib/json/*.go','/libcalico-go/lib/logutils/*.go','/libcalico-go/lib/metricsserver/*.go','/libcalico-go/lib/multireadbuf/*.go','/libcalico-go/lib/names/*.go','/libcalico-go/lib/namespace/*.go','/libcalico-go/lib/net/*.go','/libcalico-go/lib/netlinkutils/*.go','/libcalico-go/lib/options/*.go','/libcalico-go/lib/packedmap/*.go','/libcalico-go/lib/prometheus/*.go','/libcalico-go/lib/readlogger/*.go','/libcalico-go/lib/resources/*.go','/libcalico-go/lib/scope/*.go','/libcalico-go/lib/selector/*.go','/libcalico-go/lib/selector/parser/*.go','/libcalico-go/lib/selector/tokenizer/*.go','/libcalico-go/lib/set/*.go','/libcalico-go/lib/validator/v1/*.go','/libcalico-go/lib/validator/v3/*.go','/libcalico-go/lib/watch/*.go','/libcalico-go/lib/winutils/*.go','/libcalico-go/lib/writelogger/*.go','/metadata.mk','/node/cmd/calico-ipam/*.go','/node/cmd/calico-node/*.go','/node/cmd/calico-node/bpf/*.go','/node/cmd/calico/*.go','/node/cmd/mountns/*.go','/node/pkg/allocateip/*.go','/node/pkg/calicoclient/*.go','/node/pkg/cni/*.go','/node/pkg/flowlogs/*.go','/node/pkg/health/*.go','/node/pkg/health/bird/*.go','/node/pkg/hostpathinit/*.go','/node/pkg/lifecycle/shutdown/*.go','/node/pkg/lifecycle/startup/*.go','/node/pkg/lifecycle/startup/autodetection/*.go','/node/pkg/lifecycle/startup/autodetection/ipv4/*.go','/node/pkg/lifecycle/utils/*.go','/node/pkg/nodeinit/*.go','/node/pkg/status/*.go','/node/pkg/status/populators/*.go','/node/windows-packaging/tests/*.go','/pkg/buildinfo/*.go','/pkg/cmdwrapper/*.go','/pod2daemon/binder/*.go','/pod2daemon/csidriver/*.go','/pod2daemon/csidriver/driver/*.go','/pod2daemon/flexvol/*.go','/pod2daemon/flexvol/creds/*.go','/pod2daemon/nodeagent/*.go','/pod2daemon/proto/*.go','/pod2daemon/workloadapi/*.go','/typha/cmd/calico-typha/*.go','/typha/cmd/typha-client/*.go','/typha/pkg/calc/*.go','/typha/pkg/config/*.go','/typha/pkg/daemon/*.go','/typha/pkg/discovery/*.go','/typha/pkg/jitter/*.go','/typha/pkg/k8s/*.go','/typha/pkg/logutils/*.go','/typha/pkg/promutils/*.go','/typha/pkg/snapcache/*.go','/typha/pkg/syncclient/*.go','/typha/pkg/syncclientutils/*.go','/typha/pkg/syncproto/*.go','/typha/pkg/syncserver/*.go','/typha/pkg/tlsutils/*.go','/whisker','/whisker-backend/cmd/*.go','/whisker-backend/cmd/app/*.go','/whisker-backend/pkg/apis/v1/*.go','/whisker-backend/pkg/config/*.go','/whisker-backend/pkg/handlers/v1/*.go','apiserver/**/*Dockerfile*','apiserver/Makefile','apiserver/deps.txt','calicoctl/**/*Dockerfile*','calicoctl/Makefile','calicoctl/deps.txt','cni-plugin/**/*Dockerfile*','cni-plugin/Makefile','cni-plugin/deps.txt','goldmane/**/*Dockerfile*','goldmane/Makefile','goldmane/deps.txt','kube-controllers/**/*Dockerfile*','kube-controllers/Makefile','kube-controllers/deps.txt','node/**/*Dockerfile*','node/Makefile','node/deps.txt','pod2daemon/**/*Dockerfile*','pod2daemon/Makefile','pod2daemon/deps.txt','typha/**/*Dockerfile*','typha/Makefile','typha/deps.txt','whisker-backend/**/*Dockerfile*','whisker-backend/Makefile','whisker-backend/deps.txt','whisker/**/*Dockerfile*','whisker/Makefile','whisker/deps.txt'], {pipeline_file: 'ignore', exclude: ['/**/*.md','/**/.gitignore','/**/AUTHORS*','/**/CONTRIBUTING*','/**/DEVELOPER_GUIDE*','/**/LICENSE*','/**/README*','/**/SECURITY.md','/api/**/*_test.go','/apiserver/**/*_test.go','/app-policy/**/*_test.go','/calicoctl/**/*_test.go','/cni-plugin/**/*_test.go','/confd/**/*_test.go','/crypto/**/*_test.go','/felix/**/*_test.go','/goldmane/**/*_test.go','/kube-controllers/**/*_test.go','/lib/**/*_test.go','/libcalico-go/**/*_test.go','/node/**/*_test.go','/pkg/**/*_test.go','/pod2daemon/**/*_test.go','/typha/**/*_test.go','/whisker-backend/**/*_test.go']})"
     dependencies:
       - Prerequisites
     task:
@@ -1079,7 +1079,7 @@ blocks:
               value: "true"
   - name: "Node: Build"
     run:
-      when: "change_in(['/.semaphore/semaphore.yml.d/01-preamble.yml','/.semaphore/semaphore.yml.d/02-global_job_config.yml','/.semaphore/semaphore.yml.d/03-promotions.yml','/.semaphore/semaphore.yml.d/09-blocks.yml','/.semaphore/semaphore.yml.d/99-after_pipeline.yml','/.semaphore/semaphore.yml.d/blocks/20-node.yml','/api/pkg/apis/projectcalico/v3/*.go','/api/pkg/lib/numorstring/*.go','/app-policy/checker/*.go','/app-policy/policystore/*.go','/app-policy/types/*.go','/cni-plugin/internal/pkg/azure/*.go','/cni-plugin/internal/pkg/utils/*.go','/cni-plugin/internal/pkg/utils/cri/*.go','/cni-plugin/pkg/dataplane/*.go','/cni-plugin/pkg/dataplane/grpc/*.go','/cni-plugin/pkg/dataplane/grpc/proto/*.go','/cni-plugin/pkg/dataplane/linux/*.go','/cni-plugin/pkg/ipamplugin/*.go','/cni-plugin/pkg/k8s/*.go','/cni-plugin/pkg/plugin/*.go','/cni-plugin/pkg/types/*.go','/cni-plugin/pkg/upgrade/*.go','/cni-plugin/pkg/wait/*.go','/confd/etc','/confd/pkg/backends/*.go','/confd/pkg/backends/calico/*.go','/confd/pkg/backends/types/*.go','/confd/pkg/config/*.go','/confd/pkg/log/*.go','/confd/pkg/resource/template/*.go','/confd/pkg/run/*.go','/crypto/pkg/tls/*.go','/felix/aws/*.go','/felix/bpf-apache','/felix/bpf-gpl','/felix/bpf/*.go','/felix/bpf/arp/*.go','/felix/bpf/asm/*.go','/felix/bpf/bpfdefs/*.go','/felix/bpf/bpfmap/*.go','/felix/bpf/conntrack/*.go','/felix/bpf/conntrack/cleanupv1/*.go','/felix/bpf/conntrack/timeouts/*.go','/felix/bpf/conntrack/v2/*.go','/felix/bpf/conntrack/v3/*.go','/felix/bpf/conntrack/v4/*.go','/felix/bpf/consistenthash/*.go','/felix/bpf/counters/*.go','/felix/bpf/events/*.go','/felix/bpf/failsafes/*.go','/felix/bpf/filter/*.go','/felix/bpf/hook/*.go','/felix/bpf/ifstate/*.go','/felix/bpf/ipsets/*.go','/felix/bpf/jump/*.go','/felix/bpf/legacy/*.go','/felix/bpf/libbpf/*.go','/felix/bpf/maps/*.go','/felix/bpf/nat/*.go','/felix/bpf/perf/*.go','/felix/bpf/polprog/*.go','/felix/bpf/profiling/*.go','/felix/bpf/proxy/*.go','/felix/bpf/qos/*.go','/felix/bpf/routes/*.go','/felix/bpf/state/*.go','/felix/bpf/tc/*.go','/felix/bpf/tc/defs/*.go','/felix/bpf/utils/*.go','/felix/bpf/xdp/*.go','/felix/cachingmap/*.go','/felix/calc/*.go','/felix/cmd/calico-bpf/commands/*.go','/felix/collector/*.go','/felix/collector/flowlog/*.go','/felix/collector/goldmane/*.go','/felix/collector/local/*.go','/felix/collector/types/*.go','/felix/collector/types/counter/*.go','/felix/collector/types/endpoint/*.go','/felix/collector/types/metric/*.go','/felix/collector/types/tuple/*.go','/felix/collector/utils/*.go','/felix/config/*.go','/felix/conntrack/*.go','/felix/daemon/*.go','/felix/dataplane/*.go','/felix/dataplane/common/*.go','/felix/dataplane/external/*.go','/felix/dataplane/inactive/*.go','/felix/dataplane/ipsets/*.go','/felix/dataplane/linux/*.go','/felix/dataplane/linux/dataplanedefs/*.go','/felix/dataplane/linux/qos/*.go','/felix/deltatracker/*.go','/felix/dispatcher/*.go','/felix/environment/*.go','/felix/ethtool/*.go','/felix/generictables/*.go','/felix/hashutils/*.go','/felix/idalloc/*.go','/felix/ifacemonitor/*.go','/felix/ip/*.go','/felix/ipsets/*.go','/felix/iptables/*.go','/felix/iptables/cmdshim/*.go','/felix/jitter/*.go','/felix/k8sutils/*.go','/felix/labelindex/*.go','/felix/labelindex/ipsetmember/*.go','/felix/labelindex/labelnamevalueindex/*.go','/felix/labelindex/labelrestrictionindex/*.go','/felix/linkaddrs/*.go','/felix/logutils/*.go','/felix/markbits/*.go','/felix/multidict/*.go','/felix/netlinkshim/*.go','/felix/netlinkshim/handlemgr/*.go','/felix/nfnetlink/*.go','/felix/nfnetlink/nfnl/*.go','/felix/nfnetlink/pkt/*.go','/felix/nftables/*.go','/felix/policysync/*.go','/felix/proto/*.go','/felix/proto/protoconv/*.go','/felix/routerule/*.go','/felix/routetable/*.go','/felix/routetable/ownershippol/*.go','/felix/rules/*.go','/felix/serviceindex/*.go','/felix/statusrep/*.go','/felix/stringutils/*.go','/felix/throttle/*.go','/felix/timeshim/*.go','/felix/types/*.go','/felix/usagerep/*.go','/felix/vxlanfdb/*.go','/felix/wireguard/*.go','/goldmane/pkg/client/*.go','/goldmane/pkg/goldmane/*.go','/goldmane/pkg/internal/flowcache/*.go','/goldmane/pkg/server/*.go','/goldmane/pkg/storage/*.go','/goldmane/pkg/stream/*.go','/goldmane/pkg/types/*.go','/goldmane/proto/*.go','/hack/test/certs/','/lib.Makefile','/lib/std/chanutil/*.go','/lib/std/time/*.go','/lib/std/uniquelabels/*.go','/lib/std/uniquestr/*.go','/libcalico-go/config/*.go','/libcalico-go/lib/apiconfig/*.go','/libcalico-go/lib/apis/v1/*.go','/libcalico-go/lib/apis/v1/unversioned/*.go','/libcalico-go/lib/apis/v3/*.go','/libcalico-go/lib/backend/*.go','/libcalico-go/lib/backend/api/*.go','/libcalico-go/lib/backend/encap/*.go','/libcalico-go/lib/backend/etcdv3/*.go','/libcalico-go/lib/backend/k8s/*.go','/libcalico-go/lib/backend/k8s/conversion/*.go','/libcalico-go/lib/backend/k8s/resources/*.go','/libcalico-go/lib/backend/k8s/scheme/*.go','/libcalico-go/lib/backend/model/*.go','/libcalico-go/lib/backend/syncersv1/bgpsyncer/*.go','/libcalico-go/lib/backend/syncersv1/dedupebuffer/*.go','/libcalico-go/lib/backend/syncersv1/felixsyncer/*.go','/libcalico-go/lib/backend/syncersv1/nodestatussyncer/*.go','/libcalico-go/lib/backend/syncersv1/tunnelipsyncer/*.go','/libcalico-go/lib/backend/syncersv1/updateprocessors/*.go','/libcalico-go/lib/backend/watchersyncer/*.go','/libcalico-go/lib/clientv3/*.go','/libcalico-go/lib/consistenthash/*.go','/libcalico-go/lib/debugserver/*.go','/libcalico-go/lib/dispatcher/*.go','/libcalico-go/lib/epstatusfile/*.go','/libcalico-go/lib/errors/*.go','/libcalico-go/lib/hash/*.go','/libcalico-go/lib/health/*.go','/libcalico-go/lib/ipam/*.go','/libcalico-go/lib/json/*.go','/libcalico-go/lib/logutils/*.go','/libcalico-go/lib/metricsserver/*.go','/libcalico-go/lib/names/*.go','/libcalico-go/lib/namespace/*.go','/libcalico-go/lib/net/*.go','/libcalico-go/lib/netlinkutils/*.go','/libcalico-go/lib/options/*.go','/libcalico-go/lib/packedmap/*.go','/libcalico-go/lib/prometheus/*.go','/libcalico-go/lib/readlogger/*.go','/libcalico-go/lib/resources/*.go','/libcalico-go/lib/scope/*.go','/libcalico-go/lib/selector/*.go','/libcalico-go/lib/selector/parser/*.go','/libcalico-go/lib/selector/tokenizer/*.go','/libcalico-go/lib/set/*.go','/libcalico-go/lib/validator/v1/*.go','/libcalico-go/lib/validator/v3/*.go','/libcalico-go/lib/watch/*.go','/libcalico-go/lib/winutils/*.go','/metadata.mk','/node/**','/pkg/buildinfo/*.go','/pod2daemon/binder/*.go','/typha/pkg/discovery/*.go','/typha/pkg/syncclient/*.go','/typha/pkg/syncclientutils/*.go','/typha/pkg/syncproto/*.go','/typha/pkg/tlsutils/*.go'], {pipeline_file: 'ignore', exclude: ['/**/*.md','/**/.gitignore','/**/AUTHORS*','/**/CONTRIBUTING*','/**/DEVELOPER_GUIDE*','/**/LICENSE*','/**/README*','/**/SECURITY.md','/api/**/*_test.go','/app-policy/**/*_test.go','/cni-plugin/**/*_test.go','/confd/**/*_test.go','/crypto/**/*_test.go','/felix/**/*_test.go','/goldmane/**/*_test.go','/lib/**/*_test.go','/libcalico-go/**/*_test.go','/pkg/**/*_test.go','/pod2daemon/**/*_test.go','/typha/**/*_test.go']})"
+      when: "change_in(['/.semaphore/semaphore.yml.d/01-preamble.yml','/.semaphore/semaphore.yml.d/02-global_job_config.yml','/.semaphore/semaphore.yml.d/03-promotions.yml','/.semaphore/semaphore.yml.d/09-blocks.yml','/.semaphore/semaphore.yml.d/99-after_pipeline.yml','/.semaphore/semaphore.yml.d/blocks/20-node.yml','/api/pkg/apis/projectcalico/v3/*.go','/api/pkg/lib/numorstring/*.go','/app-policy/checker/*.go','/app-policy/policystore/*.go','/app-policy/types/*.go','/cni-plugin/internal/pkg/azure/*.go','/cni-plugin/internal/pkg/utils/*.go','/cni-plugin/internal/pkg/utils/cri/*.go','/cni-plugin/pkg/dataplane/*.go','/cni-plugin/pkg/dataplane/grpc/*.go','/cni-plugin/pkg/dataplane/grpc/proto/*.go','/cni-plugin/pkg/dataplane/linux/*.go','/cni-plugin/pkg/ipamplugin/*.go','/cni-plugin/pkg/k8s/*.go','/cni-plugin/pkg/plugin/*.go','/cni-plugin/pkg/types/*.go','/cni-plugin/pkg/upgrade/*.go','/cni-plugin/pkg/wait/*.go','/confd/etc','/confd/pkg/backends/*.go','/confd/pkg/backends/calico/*.go','/confd/pkg/backends/types/*.go','/confd/pkg/config/*.go','/confd/pkg/log/*.go','/confd/pkg/resource/template/*.go','/confd/pkg/run/*.go','/crypto/pkg/tls/*.go','/felix/aws/*.go','/felix/bpf-apache','/felix/bpf-gpl','/felix/bpf/*.go','/felix/bpf/arp/*.go','/felix/bpf/asm/*.go','/felix/bpf/bpfdefs/*.go','/felix/bpf/bpfmap/*.go','/felix/bpf/conntrack/*.go','/felix/bpf/conntrack/cleanupv1/*.go','/felix/bpf/conntrack/timeouts/*.go','/felix/bpf/conntrack/v2/*.go','/felix/bpf/conntrack/v3/*.go','/felix/bpf/conntrack/v4/*.go','/felix/bpf/consistenthash/*.go','/felix/bpf/counters/*.go','/felix/bpf/events/*.go','/felix/bpf/failsafes/*.go','/felix/bpf/filter/*.go','/felix/bpf/hook/*.go','/felix/bpf/ifstate/*.go','/felix/bpf/ipfrags/*.go','/felix/bpf/ipsets/*.go','/felix/bpf/jump/*.go','/felix/bpf/legacy/*.go','/felix/bpf/libbpf/*.go','/felix/bpf/maps/*.go','/felix/bpf/nat/*.go','/felix/bpf/perf/*.go','/felix/bpf/polprog/*.go','/felix/bpf/profiling/*.go','/felix/bpf/proxy/*.go','/felix/bpf/qos/*.go','/felix/bpf/routes/*.go','/felix/bpf/state/*.go','/felix/bpf/tc/*.go','/felix/bpf/tc/defs/*.go','/felix/bpf/utils/*.go','/felix/bpf/xdp/*.go','/felix/cachingmap/*.go','/felix/calc/*.go','/felix/cmd/calico-bpf/commands/*.go','/felix/collector/*.go','/felix/collector/flowlog/*.go','/felix/collector/goldmane/*.go','/felix/collector/local/*.go','/felix/collector/types/*.go','/felix/collector/types/counter/*.go','/felix/collector/types/endpoint/*.go','/felix/collector/types/metric/*.go','/felix/collector/types/tuple/*.go','/felix/collector/utils/*.go','/felix/config/*.go','/felix/conntrack/*.go','/felix/daemon/*.go','/felix/dataplane/*.go','/felix/dataplane/common/*.go','/felix/dataplane/external/*.go','/felix/dataplane/inactive/*.go','/felix/dataplane/ipsets/*.go','/felix/dataplane/linux/*.go','/felix/dataplane/linux/dataplanedefs/*.go','/felix/dataplane/linux/qos/*.go','/felix/deltatracker/*.go','/felix/dispatcher/*.go','/felix/environment/*.go','/felix/ethtool/*.go','/felix/generictables/*.go','/felix/hashutils/*.go','/felix/idalloc/*.go','/felix/ifacemonitor/*.go','/felix/ip/*.go','/felix/ipsets/*.go','/felix/iptables/*.go','/felix/iptables/cmdshim/*.go','/felix/jitter/*.go','/felix/k8sutils/*.go','/felix/labelindex/*.go','/felix/labelindex/ipsetmember/*.go','/felix/labelindex/labelnamevalueindex/*.go','/felix/labelindex/labelrestrictionindex/*.go','/felix/linkaddrs/*.go','/felix/logutils/*.go','/felix/markbits/*.go','/felix/multidict/*.go','/felix/netlinkshim/*.go','/felix/netlinkshim/handlemgr/*.go','/felix/nfnetlink/*.go','/felix/nfnetlink/nfnl/*.go','/felix/nfnetlink/pkt/*.go','/felix/nftables/*.go','/felix/policysync/*.go','/felix/proto/*.go','/felix/proto/protoconv/*.go','/felix/routerule/*.go','/felix/routetable/*.go','/felix/routetable/ownershippol/*.go','/felix/rules/*.go','/felix/serviceindex/*.go','/felix/statusrep/*.go','/felix/stringutils/*.go','/felix/throttle/*.go','/felix/timeshim/*.go','/felix/types/*.go','/felix/usagerep/*.go','/felix/vxlanfdb/*.go','/felix/wireguard/*.go','/goldmane/pkg/client/*.go','/goldmane/pkg/goldmane/*.go','/goldmane/pkg/internal/flowcache/*.go','/goldmane/pkg/server/*.go','/goldmane/pkg/storage/*.go','/goldmane/pkg/stream/*.go','/goldmane/pkg/types/*.go','/goldmane/proto/*.go','/hack/test/certs/','/lib.Makefile','/lib/std/chanutil/*.go','/lib/std/time/*.go','/lib/std/uniquelabels/*.go','/lib/std/uniquestr/*.go','/libcalico-go/config/*.go','/libcalico-go/lib/apiconfig/*.go','/libcalico-go/lib/apis/v1/*.go','/libcalico-go/lib/apis/v1/unversioned/*.go','/libcalico-go/lib/apis/v3/*.go','/libcalico-go/lib/backend/*.go','/libcalico-go/lib/backend/api/*.go','/libcalico-go/lib/backend/encap/*.go','/libcalico-go/lib/backend/etcdv3/*.go','/libcalico-go/lib/backend/k8s/*.go','/libcalico-go/lib/backend/k8s/conversion/*.go','/libcalico-go/lib/backend/k8s/resources/*.go','/libcalico-go/lib/backend/k8s/scheme/*.go','/libcalico-go/lib/backend/model/*.go','/libcalico-go/lib/backend/syncersv1/bgpsyncer/*.go','/libcalico-go/lib/backend/syncersv1/dedupebuffer/*.go','/libcalico-go/lib/backend/syncersv1/felixsyncer/*.go','/libcalico-go/lib/backend/syncersv1/nodestatussyncer/*.go','/libcalico-go/lib/backend/syncersv1/tunnelipsyncer/*.go','/libcalico-go/lib/backend/syncersv1/updateprocessors/*.go','/libcalico-go/lib/backend/watchersyncer/*.go','/libcalico-go/lib/clientv3/*.go','/libcalico-go/lib/consistenthash/*.go','/libcalico-go/lib/debugserver/*.go','/libcalico-go/lib/dispatcher/*.go','/libcalico-go/lib/epstatusfile/*.go','/libcalico-go/lib/errors/*.go','/libcalico-go/lib/hash/*.go','/libcalico-go/lib/health/*.go','/libcalico-go/lib/ipam/*.go','/libcalico-go/lib/json/*.go','/libcalico-go/lib/logutils/*.go','/libcalico-go/lib/metricsserver/*.go','/libcalico-go/lib/names/*.go','/libcalico-go/lib/namespace/*.go','/libcalico-go/lib/net/*.go','/libcalico-go/lib/netlinkutils/*.go','/libcalico-go/lib/options/*.go','/libcalico-go/lib/packedmap/*.go','/libcalico-go/lib/prometheus/*.go','/libcalico-go/lib/readlogger/*.go','/libcalico-go/lib/resources/*.go','/libcalico-go/lib/scope/*.go','/libcalico-go/lib/selector/*.go','/libcalico-go/lib/selector/parser/*.go','/libcalico-go/lib/selector/tokenizer/*.go','/libcalico-go/lib/set/*.go','/libcalico-go/lib/validator/v1/*.go','/libcalico-go/lib/validator/v3/*.go','/libcalico-go/lib/watch/*.go','/libcalico-go/lib/winutils/*.go','/metadata.mk','/node/**','/pkg/buildinfo/*.go','/pod2daemon/binder/*.go','/typha/pkg/discovery/*.go','/typha/pkg/syncclient/*.go','/typha/pkg/syncclientutils/*.go','/typha/pkg/syncproto/*.go','/typha/pkg/tlsutils/*.go'], {pipeline_file: 'ignore', exclude: ['/**/*.md','/**/.gitignore','/**/AUTHORS*','/**/CONTRIBUTING*','/**/DEVELOPER_GUIDE*','/**/LICENSE*','/**/README*','/**/SECURITY.md','/api/**/*_test.go','/app-policy/**/*_test.go','/cni-plugin/**/*_test.go','/confd/**/*_test.go','/crypto/**/*_test.go','/felix/**/*_test.go','/goldmane/**/*_test.go','/lib/**/*_test.go','/libcalico-go/**/*_test.go','/pkg/**/*_test.go','/pod2daemon/**/*_test.go','/typha/**/*_test.go']})"
     dependencies:
       - Prerequisites
     task:
@@ -1106,7 +1106,7 @@ blocks:
               value: "true"
   - name: "Node: multi-arch build"
     run:
-      when: "change_in(['/.semaphore/semaphore.yml.d/01-preamble.yml','/.semaphore/semaphore.yml.d/02-global_job_config.yml','/.semaphore/semaphore.yml.d/03-promotions.yml','/.semaphore/semaphore.yml.d/09-blocks.yml','/.semaphore/semaphore.yml.d/99-after_pipeline.yml','/.semaphore/semaphore.yml.d/blocks/20-node.yml','/api/pkg/apis/projectcalico/v3/*.go','/api/pkg/lib/numorstring/*.go','/app-policy/checker/*.go','/app-policy/policystore/*.go','/app-policy/types/*.go','/cni-plugin/internal/pkg/azure/*.go','/cni-plugin/internal/pkg/utils/*.go','/cni-plugin/internal/pkg/utils/cri/*.go','/cni-plugin/pkg/dataplane/*.go','/cni-plugin/pkg/dataplane/grpc/*.go','/cni-plugin/pkg/dataplane/grpc/proto/*.go','/cni-plugin/pkg/dataplane/linux/*.go','/cni-plugin/pkg/ipamplugin/*.go','/cni-plugin/pkg/k8s/*.go','/cni-plugin/pkg/plugin/*.go','/cni-plugin/pkg/types/*.go','/cni-plugin/pkg/upgrade/*.go','/cni-plugin/pkg/wait/*.go','/confd/etc','/confd/pkg/backends/*.go','/confd/pkg/backends/calico/*.go','/confd/pkg/backends/types/*.go','/confd/pkg/config/*.go','/confd/pkg/log/*.go','/confd/pkg/resource/template/*.go','/confd/pkg/run/*.go','/crypto/pkg/tls/*.go','/felix/aws/*.go','/felix/bpf-apache','/felix/bpf-gpl','/felix/bpf/*.go','/felix/bpf/arp/*.go','/felix/bpf/asm/*.go','/felix/bpf/bpfdefs/*.go','/felix/bpf/bpfmap/*.go','/felix/bpf/conntrack/*.go','/felix/bpf/conntrack/cleanupv1/*.go','/felix/bpf/conntrack/timeouts/*.go','/felix/bpf/conntrack/v2/*.go','/felix/bpf/conntrack/v3/*.go','/felix/bpf/conntrack/v4/*.go','/felix/bpf/consistenthash/*.go','/felix/bpf/counters/*.go','/felix/bpf/events/*.go','/felix/bpf/failsafes/*.go','/felix/bpf/filter/*.go','/felix/bpf/hook/*.go','/felix/bpf/ifstate/*.go','/felix/bpf/ipsets/*.go','/felix/bpf/jump/*.go','/felix/bpf/legacy/*.go','/felix/bpf/libbpf/*.go','/felix/bpf/maps/*.go','/felix/bpf/nat/*.go','/felix/bpf/perf/*.go','/felix/bpf/polprog/*.go','/felix/bpf/profiling/*.go','/felix/bpf/proxy/*.go','/felix/bpf/qos/*.go','/felix/bpf/routes/*.go','/felix/bpf/state/*.go','/felix/bpf/tc/*.go','/felix/bpf/tc/defs/*.go','/felix/bpf/utils/*.go','/felix/bpf/xdp/*.go','/felix/cachingmap/*.go','/felix/calc/*.go','/felix/cmd/calico-bpf/commands/*.go','/felix/collector/*.go','/felix/collector/flowlog/*.go','/felix/collector/goldmane/*.go','/felix/collector/local/*.go','/felix/collector/types/*.go','/felix/collector/types/counter/*.go','/felix/collector/types/endpoint/*.go','/felix/collector/types/metric/*.go','/felix/collector/types/tuple/*.go','/felix/collector/utils/*.go','/felix/config/*.go','/felix/conntrack/*.go','/felix/daemon/*.go','/felix/dataplane/*.go','/felix/dataplane/common/*.go','/felix/dataplane/external/*.go','/felix/dataplane/inactive/*.go','/felix/dataplane/ipsets/*.go','/felix/dataplane/linux/*.go','/felix/dataplane/linux/dataplanedefs/*.go','/felix/dataplane/linux/qos/*.go','/felix/deltatracker/*.go','/felix/dispatcher/*.go','/felix/environment/*.go','/felix/ethtool/*.go','/felix/generictables/*.go','/felix/hashutils/*.go','/felix/idalloc/*.go','/felix/ifacemonitor/*.go','/felix/ip/*.go','/felix/ipsets/*.go','/felix/iptables/*.go','/felix/iptables/cmdshim/*.go','/felix/jitter/*.go','/felix/k8sutils/*.go','/felix/labelindex/*.go','/felix/labelindex/ipsetmember/*.go','/felix/labelindex/labelnamevalueindex/*.go','/felix/labelindex/labelrestrictionindex/*.go','/felix/linkaddrs/*.go','/felix/logutils/*.go','/felix/markbits/*.go','/felix/multidict/*.go','/felix/netlinkshim/*.go','/felix/netlinkshim/handlemgr/*.go','/felix/nfnetlink/*.go','/felix/nfnetlink/nfnl/*.go','/felix/nfnetlink/pkt/*.go','/felix/nftables/*.go','/felix/policysync/*.go','/felix/proto/*.go','/felix/proto/protoconv/*.go','/felix/routerule/*.go','/felix/routetable/*.go','/felix/routetable/ownershippol/*.go','/felix/rules/*.go','/felix/serviceindex/*.go','/felix/statusrep/*.go','/felix/stringutils/*.go','/felix/throttle/*.go','/felix/timeshim/*.go','/felix/types/*.go','/felix/usagerep/*.go','/felix/vxlanfdb/*.go','/felix/wireguard/*.go','/goldmane/pkg/client/*.go','/goldmane/pkg/goldmane/*.go','/goldmane/pkg/internal/flowcache/*.go','/goldmane/pkg/server/*.go','/goldmane/pkg/storage/*.go','/goldmane/pkg/stream/*.go','/goldmane/pkg/types/*.go','/goldmane/proto/*.go','/hack/test/certs/','/lib.Makefile','/lib/std/chanutil/*.go','/lib/std/time/*.go','/lib/std/uniquelabels/*.go','/lib/std/uniquestr/*.go','/libcalico-go/config/*.go','/libcalico-go/lib/apiconfig/*.go','/libcalico-go/lib/apis/v1/*.go','/libcalico-go/lib/apis/v1/unversioned/*.go','/libcalico-go/lib/apis/v3/*.go','/libcalico-go/lib/backend/*.go','/libcalico-go/lib/backend/api/*.go','/libcalico-go/lib/backend/encap/*.go','/libcalico-go/lib/backend/etcdv3/*.go','/libcalico-go/lib/backend/k8s/*.go','/libcalico-go/lib/backend/k8s/conversion/*.go','/libcalico-go/lib/backend/k8s/resources/*.go','/libcalico-go/lib/backend/k8s/scheme/*.go','/libcalico-go/lib/backend/model/*.go','/libcalico-go/lib/backend/syncersv1/bgpsyncer/*.go','/libcalico-go/lib/backend/syncersv1/dedupebuffer/*.go','/libcalico-go/lib/backend/syncersv1/felixsyncer/*.go','/libcalico-go/lib/backend/syncersv1/nodestatussyncer/*.go','/libcalico-go/lib/backend/syncersv1/tunnelipsyncer/*.go','/libcalico-go/lib/backend/syncersv1/updateprocessors/*.go','/libcalico-go/lib/backend/watchersyncer/*.go','/libcalico-go/lib/clientv3/*.go','/libcalico-go/lib/consistenthash/*.go','/libcalico-go/lib/debugserver/*.go','/libcalico-go/lib/dispatcher/*.go','/libcalico-go/lib/epstatusfile/*.go','/libcalico-go/lib/errors/*.go','/libcalico-go/lib/hash/*.go','/libcalico-go/lib/health/*.go','/libcalico-go/lib/ipam/*.go','/libcalico-go/lib/json/*.go','/libcalico-go/lib/logutils/*.go','/libcalico-go/lib/metricsserver/*.go','/libcalico-go/lib/names/*.go','/libcalico-go/lib/namespace/*.go','/libcalico-go/lib/net/*.go','/libcalico-go/lib/netlinkutils/*.go','/libcalico-go/lib/options/*.go','/libcalico-go/lib/packedmap/*.go','/libcalico-go/lib/prometheus/*.go','/libcalico-go/lib/readlogger/*.go','/libcalico-go/lib/resources/*.go','/libcalico-go/lib/scope/*.go','/libcalico-go/lib/selector/*.go','/libcalico-go/lib/selector/parser/*.go','/libcalico-go/lib/selector/tokenizer/*.go','/libcalico-go/lib/set/*.go','/libcalico-go/lib/validator/v1/*.go','/libcalico-go/lib/validator/v3/*.go','/libcalico-go/lib/watch/*.go','/libcalico-go/lib/winutils/*.go','/metadata.mk','/node/**','/pkg/buildinfo/*.go','/pod2daemon/binder/*.go','/typha/pkg/discovery/*.go','/typha/pkg/syncclient/*.go','/typha/pkg/syncclientutils/*.go','/typha/pkg/syncproto/*.go','/typha/pkg/tlsutils/*.go'], {pipeline_file: 'ignore', exclude: ['/**/*.md','/**/.gitignore','/**/AUTHORS*','/**/CONTRIBUTING*','/**/DEVELOPER_GUIDE*','/**/LICENSE*','/**/README*','/**/SECURITY.md','/api/**/*_test.go','/app-policy/**/*_test.go','/cni-plugin/**/*_test.go','/confd/**/*_test.go','/crypto/**/*_test.go','/felix/**/*_test.go','/goldmane/**/*_test.go','/lib/**/*_test.go','/libcalico-go/**/*_test.go','/pkg/**/*_test.go','/pod2daemon/**/*_test.go','/typha/**/*_test.go']})"
+      when: "change_in(['/.semaphore/semaphore.yml.d/01-preamble.yml','/.semaphore/semaphore.yml.d/02-global_job_config.yml','/.semaphore/semaphore.yml.d/03-promotions.yml','/.semaphore/semaphore.yml.d/09-blocks.yml','/.semaphore/semaphore.yml.d/99-after_pipeline.yml','/.semaphore/semaphore.yml.d/blocks/20-node.yml','/api/pkg/apis/projectcalico/v3/*.go','/api/pkg/lib/numorstring/*.go','/app-policy/checker/*.go','/app-policy/policystore/*.go','/app-policy/types/*.go','/cni-plugin/internal/pkg/azure/*.go','/cni-plugin/internal/pkg/utils/*.go','/cni-plugin/internal/pkg/utils/cri/*.go','/cni-plugin/pkg/dataplane/*.go','/cni-plugin/pkg/dataplane/grpc/*.go','/cni-plugin/pkg/dataplane/grpc/proto/*.go','/cni-plugin/pkg/dataplane/linux/*.go','/cni-plugin/pkg/ipamplugin/*.go','/cni-plugin/pkg/k8s/*.go','/cni-plugin/pkg/plugin/*.go','/cni-plugin/pkg/types/*.go','/cni-plugin/pkg/upgrade/*.go','/cni-plugin/pkg/wait/*.go','/confd/etc','/confd/pkg/backends/*.go','/confd/pkg/backends/calico/*.go','/confd/pkg/backends/types/*.go','/confd/pkg/config/*.go','/confd/pkg/log/*.go','/confd/pkg/resource/template/*.go','/confd/pkg/run/*.go','/crypto/pkg/tls/*.go','/felix/aws/*.go','/felix/bpf-apache','/felix/bpf-gpl','/felix/bpf/*.go','/felix/bpf/arp/*.go','/felix/bpf/asm/*.go','/felix/bpf/bpfdefs/*.go','/felix/bpf/bpfmap/*.go','/felix/bpf/conntrack/*.go','/felix/bpf/conntrack/cleanupv1/*.go','/felix/bpf/conntrack/timeouts/*.go','/felix/bpf/conntrack/v2/*.go','/felix/bpf/conntrack/v3/*.go','/felix/bpf/conntrack/v4/*.go','/felix/bpf/consistenthash/*.go','/felix/bpf/counters/*.go','/felix/bpf/events/*.go','/felix/bpf/failsafes/*.go','/felix/bpf/filter/*.go','/felix/bpf/hook/*.go','/felix/bpf/ifstate/*.go','/felix/bpf/ipfrags/*.go','/felix/bpf/ipsets/*.go','/felix/bpf/jump/*.go','/felix/bpf/legacy/*.go','/felix/bpf/libbpf/*.go','/felix/bpf/maps/*.go','/felix/bpf/nat/*.go','/felix/bpf/perf/*.go','/felix/bpf/polprog/*.go','/felix/bpf/profiling/*.go','/felix/bpf/proxy/*.go','/felix/bpf/qos/*.go','/felix/bpf/routes/*.go','/felix/bpf/state/*.go','/felix/bpf/tc/*.go','/felix/bpf/tc/defs/*.go','/felix/bpf/utils/*.go','/felix/bpf/xdp/*.go','/felix/cachingmap/*.go','/felix/calc/*.go','/felix/cmd/calico-bpf/commands/*.go','/felix/collector/*.go','/felix/collector/flowlog/*.go','/felix/collector/goldmane/*.go','/felix/collector/local/*.go','/felix/collector/types/*.go','/felix/collector/types/counter/*.go','/felix/collector/types/endpoint/*.go','/felix/collector/types/metric/*.go','/felix/collector/types/tuple/*.go','/felix/collector/utils/*.go','/felix/config/*.go','/felix/conntrack/*.go','/felix/daemon/*.go','/felix/dataplane/*.go','/felix/dataplane/common/*.go','/felix/dataplane/external/*.go','/felix/dataplane/inactive/*.go','/felix/dataplane/ipsets/*.go','/felix/dataplane/linux/*.go','/felix/dataplane/linux/dataplanedefs/*.go','/felix/dataplane/linux/qos/*.go','/felix/deltatracker/*.go','/felix/dispatcher/*.go','/felix/environment/*.go','/felix/ethtool/*.go','/felix/generictables/*.go','/felix/hashutils/*.go','/felix/idalloc/*.go','/felix/ifacemonitor/*.go','/felix/ip/*.go','/felix/ipsets/*.go','/felix/iptables/*.go','/felix/iptables/cmdshim/*.go','/felix/jitter/*.go','/felix/k8sutils/*.go','/felix/labelindex/*.go','/felix/labelindex/ipsetmember/*.go','/felix/labelindex/labelnamevalueindex/*.go','/felix/labelindex/labelrestrictionindex/*.go','/felix/linkaddrs/*.go','/felix/logutils/*.go','/felix/markbits/*.go','/felix/multidict/*.go','/felix/netlinkshim/*.go','/felix/netlinkshim/handlemgr/*.go','/felix/nfnetlink/*.go','/felix/nfnetlink/nfnl/*.go','/felix/nfnetlink/pkt/*.go','/felix/nftables/*.go','/felix/policysync/*.go','/felix/proto/*.go','/felix/proto/protoconv/*.go','/felix/routerule/*.go','/felix/routetable/*.go','/felix/routetable/ownershippol/*.go','/felix/rules/*.go','/felix/serviceindex/*.go','/felix/statusrep/*.go','/felix/stringutils/*.go','/felix/throttle/*.go','/felix/timeshim/*.go','/felix/types/*.go','/felix/usagerep/*.go','/felix/vxlanfdb/*.go','/felix/wireguard/*.go','/goldmane/pkg/client/*.go','/goldmane/pkg/goldmane/*.go','/goldmane/pkg/internal/flowcache/*.go','/goldmane/pkg/server/*.go','/goldmane/pkg/storage/*.go','/goldmane/pkg/stream/*.go','/goldmane/pkg/types/*.go','/goldmane/proto/*.go','/hack/test/certs/','/lib.Makefile','/lib/std/chanutil/*.go','/lib/std/time/*.go','/lib/std/uniquelabels/*.go','/lib/std/uniquestr/*.go','/libcalico-go/config/*.go','/libcalico-go/lib/apiconfig/*.go','/libcalico-go/lib/apis/v1/*.go','/libcalico-go/lib/apis/v1/unversioned/*.go','/libcalico-go/lib/apis/v3/*.go','/libcalico-go/lib/backend/*.go','/libcalico-go/lib/backend/api/*.go','/libcalico-go/lib/backend/encap/*.go','/libcalico-go/lib/backend/etcdv3/*.go','/libcalico-go/lib/backend/k8s/*.go','/libcalico-go/lib/backend/k8s/conversion/*.go','/libcalico-go/lib/backend/k8s/resources/*.go','/libcalico-go/lib/backend/k8s/scheme/*.go','/libcalico-go/lib/backend/model/*.go','/libcalico-go/lib/backend/syncersv1/bgpsyncer/*.go','/libcalico-go/lib/backend/syncersv1/dedupebuffer/*.go','/libcalico-go/lib/backend/syncersv1/felixsyncer/*.go','/libcalico-go/lib/backend/syncersv1/nodestatussyncer/*.go','/libcalico-go/lib/backend/syncersv1/tunnelipsyncer/*.go','/libcalico-go/lib/backend/syncersv1/updateprocessors/*.go','/libcalico-go/lib/backend/watchersyncer/*.go','/libcalico-go/lib/clientv3/*.go','/libcalico-go/lib/consistenthash/*.go','/libcalico-go/lib/debugserver/*.go','/libcalico-go/lib/dispatcher/*.go','/libcalico-go/lib/epstatusfile/*.go','/libcalico-go/lib/errors/*.go','/libcalico-go/lib/hash/*.go','/libcalico-go/lib/health/*.go','/libcalico-go/lib/ipam/*.go','/libcalico-go/lib/json/*.go','/libcalico-go/lib/logutils/*.go','/libcalico-go/lib/metricsserver/*.go','/libcalico-go/lib/names/*.go','/libcalico-go/lib/namespace/*.go','/libcalico-go/lib/net/*.go','/libcalico-go/lib/netlinkutils/*.go','/libcalico-go/lib/options/*.go','/libcalico-go/lib/packedmap/*.go','/libcalico-go/lib/prometheus/*.go','/libcalico-go/lib/readlogger/*.go','/libcalico-go/lib/resources/*.go','/libcalico-go/lib/scope/*.go','/libcalico-go/lib/selector/*.go','/libcalico-go/lib/selector/parser/*.go','/libcalico-go/lib/selector/tokenizer/*.go','/libcalico-go/lib/set/*.go','/libcalico-go/lib/validator/v1/*.go','/libcalico-go/lib/validator/v3/*.go','/libcalico-go/lib/watch/*.go','/libcalico-go/lib/winutils/*.go','/metadata.mk','/node/**','/pkg/buildinfo/*.go','/pod2daemon/binder/*.go','/typha/pkg/discovery/*.go','/typha/pkg/syncclient/*.go','/typha/pkg/syncclientutils/*.go','/typha/pkg/syncproto/*.go','/typha/pkg/tlsutils/*.go'], {pipeline_file: 'ignore', exclude: ['/**/*.md','/**/.gitignore','/**/AUTHORS*','/**/CONTRIBUTING*','/**/DEVELOPER_GUIDE*','/**/LICENSE*','/**/README*','/**/SECURITY.md','/api/**/*_test.go','/app-policy/**/*_test.go','/cni-plugin/**/*_test.go','/confd/**/*_test.go','/crypto/**/*_test.go','/felix/**/*_test.go','/goldmane/**/*_test.go','/lib/**/*_test.go','/libcalico-go/**/*_test.go','/pkg/**/*_test.go','/pod2daemon/**/*_test.go','/typha/**/*_test.go']})"
     dependencies:
       - "Node: Build"
     task:
@@ -1130,7 +1130,7 @@ blocks:
             - ../.semaphore/run-and-monitor build-windows-image.log make image-windows
   - name: "Node: Build - native arm64 runner"
     run:
-      when: "change_in(['/.semaphore/semaphore.yml.d/01-preamble.yml','/.semaphore/semaphore.yml.d/02-global_job_config.yml','/.semaphore/semaphore.yml.d/03-promotions.yml','/.semaphore/semaphore.yml.d/09-blocks.yml','/.semaphore/semaphore.yml.d/99-after_pipeline.yml','/.semaphore/semaphore.yml.d/blocks/20-node.yml','/api/pkg/apis/projectcalico/v3/*.go','/api/pkg/lib/numorstring/*.go','/app-policy/checker/*.go','/app-policy/policystore/*.go','/app-policy/types/*.go','/cni-plugin/internal/pkg/azure/*.go','/cni-plugin/internal/pkg/utils/*.go','/cni-plugin/internal/pkg/utils/cri/*.go','/cni-plugin/pkg/dataplane/*.go','/cni-plugin/pkg/dataplane/grpc/*.go','/cni-plugin/pkg/dataplane/grpc/proto/*.go','/cni-plugin/pkg/dataplane/linux/*.go','/cni-plugin/pkg/ipamplugin/*.go','/cni-plugin/pkg/k8s/*.go','/cni-plugin/pkg/plugin/*.go','/cni-plugin/pkg/types/*.go','/cni-plugin/pkg/upgrade/*.go','/cni-plugin/pkg/wait/*.go','/confd/etc','/confd/pkg/backends/*.go','/confd/pkg/backends/calico/*.go','/confd/pkg/backends/types/*.go','/confd/pkg/config/*.go','/confd/pkg/log/*.go','/confd/pkg/resource/template/*.go','/confd/pkg/run/*.go','/crypto/pkg/tls/*.go','/felix/aws/*.go','/felix/bpf-apache','/felix/bpf-gpl','/felix/bpf/*.go','/felix/bpf/arp/*.go','/felix/bpf/asm/*.go','/felix/bpf/bpfdefs/*.go','/felix/bpf/bpfmap/*.go','/felix/bpf/conntrack/*.go','/felix/bpf/conntrack/cleanupv1/*.go','/felix/bpf/conntrack/timeouts/*.go','/felix/bpf/conntrack/v2/*.go','/felix/bpf/conntrack/v3/*.go','/felix/bpf/conntrack/v4/*.go','/felix/bpf/consistenthash/*.go','/felix/bpf/counters/*.go','/felix/bpf/events/*.go','/felix/bpf/failsafes/*.go','/felix/bpf/filter/*.go','/felix/bpf/hook/*.go','/felix/bpf/ifstate/*.go','/felix/bpf/ipsets/*.go','/felix/bpf/jump/*.go','/felix/bpf/legacy/*.go','/felix/bpf/libbpf/*.go','/felix/bpf/maps/*.go','/felix/bpf/nat/*.go','/felix/bpf/perf/*.go','/felix/bpf/polprog/*.go','/felix/bpf/profiling/*.go','/felix/bpf/proxy/*.go','/felix/bpf/qos/*.go','/felix/bpf/routes/*.go','/felix/bpf/state/*.go','/felix/bpf/tc/*.go','/felix/bpf/tc/defs/*.go','/felix/bpf/utils/*.go','/felix/bpf/xdp/*.go','/felix/cachingmap/*.go','/felix/calc/*.go','/felix/cmd/calico-bpf/commands/*.go','/felix/collector/*.go','/felix/collector/flowlog/*.go','/felix/collector/goldmane/*.go','/felix/collector/local/*.go','/felix/collector/types/*.go','/felix/collector/types/counter/*.go','/felix/collector/types/endpoint/*.go','/felix/collector/types/metric/*.go','/felix/collector/types/tuple/*.go','/felix/collector/utils/*.go','/felix/config/*.go','/felix/conntrack/*.go','/felix/daemon/*.go','/felix/dataplane/*.go','/felix/dataplane/common/*.go','/felix/dataplane/external/*.go','/felix/dataplane/inactive/*.go','/felix/dataplane/ipsets/*.go','/felix/dataplane/linux/*.go','/felix/dataplane/linux/dataplanedefs/*.go','/felix/dataplane/linux/qos/*.go','/felix/deltatracker/*.go','/felix/dispatcher/*.go','/felix/environment/*.go','/felix/ethtool/*.go','/felix/generictables/*.go','/felix/hashutils/*.go','/felix/idalloc/*.go','/felix/ifacemonitor/*.go','/felix/ip/*.go','/felix/ipsets/*.go','/felix/iptables/*.go','/felix/iptables/cmdshim/*.go','/felix/jitter/*.go','/felix/k8sutils/*.go','/felix/labelindex/*.go','/felix/labelindex/ipsetmember/*.go','/felix/labelindex/labelnamevalueindex/*.go','/felix/labelindex/labelrestrictionindex/*.go','/felix/linkaddrs/*.go','/felix/logutils/*.go','/felix/markbits/*.go','/felix/multidict/*.go','/felix/netlinkshim/*.go','/felix/netlinkshim/handlemgr/*.go','/felix/nfnetlink/*.go','/felix/nfnetlink/nfnl/*.go','/felix/nfnetlink/pkt/*.go','/felix/nftables/*.go','/felix/policysync/*.go','/felix/proto/*.go','/felix/proto/protoconv/*.go','/felix/routerule/*.go','/felix/routetable/*.go','/felix/routetable/ownershippol/*.go','/felix/rules/*.go','/felix/serviceindex/*.go','/felix/statusrep/*.go','/felix/stringutils/*.go','/felix/throttle/*.go','/felix/timeshim/*.go','/felix/types/*.go','/felix/usagerep/*.go','/felix/vxlanfdb/*.go','/felix/wireguard/*.go','/goldmane/pkg/client/*.go','/goldmane/pkg/goldmane/*.go','/goldmane/pkg/internal/flowcache/*.go','/goldmane/pkg/server/*.go','/goldmane/pkg/storage/*.go','/goldmane/pkg/stream/*.go','/goldmane/pkg/types/*.go','/goldmane/proto/*.go','/hack/test/certs/','/lib.Makefile','/lib/std/chanutil/*.go','/lib/std/time/*.go','/lib/std/uniquelabels/*.go','/lib/std/uniquestr/*.go','/libcalico-go/config/*.go','/libcalico-go/lib/apiconfig/*.go','/libcalico-go/lib/apis/v1/*.go','/libcalico-go/lib/apis/v1/unversioned/*.go','/libcalico-go/lib/apis/v3/*.go','/libcalico-go/lib/backend/*.go','/libcalico-go/lib/backend/api/*.go','/libcalico-go/lib/backend/encap/*.go','/libcalico-go/lib/backend/etcdv3/*.go','/libcalico-go/lib/backend/k8s/*.go','/libcalico-go/lib/backend/k8s/conversion/*.go','/libcalico-go/lib/backend/k8s/resources/*.go','/libcalico-go/lib/backend/k8s/scheme/*.go','/libcalico-go/lib/backend/model/*.go','/libcalico-go/lib/backend/syncersv1/bgpsyncer/*.go','/libcalico-go/lib/backend/syncersv1/dedupebuffer/*.go','/libcalico-go/lib/backend/syncersv1/felixsyncer/*.go','/libcalico-go/lib/backend/syncersv1/nodestatussyncer/*.go','/libcalico-go/lib/backend/syncersv1/tunnelipsyncer/*.go','/libcalico-go/lib/backend/syncersv1/updateprocessors/*.go','/libcalico-go/lib/backend/watchersyncer/*.go','/libcalico-go/lib/clientv3/*.go','/libcalico-go/lib/consistenthash/*.go','/libcalico-go/lib/debugserver/*.go','/libcalico-go/lib/dispatcher/*.go','/libcalico-go/lib/epstatusfile/*.go','/libcalico-go/lib/errors/*.go','/libcalico-go/lib/hash/*.go','/libcalico-go/lib/health/*.go','/libcalico-go/lib/ipam/*.go','/libcalico-go/lib/json/*.go','/libcalico-go/lib/logutils/*.go','/libcalico-go/lib/metricsserver/*.go','/libcalico-go/lib/names/*.go','/libcalico-go/lib/namespace/*.go','/libcalico-go/lib/net/*.go','/libcalico-go/lib/netlinkutils/*.go','/libcalico-go/lib/options/*.go','/libcalico-go/lib/packedmap/*.go','/libcalico-go/lib/prometheus/*.go','/libcalico-go/lib/readlogger/*.go','/libcalico-go/lib/resources/*.go','/libcalico-go/lib/scope/*.go','/libcalico-go/lib/selector/*.go','/libcalico-go/lib/selector/parser/*.go','/libcalico-go/lib/selector/tokenizer/*.go','/libcalico-go/lib/set/*.go','/libcalico-go/lib/validator/v1/*.go','/libcalico-go/lib/validator/v3/*.go','/libcalico-go/lib/watch/*.go','/libcalico-go/lib/winutils/*.go','/metadata.mk','/node/**','/pkg/buildinfo/*.go','/pod2daemon/binder/*.go','/typha/pkg/discovery/*.go','/typha/pkg/syncclient/*.go','/typha/pkg/syncclientutils/*.go','/typha/pkg/syncproto/*.go','/typha/pkg/tlsutils/*.go'], {pipeline_file: 'ignore', exclude: ['/**/*.md','/**/.gitignore','/**/AUTHORS*','/**/CONTRIBUTING*','/**/DEVELOPER_GUIDE*','/**/LICENSE*','/**/README*','/**/SECURITY.md','/api/**/*_test.go','/app-policy/**/*_test.go','/cni-plugin/**/*_test.go','/confd/**/*_test.go','/crypto/**/*_test.go','/felix/**/*_test.go','/goldmane/**/*_test.go','/lib/**/*_test.go','/libcalico-go/**/*_test.go','/pkg/**/*_test.go','/pod2daemon/**/*_test.go','/typha/**/*_test.go']})"
+      when: "change_in(['/.semaphore/semaphore.yml.d/01-preamble.yml','/.semaphore/semaphore.yml.d/02-global_job_config.yml','/.semaphore/semaphore.yml.d/03-promotions.yml','/.semaphore/semaphore.yml.d/09-blocks.yml','/.semaphore/semaphore.yml.d/99-after_pipeline.yml','/.semaphore/semaphore.yml.d/blocks/20-node.yml','/api/pkg/apis/projectcalico/v3/*.go','/api/pkg/lib/numorstring/*.go','/app-policy/checker/*.go','/app-policy/policystore/*.go','/app-policy/types/*.go','/cni-plugin/internal/pkg/azure/*.go','/cni-plugin/internal/pkg/utils/*.go','/cni-plugin/internal/pkg/utils/cri/*.go','/cni-plugin/pkg/dataplane/*.go','/cni-plugin/pkg/dataplane/grpc/*.go','/cni-plugin/pkg/dataplane/grpc/proto/*.go','/cni-plugin/pkg/dataplane/linux/*.go','/cni-plugin/pkg/ipamplugin/*.go','/cni-plugin/pkg/k8s/*.go','/cni-plugin/pkg/plugin/*.go','/cni-plugin/pkg/types/*.go','/cni-plugin/pkg/upgrade/*.go','/cni-plugin/pkg/wait/*.go','/confd/etc','/confd/pkg/backends/*.go','/confd/pkg/backends/calico/*.go','/confd/pkg/backends/types/*.go','/confd/pkg/config/*.go','/confd/pkg/log/*.go','/confd/pkg/resource/template/*.go','/confd/pkg/run/*.go','/crypto/pkg/tls/*.go','/felix/aws/*.go','/felix/bpf-apache','/felix/bpf-gpl','/felix/bpf/*.go','/felix/bpf/arp/*.go','/felix/bpf/asm/*.go','/felix/bpf/bpfdefs/*.go','/felix/bpf/bpfmap/*.go','/felix/bpf/conntrack/*.go','/felix/bpf/conntrack/cleanupv1/*.go','/felix/bpf/conntrack/timeouts/*.go','/felix/bpf/conntrack/v2/*.go','/felix/bpf/conntrack/v3/*.go','/felix/bpf/conntrack/v4/*.go','/felix/bpf/consistenthash/*.go','/felix/bpf/counters/*.go','/felix/bpf/events/*.go','/felix/bpf/failsafes/*.go','/felix/bpf/filter/*.go','/felix/bpf/hook/*.go','/felix/bpf/ifstate/*.go','/felix/bpf/ipfrags/*.go','/felix/bpf/ipsets/*.go','/felix/bpf/jump/*.go','/felix/bpf/legacy/*.go','/felix/bpf/libbpf/*.go','/felix/bpf/maps/*.go','/felix/bpf/nat/*.go','/felix/bpf/perf/*.go','/felix/bpf/polprog/*.go','/felix/bpf/profiling/*.go','/felix/bpf/proxy/*.go','/felix/bpf/qos/*.go','/felix/bpf/routes/*.go','/felix/bpf/state/*.go','/felix/bpf/tc/*.go','/felix/bpf/tc/defs/*.go','/felix/bpf/utils/*.go','/felix/bpf/xdp/*.go','/felix/cachingmap/*.go','/felix/calc/*.go','/felix/cmd/calico-bpf/commands/*.go','/felix/collector/*.go','/felix/collector/flowlog/*.go','/felix/collector/goldmane/*.go','/felix/collector/local/*.go','/felix/collector/types/*.go','/felix/collector/types/counter/*.go','/felix/collector/types/endpoint/*.go','/felix/collector/types/metric/*.go','/felix/collector/types/tuple/*.go','/felix/collector/utils/*.go','/felix/config/*.go','/felix/conntrack/*.go','/felix/daemon/*.go','/felix/dataplane/*.go','/felix/dataplane/common/*.go','/felix/dataplane/external/*.go','/felix/dataplane/inactive/*.go','/felix/dataplane/ipsets/*.go','/felix/dataplane/linux/*.go','/felix/dataplane/linux/dataplanedefs/*.go','/felix/dataplane/linux/qos/*.go','/felix/deltatracker/*.go','/felix/dispatcher/*.go','/felix/environment/*.go','/felix/ethtool/*.go','/felix/generictables/*.go','/felix/hashutils/*.go','/felix/idalloc/*.go','/felix/ifacemonitor/*.go','/felix/ip/*.go','/felix/ipsets/*.go','/felix/iptables/*.go','/felix/iptables/cmdshim/*.go','/felix/jitter/*.go','/felix/k8sutils/*.go','/felix/labelindex/*.go','/felix/labelindex/ipsetmember/*.go','/felix/labelindex/labelnamevalueindex/*.go','/felix/labelindex/labelrestrictionindex/*.go','/felix/linkaddrs/*.go','/felix/logutils/*.go','/felix/markbits/*.go','/felix/multidict/*.go','/felix/netlinkshim/*.go','/felix/netlinkshim/handlemgr/*.go','/felix/nfnetlink/*.go','/felix/nfnetlink/nfnl/*.go','/felix/nfnetlink/pkt/*.go','/felix/nftables/*.go','/felix/policysync/*.go','/felix/proto/*.go','/felix/proto/protoconv/*.go','/felix/routerule/*.go','/felix/routetable/*.go','/felix/routetable/ownershippol/*.go','/felix/rules/*.go','/felix/serviceindex/*.go','/felix/statusrep/*.go','/felix/stringutils/*.go','/felix/throttle/*.go','/felix/timeshim/*.go','/felix/types/*.go','/felix/usagerep/*.go','/felix/vxlanfdb/*.go','/felix/wireguard/*.go','/goldmane/pkg/client/*.go','/goldmane/pkg/goldmane/*.go','/goldmane/pkg/internal/flowcache/*.go','/goldmane/pkg/server/*.go','/goldmane/pkg/storage/*.go','/goldmane/pkg/stream/*.go','/goldmane/pkg/types/*.go','/goldmane/proto/*.go','/hack/test/certs/','/lib.Makefile','/lib/std/chanutil/*.go','/lib/std/time/*.go','/lib/std/uniquelabels/*.go','/lib/std/uniquestr/*.go','/libcalico-go/config/*.go','/libcalico-go/lib/apiconfig/*.go','/libcalico-go/lib/apis/v1/*.go','/libcalico-go/lib/apis/v1/unversioned/*.go','/libcalico-go/lib/apis/v3/*.go','/libcalico-go/lib/backend/*.go','/libcalico-go/lib/backend/api/*.go','/libcalico-go/lib/backend/encap/*.go','/libcalico-go/lib/backend/etcdv3/*.go','/libcalico-go/lib/backend/k8s/*.go','/libcalico-go/lib/backend/k8s/conversion/*.go','/libcalico-go/lib/backend/k8s/resources/*.go','/libcalico-go/lib/backend/k8s/scheme/*.go','/libcalico-go/lib/backend/model/*.go','/libcalico-go/lib/backend/syncersv1/bgpsyncer/*.go','/libcalico-go/lib/backend/syncersv1/dedupebuffer/*.go','/libcalico-go/lib/backend/syncersv1/felixsyncer/*.go','/libcalico-go/lib/backend/syncersv1/nodestatussyncer/*.go','/libcalico-go/lib/backend/syncersv1/tunnelipsyncer/*.go','/libcalico-go/lib/backend/syncersv1/updateprocessors/*.go','/libcalico-go/lib/backend/watchersyncer/*.go','/libcalico-go/lib/clientv3/*.go','/libcalico-go/lib/consistenthash/*.go','/libcalico-go/lib/debugserver/*.go','/libcalico-go/lib/dispatcher/*.go','/libcalico-go/lib/epstatusfile/*.go','/libcalico-go/lib/errors/*.go','/libcalico-go/lib/hash/*.go','/libcalico-go/lib/health/*.go','/libcalico-go/lib/ipam/*.go','/libcalico-go/lib/json/*.go','/libcalico-go/lib/logutils/*.go','/libcalico-go/lib/metricsserver/*.go','/libcalico-go/lib/names/*.go','/libcalico-go/lib/namespace/*.go','/libcalico-go/lib/net/*.go','/libcalico-go/lib/netlinkutils/*.go','/libcalico-go/lib/options/*.go','/libcalico-go/lib/packedmap/*.go','/libcalico-go/lib/prometheus/*.go','/libcalico-go/lib/readlogger/*.go','/libcalico-go/lib/resources/*.go','/libcalico-go/lib/scope/*.go','/libcalico-go/lib/selector/*.go','/libcalico-go/lib/selector/parser/*.go','/libcalico-go/lib/selector/tokenizer/*.go','/libcalico-go/lib/set/*.go','/libcalico-go/lib/validator/v1/*.go','/libcalico-go/lib/validator/v3/*.go','/libcalico-go/lib/watch/*.go','/libcalico-go/lib/winutils/*.go','/metadata.mk','/node/**','/pkg/buildinfo/*.go','/pod2daemon/binder/*.go','/typha/pkg/discovery/*.go','/typha/pkg/syncclient/*.go','/typha/pkg/syncclientutils/*.go','/typha/pkg/syncproto/*.go','/typha/pkg/tlsutils/*.go'], {pipeline_file: 'ignore', exclude: ['/**/*.md','/**/.gitignore','/**/AUTHORS*','/**/CONTRIBUTING*','/**/DEVELOPER_GUIDE*','/**/LICENSE*','/**/README*','/**/SECURITY.md','/api/**/*_test.go','/app-policy/**/*_test.go','/cni-plugin/**/*_test.go','/confd/**/*_test.go','/crypto/**/*_test.go','/felix/**/*_test.go','/goldmane/**/*_test.go','/lib/**/*_test.go','/libcalico-go/**/*_test.go','/pkg/**/*_test.go','/pod2daemon/**/*_test.go','/typha/**/*_test.go']})"
     dependencies:
       - "Node: Build"
     task:
@@ -1147,7 +1147,7 @@ blocks:
   - name: "Node: kind-cluster tests"
     run:
       # KinD tests also build and run all the other images.
-      when: "change_in(['/.semaphore/semaphore.yml.d/01-preamble.yml','/.semaphore/semaphore.yml.d/02-global_job_config.yml','/.semaphore/semaphore.yml.d/03-promotions.yml','/.semaphore/semaphore.yml.d/09-blocks.yml','/.semaphore/semaphore.yml.d/99-after_pipeline.yml','/.semaphore/semaphore.yml.d/blocks/20-node.yml','/.semaphore/vms/','/api/pkg/apis/projectcalico/v3/*.go','/api/pkg/lib/numorstring/*.go','/api/pkg/openapi/*.go','/apiserver/cmd/apiserver/*.go','/apiserver/cmd/apiserver/server/*.go','/apiserver/pkg/apiserver/*.go','/apiserver/pkg/printers/projectcalico/*.go','/apiserver/pkg/rbac/*.go','/apiserver/pkg/registry/projectcalico/authorizer/*.go','/apiserver/pkg/registry/projectcalico/bgpconfiguration/*.go','/apiserver/pkg/registry/projectcalico/bgpfilter/*.go','/apiserver/pkg/registry/projectcalico/bgppeer/*.go','/apiserver/pkg/registry/projectcalico/blockaffinity/*.go','/apiserver/pkg/registry/projectcalico/caliconodestatus/*.go','/apiserver/pkg/registry/projectcalico/clusterinformation/*.go','/apiserver/pkg/registry/projectcalico/felixconfig/*.go','/apiserver/pkg/registry/projectcalico/globalnetworkset/*.go','/apiserver/pkg/registry/projectcalico/globalpolicy/*.go','/apiserver/pkg/registry/projectcalico/hostendpoint/*.go','/apiserver/pkg/registry/projectcalico/ipamconfig/*.go','/apiserver/pkg/registry/projectcalico/ippool/*.go','/apiserver/pkg/registry/projectcalico/ipreservation/*.go','/apiserver/pkg/registry/projectcalico/kubecontrollersconfig/*.go','/apiserver/pkg/registry/projectcalico/networkpolicy/*.go','/apiserver/pkg/registry/projectcalico/networkset/*.go','/apiserver/pkg/registry/projectcalico/profile/*.go','/apiserver/pkg/registry/projectcalico/rest/*.go','/apiserver/pkg/registry/projectcalico/server/*.go','/apiserver/pkg/registry/projectcalico/stagedglobalnetworkpolicy/*.go','/apiserver/pkg/registry/projectcalico/stagedkubernetesnetworkpolicy/*.go','/apiserver/pkg/registry/projectcalico/stagednetworkpolicy/*.go','/apiserver/pkg/registry/projectcalico/tier/*.go','/apiserver/pkg/registry/projectcalico/util/*.go','/apiserver/pkg/storage/calico/*.go','/apiserver/pkg/storage/etcd/*.go','/app-policy/checker/*.go','/app-policy/policystore/*.go','/app-policy/types/*.go','/calicoctl/calicoctl/*.go','/calicoctl/calicoctl/commands/*.go','/calicoctl/calicoctl/commands/argutils/*.go','/calicoctl/calicoctl/commands/clientmgr/*.go','/calicoctl/calicoctl/commands/cluster/*.go','/calicoctl/calicoctl/commands/common/*.go','/calicoctl/calicoctl/commands/constants/*.go','/calicoctl/calicoctl/commands/datastore/*.go','/calicoctl/calicoctl/commands/datastore/migrate/*.go','/calicoctl/calicoctl/commands/file/*.go','/calicoctl/calicoctl/commands/ipam/*.go','/calicoctl/calicoctl/commands/node/*.go','/calicoctl/calicoctl/resourcemgr/*.go','/calicoctl/calicoctl/util/*.go','/calicoctl/calicoctl/util/yaml/*.go','/calicoctl/tests/fv/helper/*.go','/cni-plugin/cmd/calico/*.go','/cni-plugin/cmd/install/*.go','/cni-plugin/internal/pkg/azure/*.go','/cni-plugin/internal/pkg/utils/*.go','/cni-plugin/internal/pkg/utils/cri/*.go','/cni-plugin/pkg/dataplane/*.go','/cni-plugin/pkg/dataplane/grpc/*.go','/cni-plugin/pkg/dataplane/grpc/proto/*.go','/cni-plugin/pkg/dataplane/linux/*.go','/cni-plugin/pkg/install/*.go','/cni-plugin/pkg/ipamplugin/*.go','/cni-plugin/pkg/k8s/*.go','/cni-plugin/pkg/plugin/*.go','/cni-plugin/pkg/types/*.go','/cni-plugin/pkg/upgrade/*.go','/cni-plugin/pkg/wait/*.go','/cni-plugin/tests/*.go','/confd/etc','/confd/pkg/backends/*.go','/confd/pkg/backends/calico/*.go','/confd/pkg/backends/types/*.go','/confd/pkg/config/*.go','/confd/pkg/log/*.go','/confd/pkg/resource/template/*.go','/confd/pkg/run/*.go','/crypto/pkg/tls/*.go','/felix/aws/*.go','/felix/bpf-apache','/felix/bpf-gpl','/felix/bpf/*.go','/felix/bpf/arp/*.go','/felix/bpf/asm/*.go','/felix/bpf/bpfdefs/*.go','/felix/bpf/bpfmap/*.go','/felix/bpf/conntrack/*.go','/felix/bpf/conntrack/cleanupv1/*.go','/felix/bpf/conntrack/timeouts/*.go','/felix/bpf/conntrack/v2/*.go','/felix/bpf/conntrack/v3/*.go','/felix/bpf/conntrack/v4/*.go','/felix/bpf/consistenthash/*.go','/felix/bpf/counters/*.go','/felix/bpf/events/*.go','/felix/bpf/failsafes/*.go','/felix/bpf/filter/*.go','/felix/bpf/hook/*.go','/felix/bpf/ifstate/*.go','/felix/bpf/ipsets/*.go','/felix/bpf/jump/*.go','/felix/bpf/legacy/*.go','/felix/bpf/libbpf/*.go','/felix/bpf/maps/*.go','/felix/bpf/nat/*.go','/felix/bpf/perf/*.go','/felix/bpf/polprog/*.go','/felix/bpf/profiling/*.go','/felix/bpf/proxy/*.go','/felix/bpf/qos/*.go','/felix/bpf/routes/*.go','/felix/bpf/state/*.go','/felix/bpf/tc/*.go','/felix/bpf/tc/defs/*.go','/felix/bpf/utils/*.go','/felix/bpf/xdp/*.go','/felix/cachingmap/*.go','/felix/calc/*.go','/felix/cmd/calico-bpf/commands/*.go','/felix/collector/*.go','/felix/collector/flowlog/*.go','/felix/collector/goldmane/*.go','/felix/collector/local/*.go','/felix/collector/types/*.go','/felix/collector/types/counter/*.go','/felix/collector/types/endpoint/*.go','/felix/collector/types/metric/*.go','/felix/collector/types/tuple/*.go','/felix/collector/utils/*.go','/felix/config/*.go','/felix/conntrack/*.go','/felix/daemon/*.go','/felix/dataplane/*.go','/felix/dataplane/common/*.go','/felix/dataplane/external/*.go','/felix/dataplane/inactive/*.go','/felix/dataplane/ipsets/*.go','/felix/dataplane/linux/*.go','/felix/dataplane/linux/dataplanedefs/*.go','/felix/dataplane/linux/qos/*.go','/felix/deltatracker/*.go','/felix/dispatcher/*.go','/felix/environment/*.go','/felix/ethtool/*.go','/felix/generictables/*.go','/felix/hashutils/*.go','/felix/idalloc/*.go','/felix/ifacemonitor/*.go','/felix/ip/*.go','/felix/ipsets/*.go','/felix/iptables/*.go','/felix/iptables/cmdshim/*.go','/felix/jitter/*.go','/felix/k8sutils/*.go','/felix/labelindex/*.go','/felix/labelindex/ipsetmember/*.go','/felix/labelindex/labelnamevalueindex/*.go','/felix/labelindex/labelrestrictionindex/*.go','/felix/linkaddrs/*.go','/felix/logutils/*.go','/felix/markbits/*.go','/felix/multidict/*.go','/felix/netlinkshim/*.go','/felix/netlinkshim/handlemgr/*.go','/felix/nfnetlink/*.go','/felix/nfnetlink/nfnl/*.go','/felix/nfnetlink/pkt/*.go','/felix/nftables/*.go','/felix/policysync/*.go','/felix/proto/*.go','/felix/proto/protoconv/*.go','/felix/routerule/*.go','/felix/routetable/*.go','/felix/routetable/ownershippol/*.go','/felix/rules/*.go','/felix/serviceindex/*.go','/felix/statusrep/*.go','/felix/stringutils/*.go','/felix/throttle/*.go','/felix/timeshim/*.go','/felix/types/*.go','/felix/usagerep/*.go','/felix/vxlanfdb/*.go','/felix/wireguard/*.go','/goldmane/cmd/*.go','/goldmane/cmd/flowgen/*.go','/goldmane/cmd/health/*.go','/goldmane/cmd/stream/*.go','/goldmane/pkg/client/*.go','/goldmane/pkg/daemon/*.go','/goldmane/pkg/emitter/*.go','/goldmane/pkg/flowgen/*.go','/goldmane/pkg/goldmane/*.go','/goldmane/pkg/internal/flowcache/*.go','/goldmane/pkg/internal/utils/*.go','/goldmane/pkg/server/*.go','/goldmane/pkg/storage/*.go','/goldmane/pkg/stream/*.go','/goldmane/pkg/types/*.go','/goldmane/proto/*.go','/hack/test/certs/','/kube-controllers/cmd/check-status/*.go','/kube-controllers/cmd/kube-controllers/*.go','/kube-controllers/cmd/wrapper/*.go','/kube-controllers/pkg/cache/*.go','/kube-controllers/pkg/config/*.go','/kube-controllers/pkg/controllers/controller/*.go','/kube-controllers/pkg/controllers/flannelmigration/*.go','/kube-controllers/pkg/controllers/loadbalancer/*.go','/kube-controllers/pkg/controllers/namespace/*.go','/kube-controllers/pkg/controllers/networkpolicy/*.go','/kube-controllers/pkg/controllers/node/*.go','/kube-controllers/pkg/controllers/pod/*.go','/kube-controllers/pkg/controllers/serviceaccount/*.go','/kube-controllers/pkg/controllers/utils/*.go','/kube-controllers/pkg/converter/*.go','/kube-controllers/pkg/status/*.go','/lib.Makefile','/lib/httpmachinery/pkg/apiutil/*.go','/lib/httpmachinery/pkg/codec/*.go','/lib/httpmachinery/pkg/context/*.go','/lib/httpmachinery/pkg/header/*.go','/lib/httpmachinery/pkg/server/*.go','/lib/httpmachinery/pkg/server/adaptors/gorilla/*.go','/lib/std/chanutil/*.go','/lib/std/time/*.go','/lib/std/uniquelabels/*.go','/lib/std/uniquestr/*.go','/libcalico-go/config/*.go','/libcalico-go/lib/apiconfig/*.go','/libcalico-go/lib/apis/v1/*.go','/libcalico-go/lib/apis/v1/unversioned/*.go','/libcalico-go/lib/apis/v3/*.go','/libcalico-go/lib/backend/*.go','/libcalico-go/lib/backend/api/*.go','/libcalico-go/lib/backend/encap/*.go','/libcalico-go/lib/backend/etcdv3/*.go','/libcalico-go/lib/backend/k8s/*.go','/libcalico-go/lib/backend/k8s/conversion/*.go','/libcalico-go/lib/backend/k8s/resources/*.go','/libcalico-go/lib/backend/k8s/scheme/*.go','/libcalico-go/lib/backend/model/*.go','/libcalico-go/lib/backend/syncersv1/bgpsyncer/*.go','/libcalico-go/lib/backend/syncersv1/dedupebuffer/*.go','/libcalico-go/lib/backend/syncersv1/felixsyncer/*.go','/libcalico-go/lib/backend/syncersv1/nodestatussyncer/*.go','/libcalico-go/lib/backend/syncersv1/tunnelipsyncer/*.go','/libcalico-go/lib/backend/syncersv1/updateprocessors/*.go','/libcalico-go/lib/backend/watchersyncer/*.go','/libcalico-go/lib/clientv3/*.go','/libcalico-go/lib/consistenthash/*.go','/libcalico-go/lib/debugserver/*.go','/libcalico-go/lib/dispatcher/*.go','/libcalico-go/lib/epstatusfile/*.go','/libcalico-go/lib/errors/*.go','/libcalico-go/lib/hash/*.go','/libcalico-go/lib/health/*.go','/libcalico-go/lib/ipam/*.go','/libcalico-go/lib/json/*.go','/libcalico-go/lib/logutils/*.go','/libcalico-go/lib/metricsserver/*.go','/libcalico-go/lib/multireadbuf/*.go','/libcalico-go/lib/names/*.go','/libcalico-go/lib/namespace/*.go','/libcalico-go/lib/net/*.go','/libcalico-go/lib/netlinkutils/*.go','/libcalico-go/lib/options/*.go','/libcalico-go/lib/packedmap/*.go','/libcalico-go/lib/prometheus/*.go','/libcalico-go/lib/readlogger/*.go','/libcalico-go/lib/resources/*.go','/libcalico-go/lib/scope/*.go','/libcalico-go/lib/selector/*.go','/libcalico-go/lib/selector/parser/*.go','/libcalico-go/lib/selector/tokenizer/*.go','/libcalico-go/lib/set/*.go','/libcalico-go/lib/validator/v1/*.go','/libcalico-go/lib/validator/v3/*.go','/libcalico-go/lib/watch/*.go','/libcalico-go/lib/winutils/*.go','/libcalico-go/lib/writelogger/*.go','/metadata.mk','/node/**','/node/pkg/cni/*.go','/pkg/buildinfo/*.go','/pkg/cmdwrapper/*.go','/pod2daemon/binder/*.go','/pod2daemon/csidriver/*.go','/pod2daemon/csidriver/driver/*.go','/pod2daemon/flexvol/*.go','/pod2daemon/flexvol/creds/*.go','/pod2daemon/nodeagent/*.go','/pod2daemon/proto/*.go','/pod2daemon/workloadapi/*.go','/typha/cmd/calico-typha/*.go','/typha/cmd/typha-client/*.go','/typha/pkg/calc/*.go','/typha/pkg/config/*.go','/typha/pkg/daemon/*.go','/typha/pkg/discovery/*.go','/typha/pkg/jitter/*.go','/typha/pkg/k8s/*.go','/typha/pkg/logutils/*.go','/typha/pkg/promutils/*.go','/typha/pkg/snapcache/*.go','/typha/pkg/syncclient/*.go','/typha/pkg/syncclientutils/*.go','/typha/pkg/syncproto/*.go','/typha/pkg/syncserver/*.go','/typha/pkg/tlsutils/*.go','/whisker','/whisker-backend/cmd/*.go','/whisker-backend/cmd/app/*.go','/whisker-backend/pkg/apis/v1/*.go','/whisker-backend/pkg/config/*.go','/whisker-backend/pkg/handlers/v1/*.go','apiserver/**/*Dockerfile*','apiserver/Makefile','apiserver/deps.txt','calicoctl/**/*Dockerfile*','calicoctl/Makefile','calicoctl/deps.txt','cni-plugin/**/*Dockerfile*','cni-plugin/Makefile','cni-plugin/deps.txt','goldmane/**/*Dockerfile*','goldmane/Makefile','goldmane/deps.txt','kube-controllers/**/*Dockerfile*','kube-controllers/Makefile','kube-controllers/deps.txt','pod2daemon/**/*Dockerfile*','pod2daemon/Makefile','pod2daemon/deps.txt','typha/**/*Dockerfile*','typha/Makefile','typha/deps.txt','whisker-backend/**/*Dockerfile*','whisker-backend/Makefile','whisker-backend/deps.txt','whisker/**/*Dockerfile*','whisker/Makefile','whisker/deps.txt'], {pipeline_file: 'ignore', exclude: ['/**/*.md','/**/.gitignore','/**/AUTHORS*','/**/CONTRIBUTING*','/**/DEVELOPER_GUIDE*','/**/LICENSE*','/**/README*','/**/SECURITY.md','/api/**/*_test.go','/apiserver/**/*_test.go','/app-policy/**/*_test.go','/calicoctl/**/*_test.go','/cni-plugin/**/*_test.go','/confd/**/*_test.go','/crypto/**/*_test.go','/felix/**/*_test.go','/goldmane/**/*_test.go','/kube-controllers/**/*_test.go','/lib/**/*_test.go','/libcalico-go/**/*_test.go','/pkg/**/*_test.go','/pod2daemon/**/*_test.go','/typha/**/*_test.go','/whisker-backend/**/*_test.go']})"
+      when: "change_in(['/.semaphore/semaphore.yml.d/01-preamble.yml','/.semaphore/semaphore.yml.d/02-global_job_config.yml','/.semaphore/semaphore.yml.d/03-promotions.yml','/.semaphore/semaphore.yml.d/09-blocks.yml','/.semaphore/semaphore.yml.d/99-after_pipeline.yml','/.semaphore/semaphore.yml.d/blocks/20-node.yml','/.semaphore/vms/','/api/pkg/apis/projectcalico/v3/*.go','/api/pkg/lib/numorstring/*.go','/api/pkg/openapi/*.go','/apiserver/cmd/apiserver/*.go','/apiserver/cmd/apiserver/server/*.go','/apiserver/pkg/apiserver/*.go','/apiserver/pkg/printers/projectcalico/*.go','/apiserver/pkg/rbac/*.go','/apiserver/pkg/registry/projectcalico/authorizer/*.go','/apiserver/pkg/registry/projectcalico/bgpconfiguration/*.go','/apiserver/pkg/registry/projectcalico/bgpfilter/*.go','/apiserver/pkg/registry/projectcalico/bgppeer/*.go','/apiserver/pkg/registry/projectcalico/blockaffinity/*.go','/apiserver/pkg/registry/projectcalico/caliconodestatus/*.go','/apiserver/pkg/registry/projectcalico/clusterinformation/*.go','/apiserver/pkg/registry/projectcalico/felixconfig/*.go','/apiserver/pkg/registry/projectcalico/globalnetworkset/*.go','/apiserver/pkg/registry/projectcalico/globalpolicy/*.go','/apiserver/pkg/registry/projectcalico/hostendpoint/*.go','/apiserver/pkg/registry/projectcalico/ipamconfig/*.go','/apiserver/pkg/registry/projectcalico/ippool/*.go','/apiserver/pkg/registry/projectcalico/ipreservation/*.go','/apiserver/pkg/registry/projectcalico/kubecontrollersconfig/*.go','/apiserver/pkg/registry/projectcalico/networkpolicy/*.go','/apiserver/pkg/registry/projectcalico/networkset/*.go','/apiserver/pkg/registry/projectcalico/profile/*.go','/apiserver/pkg/registry/projectcalico/rest/*.go','/apiserver/pkg/registry/projectcalico/server/*.go','/apiserver/pkg/registry/projectcalico/stagedglobalnetworkpolicy/*.go','/apiserver/pkg/registry/projectcalico/stagedkubernetesnetworkpolicy/*.go','/apiserver/pkg/registry/projectcalico/stagednetworkpolicy/*.go','/apiserver/pkg/registry/projectcalico/tier/*.go','/apiserver/pkg/registry/projectcalico/util/*.go','/apiserver/pkg/storage/calico/*.go','/apiserver/pkg/storage/etcd/*.go','/app-policy/checker/*.go','/app-policy/policystore/*.go','/app-policy/types/*.go','/calicoctl/calicoctl/*.go','/calicoctl/calicoctl/commands/*.go','/calicoctl/calicoctl/commands/argutils/*.go','/calicoctl/calicoctl/commands/clientmgr/*.go','/calicoctl/calicoctl/commands/cluster/*.go','/calicoctl/calicoctl/commands/common/*.go','/calicoctl/calicoctl/commands/constants/*.go','/calicoctl/calicoctl/commands/datastore/*.go','/calicoctl/calicoctl/commands/datastore/migrate/*.go','/calicoctl/calicoctl/commands/file/*.go','/calicoctl/calicoctl/commands/ipam/*.go','/calicoctl/calicoctl/commands/node/*.go','/calicoctl/calicoctl/resourcemgr/*.go','/calicoctl/calicoctl/util/*.go','/calicoctl/calicoctl/util/yaml/*.go','/calicoctl/tests/fv/helper/*.go','/cni-plugin/cmd/calico/*.go','/cni-plugin/cmd/install/*.go','/cni-plugin/internal/pkg/azure/*.go','/cni-plugin/internal/pkg/utils/*.go','/cni-plugin/internal/pkg/utils/cri/*.go','/cni-plugin/pkg/dataplane/*.go','/cni-plugin/pkg/dataplane/grpc/*.go','/cni-plugin/pkg/dataplane/grpc/proto/*.go','/cni-plugin/pkg/dataplane/linux/*.go','/cni-plugin/pkg/install/*.go','/cni-plugin/pkg/ipamplugin/*.go','/cni-plugin/pkg/k8s/*.go','/cni-plugin/pkg/plugin/*.go','/cni-plugin/pkg/types/*.go','/cni-plugin/pkg/upgrade/*.go','/cni-plugin/pkg/wait/*.go','/cni-plugin/tests/*.go','/confd/etc','/confd/pkg/backends/*.go','/confd/pkg/backends/calico/*.go','/confd/pkg/backends/types/*.go','/confd/pkg/config/*.go','/confd/pkg/log/*.go','/confd/pkg/resource/template/*.go','/confd/pkg/run/*.go','/crypto/pkg/tls/*.go','/felix/aws/*.go','/felix/bpf-apache','/felix/bpf-gpl','/felix/bpf/*.go','/felix/bpf/arp/*.go','/felix/bpf/asm/*.go','/felix/bpf/bpfdefs/*.go','/felix/bpf/bpfmap/*.go','/felix/bpf/conntrack/*.go','/felix/bpf/conntrack/cleanupv1/*.go','/felix/bpf/conntrack/timeouts/*.go','/felix/bpf/conntrack/v2/*.go','/felix/bpf/conntrack/v3/*.go','/felix/bpf/conntrack/v4/*.go','/felix/bpf/consistenthash/*.go','/felix/bpf/counters/*.go','/felix/bpf/events/*.go','/felix/bpf/failsafes/*.go','/felix/bpf/filter/*.go','/felix/bpf/hook/*.go','/felix/bpf/ifstate/*.go','/felix/bpf/ipfrags/*.go','/felix/bpf/ipsets/*.go','/felix/bpf/jump/*.go','/felix/bpf/legacy/*.go','/felix/bpf/libbpf/*.go','/felix/bpf/maps/*.go','/felix/bpf/nat/*.go','/felix/bpf/perf/*.go','/felix/bpf/polprog/*.go','/felix/bpf/profiling/*.go','/felix/bpf/proxy/*.go','/felix/bpf/qos/*.go','/felix/bpf/routes/*.go','/felix/bpf/state/*.go','/felix/bpf/tc/*.go','/felix/bpf/tc/defs/*.go','/felix/bpf/utils/*.go','/felix/bpf/xdp/*.go','/felix/cachingmap/*.go','/felix/calc/*.go','/felix/cmd/calico-bpf/commands/*.go','/felix/collector/*.go','/felix/collector/flowlog/*.go','/felix/collector/goldmane/*.go','/felix/collector/local/*.go','/felix/collector/types/*.go','/felix/collector/types/counter/*.go','/felix/collector/types/endpoint/*.go','/felix/collector/types/metric/*.go','/felix/collector/types/tuple/*.go','/felix/collector/utils/*.go','/felix/config/*.go','/felix/conntrack/*.go','/felix/daemon/*.go','/felix/dataplane/*.go','/felix/dataplane/common/*.go','/felix/dataplane/external/*.go','/felix/dataplane/inactive/*.go','/felix/dataplane/ipsets/*.go','/felix/dataplane/linux/*.go','/felix/dataplane/linux/dataplanedefs/*.go','/felix/dataplane/linux/qos/*.go','/felix/deltatracker/*.go','/felix/dispatcher/*.go','/felix/environment/*.go','/felix/ethtool/*.go','/felix/generictables/*.go','/felix/hashutils/*.go','/felix/idalloc/*.go','/felix/ifacemonitor/*.go','/felix/ip/*.go','/felix/ipsets/*.go','/felix/iptables/*.go','/felix/iptables/cmdshim/*.go','/felix/jitter/*.go','/felix/k8sutils/*.go','/felix/labelindex/*.go','/felix/labelindex/ipsetmember/*.go','/felix/labelindex/labelnamevalueindex/*.go','/felix/labelindex/labelrestrictionindex/*.go','/felix/linkaddrs/*.go','/felix/logutils/*.go','/felix/markbits/*.go','/felix/multidict/*.go','/felix/netlinkshim/*.go','/felix/netlinkshim/handlemgr/*.go','/felix/nfnetlink/*.go','/felix/nfnetlink/nfnl/*.go','/felix/nfnetlink/pkt/*.go','/felix/nftables/*.go','/felix/policysync/*.go','/felix/proto/*.go','/felix/proto/protoconv/*.go','/felix/routerule/*.go','/felix/routetable/*.go','/felix/routetable/ownershippol/*.go','/felix/rules/*.go','/felix/serviceindex/*.go','/felix/statusrep/*.go','/felix/stringutils/*.go','/felix/throttle/*.go','/felix/timeshim/*.go','/felix/types/*.go','/felix/usagerep/*.go','/felix/vxlanfdb/*.go','/felix/wireguard/*.go','/goldmane/cmd/*.go','/goldmane/cmd/flowgen/*.go','/goldmane/cmd/health/*.go','/goldmane/cmd/stream/*.go','/goldmane/pkg/client/*.go','/goldmane/pkg/daemon/*.go','/goldmane/pkg/emitter/*.go','/goldmane/pkg/flowgen/*.go','/goldmane/pkg/goldmane/*.go','/goldmane/pkg/internal/flowcache/*.go','/goldmane/pkg/internal/utils/*.go','/goldmane/pkg/server/*.go','/goldmane/pkg/storage/*.go','/goldmane/pkg/stream/*.go','/goldmane/pkg/types/*.go','/goldmane/proto/*.go','/hack/test/certs/','/kube-controllers/cmd/check-status/*.go','/kube-controllers/cmd/kube-controllers/*.go','/kube-controllers/cmd/wrapper/*.go','/kube-controllers/pkg/cache/*.go','/kube-controllers/pkg/config/*.go','/kube-controllers/pkg/controllers/controller/*.go','/kube-controllers/pkg/controllers/flannelmigration/*.go','/kube-controllers/pkg/controllers/loadbalancer/*.go','/kube-controllers/pkg/controllers/namespace/*.go','/kube-controllers/pkg/controllers/networkpolicy/*.go','/kube-controllers/pkg/controllers/node/*.go','/kube-controllers/pkg/controllers/pod/*.go','/kube-controllers/pkg/controllers/serviceaccount/*.go','/kube-controllers/pkg/controllers/utils/*.go','/kube-controllers/pkg/converter/*.go','/kube-controllers/pkg/status/*.go','/lib.Makefile','/lib/httpmachinery/pkg/apiutil/*.go','/lib/httpmachinery/pkg/codec/*.go','/lib/httpmachinery/pkg/context/*.go','/lib/httpmachinery/pkg/header/*.go','/lib/httpmachinery/pkg/server/*.go','/lib/httpmachinery/pkg/server/adaptors/gorilla/*.go','/lib/std/chanutil/*.go','/lib/std/time/*.go','/lib/std/uniquelabels/*.go','/lib/std/uniquestr/*.go','/libcalico-go/config/*.go','/libcalico-go/lib/apiconfig/*.go','/libcalico-go/lib/apis/v1/*.go','/libcalico-go/lib/apis/v1/unversioned/*.go','/libcalico-go/lib/apis/v3/*.go','/libcalico-go/lib/backend/*.go','/libcalico-go/lib/backend/api/*.go','/libcalico-go/lib/backend/encap/*.go','/libcalico-go/lib/backend/etcdv3/*.go','/libcalico-go/lib/backend/k8s/*.go','/libcalico-go/lib/backend/k8s/conversion/*.go','/libcalico-go/lib/backend/k8s/resources/*.go','/libcalico-go/lib/backend/k8s/scheme/*.go','/libcalico-go/lib/backend/model/*.go','/libcalico-go/lib/backend/syncersv1/bgpsyncer/*.go','/libcalico-go/lib/backend/syncersv1/dedupebuffer/*.go','/libcalico-go/lib/backend/syncersv1/felixsyncer/*.go','/libcalico-go/lib/backend/syncersv1/nodestatussyncer/*.go','/libcalico-go/lib/backend/syncersv1/tunnelipsyncer/*.go','/libcalico-go/lib/backend/syncersv1/updateprocessors/*.go','/libcalico-go/lib/backend/watchersyncer/*.go','/libcalico-go/lib/clientv3/*.go','/libcalico-go/lib/consistenthash/*.go','/libcalico-go/lib/debugserver/*.go','/libcalico-go/lib/dispatcher/*.go','/libcalico-go/lib/epstatusfile/*.go','/libcalico-go/lib/errors/*.go','/libcalico-go/lib/hash/*.go','/libcalico-go/lib/health/*.go','/libcalico-go/lib/ipam/*.go','/libcalico-go/lib/json/*.go','/libcalico-go/lib/logutils/*.go','/libcalico-go/lib/metricsserver/*.go','/libcalico-go/lib/multireadbuf/*.go','/libcalico-go/lib/names/*.go','/libcalico-go/lib/namespace/*.go','/libcalico-go/lib/net/*.go','/libcalico-go/lib/netlinkutils/*.go','/libcalico-go/lib/options/*.go','/libcalico-go/lib/packedmap/*.go','/libcalico-go/lib/prometheus/*.go','/libcalico-go/lib/readlogger/*.go','/libcalico-go/lib/resources/*.go','/libcalico-go/lib/scope/*.go','/libcalico-go/lib/selector/*.go','/libcalico-go/lib/selector/parser/*.go','/libcalico-go/lib/selector/tokenizer/*.go','/libcalico-go/lib/set/*.go','/libcalico-go/lib/validator/v1/*.go','/libcalico-go/lib/validator/v3/*.go','/libcalico-go/lib/watch/*.go','/libcalico-go/lib/winutils/*.go','/libcalico-go/lib/writelogger/*.go','/metadata.mk','/node/**','/node/pkg/cni/*.go','/pkg/buildinfo/*.go','/pkg/cmdwrapper/*.go','/pod2daemon/binder/*.go','/pod2daemon/csidriver/*.go','/pod2daemon/csidriver/driver/*.go','/pod2daemon/flexvol/*.go','/pod2daemon/flexvol/creds/*.go','/pod2daemon/nodeagent/*.go','/pod2daemon/proto/*.go','/pod2daemon/workloadapi/*.go','/typha/cmd/calico-typha/*.go','/typha/cmd/typha-client/*.go','/typha/pkg/calc/*.go','/typha/pkg/config/*.go','/typha/pkg/daemon/*.go','/typha/pkg/discovery/*.go','/typha/pkg/jitter/*.go','/typha/pkg/k8s/*.go','/typha/pkg/logutils/*.go','/typha/pkg/promutils/*.go','/typha/pkg/snapcache/*.go','/typha/pkg/syncclient/*.go','/typha/pkg/syncclientutils/*.go','/typha/pkg/syncproto/*.go','/typha/pkg/syncserver/*.go','/typha/pkg/tlsutils/*.go','/whisker','/whisker-backend/cmd/*.go','/whisker-backend/cmd/app/*.go','/whisker-backend/pkg/apis/v1/*.go','/whisker-backend/pkg/config/*.go','/whisker-backend/pkg/handlers/v1/*.go','apiserver/**/*Dockerfile*','apiserver/Makefile','apiserver/deps.txt','calicoctl/**/*Dockerfile*','calicoctl/Makefile','calicoctl/deps.txt','cni-plugin/**/*Dockerfile*','cni-plugin/Makefile','cni-plugin/deps.txt','goldmane/**/*Dockerfile*','goldmane/Makefile','goldmane/deps.txt','kube-controllers/**/*Dockerfile*','kube-controllers/Makefile','kube-controllers/deps.txt','pod2daemon/**/*Dockerfile*','pod2daemon/Makefile','pod2daemon/deps.txt','typha/**/*Dockerfile*','typha/Makefile','typha/deps.txt','whisker-backend/**/*Dockerfile*','whisker-backend/Makefile','whisker-backend/deps.txt','whisker/**/*Dockerfile*','whisker/Makefile','whisker/deps.txt'], {pipeline_file: 'ignore', exclude: ['/**/*.md','/**/.gitignore','/**/AUTHORS*','/**/CONTRIBUTING*','/**/DEVELOPER_GUIDE*','/**/LICENSE*','/**/README*','/**/SECURITY.md','/api/**/*_test.go','/apiserver/**/*_test.go','/app-policy/**/*_test.go','/calicoctl/**/*_test.go','/cni-plugin/**/*_test.go','/confd/**/*_test.go','/crypto/**/*_test.go','/felix/**/*_test.go','/goldmane/**/*_test.go','/kube-controllers/**/*_test.go','/lib/**/*_test.go','/libcalico-go/**/*_test.go','/pkg/**/*_test.go','/pod2daemon/**/*_test.go','/typha/**/*_test.go','/whisker-backend/**/*_test.go']})"
     dependencies:
       - "Prerequisites"
     task:
diff --git a/api/pkg/lib/numorstring/port.go b/api/pkg/lib/numorstring/port.go
index 822a9ce3433..de09ab4c088 100644
--- a/api/pkg/lib/numorstring/port.go
+++ b/api/pkg/lib/numorstring/port.go
@@ -28,6 +28,10 @@ import (
 //   - For a port range, set MinPort and MaxPort to the (inclusive) port numbers.  Set
 //     PortName to "".
 //   - For a single port, set MinPort = MaxPort and PortName = "".
+//
+// +kubebuilder:validation:Type=integer
+// +kubebuilder:validation:XIntOrString
+// +kubebuilder:validation:Pattern=`^.*`
 type Port struct {
 	MinPort  uint16 `json:"minPort,omitempty"`
 	MaxPort  uint16 `json:"maxPort,omitempty"`
diff --git a/api/pkg/lib/numorstring/protocol.go b/api/pkg/lib/numorstring/protocol.go
index 35f078243f3..27e0b3aa379 100644
--- a/api/pkg/lib/numorstring/protocol.go
+++ b/api/pkg/lib/numorstring/protocol.go
@@ -40,6 +40,9 @@ var (
 	}
 )
 
+// +kubebuilder:validation:Type=integer
+// +kubebuilder:validation:XIntOrString
+// +kubebuilder:validation:Pattern=`^.*`
 type Protocol Uint8OrString
 
 // ProtocolFromInt creates a Protocol struct from an integer value.
diff --git a/api/pkg/lib/numorstring/uint8orstring.go b/api/pkg/lib/numorstring/uint8orstring.go
index f3762c0fea0..a87524bc52f 100644
--- a/api/pkg/lib/numorstring/uint8orstring.go
+++ b/api/pkg/lib/numorstring/uint8orstring.go
@@ -23,6 +23,10 @@ import (
 // JSON or YAML marshalling and unmarshalling, it produces or consumes the
 // inner type.  This allows you to have, for example, a JSON field that can
 // accept a name or number.
+//
+// +kubebuilder:validation:Type=integer
+// +kubebuilder:validation:XIntOrString
+// +kubebuilder:validation:Pattern=`^.*`
 type Uint8OrString struct {
 	Type   NumOrStringType `json:"type"`
 	NumVal uint8           `json:"numVal"`
diff --git a/felix/bpf/asm/opcode_string.go b/felix/bpf/asm/opcode_string.go
index 134d934166d..712c4c7cb0c 100644
--- a/felix/bpf/asm/opcode_string.go
+++ b/felix/bpf/asm/opcode_string.go
@@ -273,8 +273,9 @@ const _Reg_name = "R0R1R2R3R4R5R6R7R8R9R10"
 var _Reg_index = [...]uint8{0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 23}
 
 func (i Reg) String() string {
-	if i < 0 || i >= Reg(len(_Reg_index)-1) {
+	idx := int(i) - 0
+	if i < 0 || idx >= len(_Reg_index)-1 {
 		return "Reg(" + strconv.FormatInt(int64(i), 10) + ")"
 	}
-	return _Reg_name[_Reg_index[i]:_Reg_index[i+1]]
+	return _Reg_name[_Reg_index[idx]:_Reg_index[idx+1]]
 }
diff --git a/felix/docs/config-params.json b/felix/docs/config-params.json
index a09cc7d193b..77d6312abb6 100644
--- a/felix/docs/config-params.json
+++ b/felix/docs/config-params.json
@@ -1878,7 +1878,7 @@
           "ParsedDefault": "0",
           "ParsedDefaultJSON": "0",
           "ParsedType": "numorstring.Port",
-          "YAMLType": "integer or string",
+          "YAMLType": "integer",
           "YAMLSchema": "String.",
           "YAMLEnumValues": null,
           "YAMLSchemaHTML": "String.",
@@ -3834,7 +3834,7 @@
           "ParsedDefault": "20000:29999",
           "ParsedDefaultJSON": "\"20000:29999\"",
           "ParsedType": "numorstring.Port",
-          "YAMLType": "integer or string",
+          "YAMLType": "integer",
           "YAMLSchema": "String.",
           "YAMLEnumValues": null,
           "YAMLSchemaHTML": "String.",
diff --git a/lib.Makefile b/lib.Makefile
index b45cd3d5e65..46c85eda9a7 100644
--- a/lib.Makefile
+++ b/lib.Makefile
@@ -135,7 +135,7 @@ endif
 # For building, we use the go-build image for the *host* architecture, even if the target is different
 # the one for the host should contain all the necessary cross-compilation tools
 # we do not need to use the arch since go-build:v0.15 now is multi-arch manifest
-GO_BUILD_IMAGE ?= calico/go-build
+GO_BUILD_IMAGE ?= jha48/go-build
 CALICO_BUILD    = $(GO_BUILD_IMAGE):$(GO_BUILD_VER)
 
 
diff --git a/libcalico-go/Makefile b/libcalico-go/Makefile
index d5b966e296b..960e4c76485 100644
--- a/libcalico-go/Makefile
+++ b/libcalico-go/Makefile
@@ -48,9 +48,9 @@ gen-files: gen-crds
 gen-crds:
 	rm -rf config/crd
 	# Generate CRDs without descriptions
-	$(DOCKER_GO_BUILD) sh -c '$(GIT_CONFIG_SSH) controller-gen crd:allowDangerousTypes=true,crdVersions=v1,deprecatedV1beta1CompatibilityPreserveUnknownFields=false,maxDescLen=0 paths=./lib/apis/... output:crd:dir=config/crd/'
+	$(DOCKER_GO_BUILD) sh -c '$(GIT_CONFIG_SSH) controller-gen crd:allowDangerousTypes=true,crdVersions=v1,deprecatedV1beta1CompatibilityPreserveUnknownFields=false,maxDescLen=0 paths=./lib/apis/crd.projectcalico.org/... output:crd:dir=config/crd/'
 	# Generate CRDs with descriptions, and place them into a temp directory
-	$(DOCKER_GO_BUILD) sh -c '$(GIT_CONFIG_SSH) controller-gen crd:allowDangerousTypes=true,crdVersions=v1,deprecatedV1beta1CompatibilityPreserveUnknownFields=false paths=./lib/apis/... output:crd:dir=config/crd/crd-felix'
+	$(DOCKER_GO_BUILD) sh -c '$(GIT_CONFIG_SSH) controller-gen crd:allowDangerousTypes=true,crdVersions=v1,deprecatedV1beta1CompatibilityPreserveUnknownFields=false paths=./lib/apis/crd.projectcalico.org/... output:crd:dir=config/crd/crd-felix'
 	# Copy over felix CRD with descriptions
 	cp config/crd/crd-felix/crd.projectcalico.org_felixconfigurations.yaml config/crd
 	# Cleanup
diff --git a/libcalico-go/config/crd/crd.projectcalico.org_bgpconfigurations.yaml b/libcalico-go/config/crd/crd.projectcalico.org_bgpconfigurations.yaml
index 1d10c04c90d..68db6b66cbd 100644
--- a/libcalico-go/config/crd/crd.projectcalico.org_bgpconfigurations.yaml
+++ b/libcalico-go/config/crd/crd.projectcalico.org_bgpconfigurations.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: bgpconfigurations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
diff --git a/libcalico-go/config/crd/crd.projectcalico.org_bgpfilters.yaml b/libcalico-go/config/crd/crd.projectcalico.org_bgpfilters.yaml
index 826d3f2c4fd..175166091d9 100644
--- a/libcalico-go/config/crd/crd.projectcalico.org_bgpfilters.yaml
+++ b/libcalico-go/config/crd/crd.projectcalico.org_bgpfilters.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: bgpfilters.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
diff --git a/libcalico-go/config/crd/crd.projectcalico.org_bgppeers.yaml b/libcalico-go/config/crd/crd.projectcalico.org_bgppeers.yaml
index 8e05dbc1935..d7a526b6cc3 100644
--- a/libcalico-go/config/crd/crd.projectcalico.org_bgppeers.yaml
+++ b/libcalico-go/config/crd/crd.projectcalico.org_bgppeers.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: bgppeers.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
diff --git a/libcalico-go/config/crd/crd.projectcalico.org_blockaffinities.yaml b/libcalico-go/config/crd/crd.projectcalico.org_blockaffinities.yaml
index c18b5709774..78a0553cfa8 100644
--- a/libcalico-go/config/crd/crd.projectcalico.org_blockaffinities.yaml
+++ b/libcalico-go/config/crd/crd.projectcalico.org_blockaffinities.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: blockaffinities.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
diff --git a/libcalico-go/config/crd/crd.projectcalico.org_caliconodestatuses.yaml b/libcalico-go/config/crd/crd.projectcalico.org_caliconodestatuses.yaml
index 166fa6d545f..d2898bdef71 100644
--- a/libcalico-go/config/crd/crd.projectcalico.org_caliconodestatuses.yaml
+++ b/libcalico-go/config/crd/crd.projectcalico.org_caliconodestatuses.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: caliconodestatuses.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
diff --git a/libcalico-go/config/crd/crd.projectcalico.org_clusterinformations.yaml b/libcalico-go/config/crd/crd.projectcalico.org_clusterinformations.yaml
index 9f802f13202..c64f6cc55ad 100644
--- a/libcalico-go/config/crd/crd.projectcalico.org_clusterinformations.yaml
+++ b/libcalico-go/config/crd/crd.projectcalico.org_clusterinformations.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: clusterinformations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
diff --git a/libcalico-go/config/crd/crd.projectcalico.org_felixconfigurations.yaml b/libcalico-go/config/crd/crd.projectcalico.org_felixconfigurations.yaml
index 11402eca475..19fd77eb5a3 100644
--- a/libcalico-go/config/crd/crd.projectcalico.org_felixconfigurations.yaml
+++ b/libcalico-go/config/crd/crd.projectcalico.org_felixconfigurations.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: felixconfigurations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -418,9 +418,6 @@ spec:
                     tunnel IPs).
                   type: integer
                 bpfPSNATPorts:
-                  anyOf:
-                    - type: integer
-                    - type: string
                   description: |-
                     BPFPSNATPorts sets the range from which we randomly pick a port if there is a source port
                     collision. This should be within the ephemeral range as defined by RFC 6056 (1024–65535) and
@@ -429,6 +426,7 @@ spec:
                     a problem if this range overlaps with the operating systems. Both ends of the range are
                     inclusive. [Default: 20000:29999]
                   pattern: ^.*
+                  type: integer
                   x-kubernetes-int-or-string: true
                 bpfPolicyDebugEnabled:
                   description: |-
@@ -875,10 +873,8 @@ spec:
                     KubeNodePortRanges holds list of port ranges used for service node ports. Only used if felix detects kube-proxy running in ipvs mode.
                     Felix uses these ranges to separate host and workload traffic. [Default: 30000:32767].
                   items:
-                    anyOf:
-                      - type: integer
-                      - type: string
                     pattern: ^.*
+                    type: integer
                     x-kubernetes-int-or-string: true
                   type: array
                 logActionRateLimit:
@@ -975,13 +971,11 @@ spec:
                     - IPPoolsAndHostIPs
                   type: string
                 natPortRange:
-                  anyOf:
-                    - type: integer
-                    - type: string
                   description: |-
                     NATPortRange specifies the range of ports that is used for port mapping when doing outgoing NAT. When unset the default behavior of the
                     network stack is used.
                   pattern: ^.*
+                  type: integer
                   x-kubernetes-int-or-string: true
                 netlinkTimeout:
                   description: |-
diff --git a/libcalico-go/config/crd/crd.projectcalico.org_globalnetworkpolicies.yaml b/libcalico-go/config/crd/crd.projectcalico.org_globalnetworkpolicies.yaml
index a9035d842f7..6d2d4693efc 100644
--- a/libcalico-go/config/crd/crd.projectcalico.org_globalnetworkpolicies.yaml
+++ b/libcalico-go/config/crd/crd.projectcalico.org_globalnetworkpolicies.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: globalnetworkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -49,20 +49,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -124,16 +120,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -149,20 +141,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -207,20 +195,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -282,16 +266,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -307,20 +287,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
diff --git a/libcalico-go/config/crd/crd.projectcalico.org_globalnetworksets.yaml b/libcalico-go/config/crd/crd.projectcalico.org_globalnetworksets.yaml
index 11c05760571..c6120d69226 100644
--- a/libcalico-go/config/crd/crd.projectcalico.org_globalnetworksets.yaml
+++ b/libcalico-go/config/crd/crd.projectcalico.org_globalnetworksets.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: globalnetworksets.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
diff --git a/libcalico-go/config/crd/crd.projectcalico.org_hostendpoints.yaml b/libcalico-go/config/crd/crd.projectcalico.org_hostendpoints.yaml
index d9b542930e0..25b36ccc5ee 100644
--- a/libcalico-go/config/crd/crd.projectcalico.org_hostendpoints.yaml
+++ b/libcalico-go/config/crd/crd.projectcalico.org_hostendpoints.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: hostendpoints.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -42,10 +42,8 @@ spec:
                       port:
                         type: integer
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                     required:
                       - name
diff --git a/libcalico-go/config/crd/crd.projectcalico.org_ipamblocks.yaml b/libcalico-go/config/crd/crd.projectcalico.org_ipamblocks.yaml
index 051bc67cfc4..b44ba73ce46 100644
--- a/libcalico-go/config/crd/crd.projectcalico.org_ipamblocks.yaml
+++ b/libcalico-go/config/crd/crd.projectcalico.org_ipamblocks.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ipamblocks.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
diff --git a/libcalico-go/config/crd/crd.projectcalico.org_ipamconfigs.yaml b/libcalico-go/config/crd/crd.projectcalico.org_ipamconfigs.yaml
index b7e9260b9c2..c5d85329f09 100644
--- a/libcalico-go/config/crd/crd.projectcalico.org_ipamconfigs.yaml
+++ b/libcalico-go/config/crd/crd.projectcalico.org_ipamconfigs.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ipamconfigs.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
diff --git a/libcalico-go/config/crd/crd.projectcalico.org_ipamhandles.yaml b/libcalico-go/config/crd/crd.projectcalico.org_ipamhandles.yaml
index d2305fe4185..a95354cbd27 100644
--- a/libcalico-go/config/crd/crd.projectcalico.org_ipamhandles.yaml
+++ b/libcalico-go/config/crd/crd.projectcalico.org_ipamhandles.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ipamhandles.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
diff --git a/libcalico-go/config/crd/crd.projectcalico.org_ippools.yaml b/libcalico-go/config/crd/crd.projectcalico.org_ippools.yaml
index 3e029cd9221..36022016a48 100644
--- a/libcalico-go/config/crd/crd.projectcalico.org_ippools.yaml
+++ b/libcalico-go/config/crd/crd.projectcalico.org_ippools.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ippools.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
diff --git a/libcalico-go/config/crd/crd.projectcalico.org_ipreservations.yaml b/libcalico-go/config/crd/crd.projectcalico.org_ipreservations.yaml
index 61ddf451f11..21fd24c890b 100644
--- a/libcalico-go/config/crd/crd.projectcalico.org_ipreservations.yaml
+++ b/libcalico-go/config/crd/crd.projectcalico.org_ipreservations.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ipreservations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
diff --git a/libcalico-go/config/crd/crd.projectcalico.org_kubecontrollersconfigurations.yaml b/libcalico-go/config/crd/crd.projectcalico.org_kubecontrollersconfigurations.yaml
index 80848a80b2f..d097948974d 100644
--- a/libcalico-go/config/crd/crd.projectcalico.org_kubecontrollersconfigurations.yaml
+++ b/libcalico-go/config/crd/crd.projectcalico.org_kubecontrollersconfigurations.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: kubecontrollersconfigurations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
diff --git a/libcalico-go/config/crd/crd.projectcalico.org_networkpolicies.yaml b/libcalico-go/config/crd/crd.projectcalico.org_networkpolicies.yaml
index e18c0014edd..e7af33f9662 100644
--- a/libcalico-go/config/crd/crd.projectcalico.org_networkpolicies.yaml
+++ b/libcalico-go/config/crd/crd.projectcalico.org_networkpolicies.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: networkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -45,20 +45,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -120,16 +116,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -145,20 +137,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -203,20 +191,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -278,16 +262,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -303,20 +283,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
diff --git a/libcalico-go/config/crd/crd.projectcalico.org_networksets.yaml b/libcalico-go/config/crd/crd.projectcalico.org_networksets.yaml
index 26b2f55e472..8b348619a8a 100644
--- a/libcalico-go/config/crd/crd.projectcalico.org_networksets.yaml
+++ b/libcalico-go/config/crd/crd.projectcalico.org_networksets.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: networksets.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
diff --git a/libcalico-go/config/crd/crd.projectcalico.org_stagedglobalnetworkpolicies.yaml b/libcalico-go/config/crd/crd.projectcalico.org_stagedglobalnetworkpolicies.yaml
index 50027b986e7..0024f837fe9 100644
--- a/libcalico-go/config/crd/crd.projectcalico.org_stagedglobalnetworkpolicies.yaml
+++ b/libcalico-go/config/crd/crd.projectcalico.org_stagedglobalnetworkpolicies.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: stagedglobalnetworkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -49,20 +49,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -124,16 +120,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -149,20 +141,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -207,20 +195,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -282,16 +266,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -307,20 +287,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
diff --git a/libcalico-go/config/crd/crd.projectcalico.org_stagedkubernetesnetworkpolicies.yaml b/libcalico-go/config/crd/crd.projectcalico.org_stagedkubernetesnetworkpolicies.yaml
index 094fc67791a..6216aae3f6d 100644
--- a/libcalico-go/config/crd/crd.projectcalico.org_stagedkubernetesnetworkpolicies.yaml
+++ b/libcalico-go/config/crd/crd.projectcalico.org_stagedkubernetesnetworkpolicies.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: stagedkubernetesnetworkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
diff --git a/libcalico-go/config/crd/crd.projectcalico.org_stagednetworkpolicies.yaml b/libcalico-go/config/crd/crd.projectcalico.org_stagednetworkpolicies.yaml
index a2892ac3f8f..d0f230d181f 100644
--- a/libcalico-go/config/crd/crd.projectcalico.org_stagednetworkpolicies.yaml
+++ b/libcalico-go/config/crd/crd.projectcalico.org_stagednetworkpolicies.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: stagednetworkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -45,20 +45,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -120,16 +116,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -145,20 +137,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -203,20 +191,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -278,16 +262,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -303,20 +283,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
diff --git a/libcalico-go/config/crd/crd.projectcalico.org_tiers.yaml b/libcalico-go/config/crd/crd.projectcalico.org_tiers.yaml
index 430a51625f6..1620b1db924 100644
--- a/libcalico-go/config/crd/crd.projectcalico.org_tiers.yaml
+++ b/libcalico-go/config/crd/crd.projectcalico.org_tiers.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: tiers.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
diff --git a/manifests/calico-bpf.yaml b/manifests/calico-bpf.yaml
index 0a4c9324b12..d25b06aa76e 100644
--- a/manifests/calico-bpf.yaml
+++ b/manifests/calico-bpf.yaml
@@ -96,7 +96,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: bgpconfigurations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -217,7 +217,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: bgpfilters.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -371,7 +371,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: bgppeers.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -472,7 +472,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: blockaffinities.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -521,7 +521,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: caliconodestatuses.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -685,7 +685,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: clusterinformations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -729,7 +729,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: felixconfigurations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -1145,9 +1145,6 @@ spec:
                     tunnel IPs).
                   type: integer
                 bpfPSNATPorts:
-                  anyOf:
-                    - type: integer
-                    - type: string
                   description: |-
                     BPFPSNATPorts sets the range from which we randomly pick a port if there is a source port
                     collision. This should be within the ephemeral range as defined by RFC 6056 (1024–65535) and
@@ -1156,6 +1153,7 @@ spec:
                     a problem if this range overlaps with the operating systems. Both ends of the range are
                     inclusive. [Default: 20000:29999]
                   pattern: ^.*
+                  type: integer
                   x-kubernetes-int-or-string: true
                 bpfPolicyDebugEnabled:
                   description: |-
@@ -1602,10 +1600,8 @@ spec:
                     KubeNodePortRanges holds list of port ranges used for service node ports. Only used if felix detects kube-proxy running in ipvs mode.
                     Felix uses these ranges to separate host and workload traffic. [Default: 30000:32767].
                   items:
-                    anyOf:
-                      - type: integer
-                      - type: string
                     pattern: ^.*
+                    type: integer
                     x-kubernetes-int-or-string: true
                   type: array
                 logActionRateLimit:
@@ -1702,13 +1698,11 @@ spec:
                     - IPPoolsAndHostIPs
                   type: string
                 natPortRange:
-                  anyOf:
-                    - type: integer
-                    - type: string
                   description: |-
                     NATPortRange specifies the range of ports that is used for port mapping when doing outgoing NAT. When unset the default behavior of the
                     network stack is used.
                   pattern: ^.*
+                  type: integer
                   x-kubernetes-int-or-string: true
                 netlinkTimeout:
                   description: |-
@@ -2062,7 +2056,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: globalnetworkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2109,20 +2103,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -2184,16 +2174,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -2209,20 +2195,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -2267,20 +2249,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -2342,16 +2320,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -2367,20 +2341,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -2437,7 +2407,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: globalnetworksets.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2475,7 +2445,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: hostendpoints.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2515,10 +2485,8 @@ spec:
                       port:
                         type: integer
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                     required:
                       - name
@@ -2540,7 +2508,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ipamblocks.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2622,7 +2590,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ipamconfigs.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2667,7 +2635,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ipamhandles.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2712,7 +2680,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ippools.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2785,7 +2753,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ipreservations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2823,7 +2791,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: kubecontrollersconfigurations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -3041,7 +3009,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: networkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -3084,20 +3052,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3159,16 +3123,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -3184,20 +3144,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3242,20 +3198,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3317,16 +3269,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -3342,20 +3290,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3408,7 +3352,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: networksets.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -3446,7 +3390,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: stagedglobalnetworkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -3493,20 +3437,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3568,16 +3508,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -3593,20 +3529,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3651,20 +3583,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3726,16 +3654,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -3751,20 +3675,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3823,7 +3743,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: stagedkubernetesnetworkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -4071,7 +3991,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: stagednetworkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -4114,20 +4034,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -4189,16 +4105,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -4214,20 +4126,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -4272,20 +4180,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -4347,16 +4251,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -4372,20 +4272,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -4440,7 +4336,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: tiers.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
diff --git a/manifests/calico-policy-only.yaml b/manifests/calico-policy-only.yaml
index 48b17ef83ac..f13bc3228ba 100644
--- a/manifests/calico-policy-only.yaml
+++ b/manifests/calico-policy-only.yaml
@@ -106,7 +106,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: bgpconfigurations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -227,7 +227,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: bgpfilters.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -381,7 +381,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: bgppeers.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -482,7 +482,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: blockaffinities.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -531,7 +531,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: caliconodestatuses.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -695,7 +695,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: clusterinformations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -739,7 +739,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: felixconfigurations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -1155,9 +1155,6 @@ spec:
                     tunnel IPs).
                   type: integer
                 bpfPSNATPorts:
-                  anyOf:
-                    - type: integer
-                    - type: string
                   description: |-
                     BPFPSNATPorts sets the range from which we randomly pick a port if there is a source port
                     collision. This should be within the ephemeral range as defined by RFC 6056 (1024–65535) and
@@ -1166,6 +1163,7 @@ spec:
                     a problem if this range overlaps with the operating systems. Both ends of the range are
                     inclusive. [Default: 20000:29999]
                   pattern: ^.*
+                  type: integer
                   x-kubernetes-int-or-string: true
                 bpfPolicyDebugEnabled:
                   description: |-
@@ -1612,10 +1610,8 @@ spec:
                     KubeNodePortRanges holds list of port ranges used for service node ports. Only used if felix detects kube-proxy running in ipvs mode.
                     Felix uses these ranges to separate host and workload traffic. [Default: 30000:32767].
                   items:
-                    anyOf:
-                      - type: integer
-                      - type: string
                     pattern: ^.*
+                    type: integer
                     x-kubernetes-int-or-string: true
                   type: array
                 logActionRateLimit:
@@ -1712,13 +1708,11 @@ spec:
                     - IPPoolsAndHostIPs
                   type: string
                 natPortRange:
-                  anyOf:
-                    - type: integer
-                    - type: string
                   description: |-
                     NATPortRange specifies the range of ports that is used for port mapping when doing outgoing NAT. When unset the default behavior of the
                     network stack is used.
                   pattern: ^.*
+                  type: integer
                   x-kubernetes-int-or-string: true
                 netlinkTimeout:
                   description: |-
@@ -2072,7 +2066,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: globalnetworkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2119,20 +2113,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -2194,16 +2184,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -2219,20 +2205,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -2277,20 +2259,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -2352,16 +2330,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -2377,20 +2351,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -2447,7 +2417,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: globalnetworksets.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2485,7 +2455,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: hostendpoints.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2525,10 +2495,8 @@ spec:
                       port:
                         type: integer
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                     required:
                       - name
@@ -2550,7 +2518,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ipamblocks.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2632,7 +2600,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ipamconfigs.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2677,7 +2645,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ipamhandles.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2722,7 +2690,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ippools.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2795,7 +2763,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ipreservations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2833,7 +2801,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: kubecontrollersconfigurations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -3051,7 +3019,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: networkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -3094,20 +3062,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3169,16 +3133,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -3194,20 +3154,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3252,20 +3208,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3327,16 +3279,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -3352,20 +3300,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3418,7 +3362,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: networksets.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -3456,7 +3400,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: stagedglobalnetworkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -3503,20 +3447,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3578,16 +3518,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -3603,20 +3539,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3661,20 +3593,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3736,16 +3664,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -3761,20 +3685,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3833,7 +3753,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: stagedkubernetesnetworkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -4081,7 +4001,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: stagednetworkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -4124,20 +4044,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -4199,16 +4115,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -4224,20 +4136,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -4282,20 +4190,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -4357,16 +4261,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -4382,20 +4282,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -4450,7 +4346,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: tiers.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
diff --git a/manifests/calico-typha.yaml b/manifests/calico-typha.yaml
index e5af617ce0b..0cfe36e03ab 100644
--- a/manifests/calico-typha.yaml
+++ b/manifests/calico-typha.yaml
@@ -107,7 +107,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: bgpconfigurations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -228,7 +228,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: bgpfilters.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -382,7 +382,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: bgppeers.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -483,7 +483,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: blockaffinities.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -532,7 +532,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: caliconodestatuses.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -696,7 +696,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: clusterinformations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -740,7 +740,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: felixconfigurations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -1156,9 +1156,6 @@ spec:
                     tunnel IPs).
                   type: integer
                 bpfPSNATPorts:
-                  anyOf:
-                    - type: integer
-                    - type: string
                   description: |-
                     BPFPSNATPorts sets the range from which we randomly pick a port if there is a source port
                     collision. This should be within the ephemeral range as defined by RFC 6056 (1024–65535) and
@@ -1167,6 +1164,7 @@ spec:
                     a problem if this range overlaps with the operating systems. Both ends of the range are
                     inclusive. [Default: 20000:29999]
                   pattern: ^.*
+                  type: integer
                   x-kubernetes-int-or-string: true
                 bpfPolicyDebugEnabled:
                   description: |-
@@ -1613,10 +1611,8 @@ spec:
                     KubeNodePortRanges holds list of port ranges used for service node ports. Only used if felix detects kube-proxy running in ipvs mode.
                     Felix uses these ranges to separate host and workload traffic. [Default: 30000:32767].
                   items:
-                    anyOf:
-                      - type: integer
-                      - type: string
                     pattern: ^.*
+                    type: integer
                     x-kubernetes-int-or-string: true
                   type: array
                 logActionRateLimit:
@@ -1713,13 +1709,11 @@ spec:
                     - IPPoolsAndHostIPs
                   type: string
                 natPortRange:
-                  anyOf:
-                    - type: integer
-                    - type: string
                   description: |-
                     NATPortRange specifies the range of ports that is used for port mapping when doing outgoing NAT. When unset the default behavior of the
                     network stack is used.
                   pattern: ^.*
+                  type: integer
                   x-kubernetes-int-or-string: true
                 netlinkTimeout:
                   description: |-
@@ -2073,7 +2067,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: globalnetworkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2120,20 +2114,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -2195,16 +2185,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -2220,20 +2206,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -2278,20 +2260,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -2353,16 +2331,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -2378,20 +2352,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -2448,7 +2418,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: globalnetworksets.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2486,7 +2456,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: hostendpoints.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2526,10 +2496,8 @@ spec:
                       port:
                         type: integer
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                     required:
                       - name
@@ -2551,7 +2519,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ipamblocks.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2633,7 +2601,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ipamconfigs.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2678,7 +2646,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ipamhandles.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2723,7 +2691,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ippools.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2796,7 +2764,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ipreservations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2834,7 +2802,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: kubecontrollersconfigurations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -3052,7 +3020,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: networkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -3095,20 +3063,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3170,16 +3134,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -3195,20 +3155,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3253,20 +3209,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3328,16 +3280,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -3353,20 +3301,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3419,7 +3363,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: networksets.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -3457,7 +3401,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: stagedglobalnetworkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -3504,20 +3448,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3579,16 +3519,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -3604,20 +3540,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3662,20 +3594,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3737,16 +3665,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -3762,20 +3686,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3834,7 +3754,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: stagedkubernetesnetworkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -4082,7 +4002,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: stagednetworkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -4125,20 +4045,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -4200,16 +4116,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -4225,20 +4137,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -4283,20 +4191,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -4358,16 +4262,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -4383,20 +4283,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -4451,7 +4347,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: tiers.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
diff --git a/manifests/calico-vxlan.yaml b/manifests/calico-vxlan.yaml
index 57e2c67a2ba..d0f4933e707 100644
--- a/manifests/calico-vxlan.yaml
+++ b/manifests/calico-vxlan.yaml
@@ -91,7 +91,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: bgpconfigurations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -212,7 +212,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: bgpfilters.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -366,7 +366,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: bgppeers.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -467,7 +467,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: blockaffinities.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -516,7 +516,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: caliconodestatuses.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -680,7 +680,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: clusterinformations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -724,7 +724,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: felixconfigurations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -1140,9 +1140,6 @@ spec:
                     tunnel IPs).
                   type: integer
                 bpfPSNATPorts:
-                  anyOf:
-                    - type: integer
-                    - type: string
                   description: |-
                     BPFPSNATPorts sets the range from which we randomly pick a port if there is a source port
                     collision. This should be within the ephemeral range as defined by RFC 6056 (1024–65535) and
@@ -1151,6 +1148,7 @@ spec:
                     a problem if this range overlaps with the operating systems. Both ends of the range are
                     inclusive. [Default: 20000:29999]
                   pattern: ^.*
+                  type: integer
                   x-kubernetes-int-or-string: true
                 bpfPolicyDebugEnabled:
                   description: |-
@@ -1597,10 +1595,8 @@ spec:
                     KubeNodePortRanges holds list of port ranges used for service node ports. Only used if felix detects kube-proxy running in ipvs mode.
                     Felix uses these ranges to separate host and workload traffic. [Default: 30000:32767].
                   items:
-                    anyOf:
-                      - type: integer
-                      - type: string
                     pattern: ^.*
+                    type: integer
                     x-kubernetes-int-or-string: true
                   type: array
                 logActionRateLimit:
@@ -1697,13 +1693,11 @@ spec:
                     - IPPoolsAndHostIPs
                   type: string
                 natPortRange:
-                  anyOf:
-                    - type: integer
-                    - type: string
                   description: |-
                     NATPortRange specifies the range of ports that is used for port mapping when doing outgoing NAT. When unset the default behavior of the
                     network stack is used.
                   pattern: ^.*
+                  type: integer
                   x-kubernetes-int-or-string: true
                 netlinkTimeout:
                   description: |-
@@ -2057,7 +2051,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: globalnetworkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2104,20 +2098,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -2179,16 +2169,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -2204,20 +2190,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -2262,20 +2244,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -2337,16 +2315,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -2362,20 +2336,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -2432,7 +2402,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: globalnetworksets.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2470,7 +2440,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: hostendpoints.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2510,10 +2480,8 @@ spec:
                       port:
                         type: integer
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                     required:
                       - name
@@ -2535,7 +2503,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ipamblocks.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2617,7 +2585,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ipamconfigs.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2662,7 +2630,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ipamhandles.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2707,7 +2675,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ippools.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2780,7 +2748,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ipreservations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2818,7 +2786,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: kubecontrollersconfigurations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -3036,7 +3004,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: networkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -3079,20 +3047,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3154,16 +3118,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -3179,20 +3139,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3237,20 +3193,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3312,16 +3264,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -3337,20 +3285,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3403,7 +3347,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: networksets.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -3441,7 +3385,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: stagedglobalnetworkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -3488,20 +3432,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3563,16 +3503,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -3588,20 +3524,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3646,20 +3578,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3721,16 +3649,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -3746,20 +3670,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3818,7 +3738,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: stagedkubernetesnetworkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -4066,7 +3986,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: stagednetworkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -4109,20 +4029,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -4184,16 +4100,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -4209,20 +4121,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -4267,20 +4175,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -4342,16 +4246,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -4367,20 +4267,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -4435,7 +4331,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: tiers.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
diff --git a/manifests/calico.yaml b/manifests/calico.yaml
index 87334998fcd..23616b02886 100644
--- a/manifests/calico.yaml
+++ b/manifests/calico.yaml
@@ -91,7 +91,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: bgpconfigurations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -212,7 +212,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: bgpfilters.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -366,7 +366,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: bgppeers.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -467,7 +467,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: blockaffinities.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -516,7 +516,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: caliconodestatuses.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -680,7 +680,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: clusterinformations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -724,7 +724,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: felixconfigurations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -1140,9 +1140,6 @@ spec:
                     tunnel IPs).
                   type: integer
                 bpfPSNATPorts:
-                  anyOf:
-                    - type: integer
-                    - type: string
                   description: |-
                     BPFPSNATPorts sets the range from which we randomly pick a port if there is a source port
                     collision. This should be within the ephemeral range as defined by RFC 6056 (1024–65535) and
@@ -1151,6 +1148,7 @@ spec:
                     a problem if this range overlaps with the operating systems. Both ends of the range are
                     inclusive. [Default: 20000:29999]
                   pattern: ^.*
+                  type: integer
                   x-kubernetes-int-or-string: true
                 bpfPolicyDebugEnabled:
                   description: |-
@@ -1597,10 +1595,8 @@ spec:
                     KubeNodePortRanges holds list of port ranges used for service node ports. Only used if felix detects kube-proxy running in ipvs mode.
                     Felix uses these ranges to separate host and workload traffic. [Default: 30000:32767].
                   items:
-                    anyOf:
-                      - type: integer
-                      - type: string
                     pattern: ^.*
+                    type: integer
                     x-kubernetes-int-or-string: true
                   type: array
                 logActionRateLimit:
@@ -1697,13 +1693,11 @@ spec:
                     - IPPoolsAndHostIPs
                   type: string
                 natPortRange:
-                  anyOf:
-                    - type: integer
-                    - type: string
                   description: |-
                     NATPortRange specifies the range of ports that is used for port mapping when doing outgoing NAT. When unset the default behavior of the
                     network stack is used.
                   pattern: ^.*
+                  type: integer
                   x-kubernetes-int-or-string: true
                 netlinkTimeout:
                   description: |-
@@ -2057,7 +2051,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: globalnetworkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2104,20 +2098,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -2179,16 +2169,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -2204,20 +2190,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -2262,20 +2244,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -2337,16 +2315,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -2362,20 +2336,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -2432,7 +2402,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: globalnetworksets.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2470,7 +2440,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: hostendpoints.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2510,10 +2480,8 @@ spec:
                       port:
                         type: integer
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                     required:
                       - name
@@ -2535,7 +2503,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ipamblocks.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2617,7 +2585,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ipamconfigs.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2662,7 +2630,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ipamhandles.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2707,7 +2675,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ippools.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2780,7 +2748,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ipreservations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2818,7 +2786,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: kubecontrollersconfigurations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -3036,7 +3004,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: networkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -3079,20 +3047,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3154,16 +3118,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -3179,20 +3139,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3237,20 +3193,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3312,16 +3264,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -3337,20 +3285,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3403,7 +3347,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: networksets.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -3441,7 +3385,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: stagedglobalnetworkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -3488,20 +3432,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3563,16 +3503,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -3588,20 +3524,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3646,20 +3578,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3721,16 +3649,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -3746,20 +3670,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3818,7 +3738,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: stagedkubernetesnetworkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -4066,7 +3986,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: stagednetworkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -4109,20 +4029,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -4184,16 +4100,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -4209,20 +4121,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -4267,20 +4175,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -4342,16 +4246,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -4367,20 +4267,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -4435,7 +4331,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: tiers.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
diff --git a/manifests/canal.yaml b/manifests/canal.yaml
index 94feca8c94b..333051d4288 100644
--- a/manifests/canal.yaml
+++ b/manifests/canal.yaml
@@ -108,7 +108,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: bgpconfigurations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -229,7 +229,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: bgpfilters.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -383,7 +383,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: bgppeers.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -484,7 +484,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: blockaffinities.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -533,7 +533,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: caliconodestatuses.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -697,7 +697,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: clusterinformations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -741,7 +741,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: felixconfigurations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -1157,9 +1157,6 @@ spec:
                     tunnel IPs).
                   type: integer
                 bpfPSNATPorts:
-                  anyOf:
-                    - type: integer
-                    - type: string
                   description: |-
                     BPFPSNATPorts sets the range from which we randomly pick a port if there is a source port
                     collision. This should be within the ephemeral range as defined by RFC 6056 (1024–65535) and
@@ -1168,6 +1165,7 @@ spec:
                     a problem if this range overlaps with the operating systems. Both ends of the range are
                     inclusive. [Default: 20000:29999]
                   pattern: ^.*
+                  type: integer
                   x-kubernetes-int-or-string: true
                 bpfPolicyDebugEnabled:
                   description: |-
@@ -1614,10 +1612,8 @@ spec:
                     KubeNodePortRanges holds list of port ranges used for service node ports. Only used if felix detects kube-proxy running in ipvs mode.
                     Felix uses these ranges to separate host and workload traffic. [Default: 30000:32767].
                   items:
-                    anyOf:
-                      - type: integer
-                      - type: string
                     pattern: ^.*
+                    type: integer
                     x-kubernetes-int-or-string: true
                   type: array
                 logActionRateLimit:
@@ -1714,13 +1710,11 @@ spec:
                     - IPPoolsAndHostIPs
                   type: string
                 natPortRange:
-                  anyOf:
-                    - type: integer
-                    - type: string
                   description: |-
                     NATPortRange specifies the range of ports that is used for port mapping when doing outgoing NAT. When unset the default behavior of the
                     network stack is used.
                   pattern: ^.*
+                  type: integer
                   x-kubernetes-int-or-string: true
                 netlinkTimeout:
                   description: |-
@@ -2074,7 +2068,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: globalnetworkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2121,20 +2115,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -2196,16 +2186,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -2221,20 +2207,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -2279,20 +2261,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -2354,16 +2332,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -2379,20 +2353,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -2449,7 +2419,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: globalnetworksets.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2487,7 +2457,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: hostendpoints.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2527,10 +2497,8 @@ spec:
                       port:
                         type: integer
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                     required:
                       - name
@@ -2552,7 +2520,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ipamblocks.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2634,7 +2602,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ipamconfigs.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2679,7 +2647,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ipamhandles.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2724,7 +2692,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ippools.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2797,7 +2765,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ipreservations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2835,7 +2803,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: kubecontrollersconfigurations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -3053,7 +3021,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: networkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -3096,20 +3064,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3171,16 +3135,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -3196,20 +3156,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3254,20 +3210,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3329,16 +3281,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -3354,20 +3302,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3420,7 +3364,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: networksets.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -3458,7 +3402,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: stagedglobalnetworkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -3505,20 +3449,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3580,16 +3520,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -3605,20 +3541,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3663,20 +3595,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3738,16 +3666,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -3763,20 +3687,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3835,7 +3755,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: stagedkubernetesnetworkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -4083,7 +4003,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: stagednetworkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -4126,20 +4046,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -4201,16 +4117,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -4226,20 +4138,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -4284,20 +4192,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -4359,16 +4263,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -4384,20 +4284,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -4452,7 +4348,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: tiers.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
diff --git a/manifests/crds.yaml b/manifests/crds.yaml
index dfb35ff3a2f..abc8fbf5694 100644
--- a/manifests/crds.yaml
+++ b/manifests/crds.yaml
@@ -5,7 +5,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: bgpconfigurations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -126,7 +126,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: bgpfilters.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -280,7 +280,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: bgppeers.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -381,7 +381,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: blockaffinities.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -430,7 +430,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: caliconodestatuses.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -594,7 +594,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: clusterinformations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -638,7 +638,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: felixconfigurations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -1054,9 +1054,6 @@ spec:
                     tunnel IPs).
                   type: integer
                 bpfPSNATPorts:
-                  anyOf:
-                    - type: integer
-                    - type: string
                   description: |-
                     BPFPSNATPorts sets the range from which we randomly pick a port if there is a source port
                     collision. This should be within the ephemeral range as defined by RFC 6056 (1024–65535) and
@@ -1065,6 +1062,7 @@ spec:
                     a problem if this range overlaps with the operating systems. Both ends of the range are
                     inclusive. [Default: 20000:29999]
                   pattern: ^.*
+                  type: integer
                   x-kubernetes-int-or-string: true
                 bpfPolicyDebugEnabled:
                   description: |-
@@ -1511,10 +1509,8 @@ spec:
                     KubeNodePortRanges holds list of port ranges used for service node ports. Only used if felix detects kube-proxy running in ipvs mode.
                     Felix uses these ranges to separate host and workload traffic. [Default: 30000:32767].
                   items:
-                    anyOf:
-                      - type: integer
-                      - type: string
                     pattern: ^.*
+                    type: integer
                     x-kubernetes-int-or-string: true
                   type: array
                 logActionRateLimit:
@@ -1611,13 +1607,11 @@ spec:
                     - IPPoolsAndHostIPs
                   type: string
                 natPortRange:
-                  anyOf:
-                    - type: integer
-                    - type: string
                   description: |-
                     NATPortRange specifies the range of ports that is used for port mapping when doing outgoing NAT. When unset the default behavior of the
                     network stack is used.
                   pattern: ^.*
+                  type: integer
                   x-kubernetes-int-or-string: true
                 netlinkTimeout:
                   description: |-
@@ -1971,7 +1965,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: globalnetworkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2018,20 +2012,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -2093,16 +2083,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -2118,20 +2104,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -2176,20 +2158,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -2251,16 +2229,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -2276,20 +2250,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -2346,7 +2316,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: globalnetworksets.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2384,7 +2354,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: hostendpoints.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2424,10 +2394,8 @@ spec:
                       port:
                         type: integer
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                     required:
                       - name
@@ -2449,7 +2417,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ipamblocks.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2531,7 +2499,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ipamconfigs.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2576,7 +2544,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ipamhandles.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2621,7 +2589,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ippools.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2694,7 +2662,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ipreservations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2732,7 +2700,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: kubecontrollersconfigurations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2950,7 +2918,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: networkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2993,20 +2961,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3068,16 +3032,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -3093,20 +3053,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3151,20 +3107,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3226,16 +3178,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -3251,20 +3199,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3317,7 +3261,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: networksets.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -3355,7 +3299,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: stagedglobalnetworkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -3402,20 +3346,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3477,16 +3417,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -3502,20 +3438,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3560,20 +3492,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3635,16 +3563,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -3660,20 +3584,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3732,7 +3652,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: stagedkubernetesnetworkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -3980,7 +3900,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: stagednetworkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -4023,20 +3943,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -4098,16 +4014,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -4123,20 +4035,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -4181,20 +4089,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -4256,16 +4160,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -4281,20 +4181,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -4349,7 +4245,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: tiers.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
diff --git a/manifests/flannel-migration/calico.yaml b/manifests/flannel-migration/calico.yaml
index 147fa059958..9749bca43ee 100644
--- a/manifests/flannel-migration/calico.yaml
+++ b/manifests/flannel-migration/calico.yaml
@@ -91,7 +91,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: bgpconfigurations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -212,7 +212,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: bgpfilters.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -366,7 +366,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: bgppeers.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -467,7 +467,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: blockaffinities.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -516,7 +516,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: caliconodestatuses.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -680,7 +680,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: clusterinformations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -724,7 +724,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: felixconfigurations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -1140,9 +1140,6 @@ spec:
                     tunnel IPs).
                   type: integer
                 bpfPSNATPorts:
-                  anyOf:
-                    - type: integer
-                    - type: string
                   description: |-
                     BPFPSNATPorts sets the range from which we randomly pick a port if there is a source port
                     collision. This should be within the ephemeral range as defined by RFC 6056 (1024–65535) and
@@ -1151,6 +1148,7 @@ spec:
                     a problem if this range overlaps with the operating systems. Both ends of the range are
                     inclusive. [Default: 20000:29999]
                   pattern: ^.*
+                  type: integer
                   x-kubernetes-int-or-string: true
                 bpfPolicyDebugEnabled:
                   description: |-
@@ -1597,10 +1595,8 @@ spec:
                     KubeNodePortRanges holds list of port ranges used for service node ports. Only used if felix detects kube-proxy running in ipvs mode.
                     Felix uses these ranges to separate host and workload traffic. [Default: 30000:32767].
                   items:
-                    anyOf:
-                      - type: integer
-                      - type: string
                     pattern: ^.*
+                    type: integer
                     x-kubernetes-int-or-string: true
                   type: array
                 logActionRateLimit:
@@ -1697,13 +1693,11 @@ spec:
                     - IPPoolsAndHostIPs
                   type: string
                 natPortRange:
-                  anyOf:
-                    - type: integer
-                    - type: string
                   description: |-
                     NATPortRange specifies the range of ports that is used for port mapping when doing outgoing NAT. When unset the default behavior of the
                     network stack is used.
                   pattern: ^.*
+                  type: integer
                   x-kubernetes-int-or-string: true
                 netlinkTimeout:
                   description: |-
@@ -2057,7 +2051,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: globalnetworkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2104,20 +2098,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -2179,16 +2169,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -2204,20 +2190,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -2262,20 +2244,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -2337,16 +2315,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -2362,20 +2336,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -2432,7 +2402,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: globalnetworksets.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2470,7 +2440,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: hostendpoints.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2510,10 +2480,8 @@ spec:
                       port:
                         type: integer
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                     required:
                       - name
@@ -2535,7 +2503,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ipamblocks.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2617,7 +2585,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ipamconfigs.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2662,7 +2630,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ipamhandles.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2707,7 +2675,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ippools.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2780,7 +2748,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ipreservations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -2818,7 +2786,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: kubecontrollersconfigurations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -3036,7 +3004,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: networkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -3079,20 +3047,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3154,16 +3118,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -3179,20 +3139,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3237,20 +3193,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3312,16 +3264,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -3337,20 +3285,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3403,7 +3347,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: networksets.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -3441,7 +3385,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: stagedglobalnetworkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -3488,20 +3432,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3563,16 +3503,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -3588,20 +3524,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3646,20 +3578,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3721,16 +3649,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -3746,20 +3670,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -3818,7 +3738,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: stagedkubernetesnetworkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -4066,7 +3986,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: stagednetworkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -4109,20 +4029,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -4184,16 +4100,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -4209,20 +4121,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -4267,20 +4175,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -4342,16 +4246,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -4367,20 +4267,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -4435,7 +4331,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: tiers.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
diff --git a/manifests/operator-crds.yaml b/manifests/operator-crds.yaml
index 91a0d63558d..5c81f46dc43 100644
--- a/manifests/operator-crds.yaml
+++ b/manifests/operator-crds.yaml
@@ -28553,7 +28553,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: bgpconfigurations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -28674,7 +28674,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: bgpfilters.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -28828,7 +28828,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: bgppeers.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -28929,7 +28929,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: blockaffinities.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -28978,7 +28978,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: caliconodestatuses.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -29142,7 +29142,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: clusterinformations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -29186,7 +29186,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: felixconfigurations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -29602,9 +29602,6 @@ spec:
                     tunnel IPs).
                   type: integer
                 bpfPSNATPorts:
-                  anyOf:
-                    - type: integer
-                    - type: string
                   description: |-
                     BPFPSNATPorts sets the range from which we randomly pick a port if there is a source port
                     collision. This should be within the ephemeral range as defined by RFC 6056 (1024–65535) and
@@ -29613,6 +29610,7 @@ spec:
                     a problem if this range overlaps with the operating systems. Both ends of the range are
                     inclusive. [Default: 20000:29999]
                   pattern: ^.*
+                  type: integer
                   x-kubernetes-int-or-string: true
                 bpfPolicyDebugEnabled:
                   description: |-
@@ -30059,10 +30057,8 @@ spec:
                     KubeNodePortRanges holds list of port ranges used for service node ports. Only used if felix detects kube-proxy running in ipvs mode.
                     Felix uses these ranges to separate host and workload traffic. [Default: 30000:32767].
                   items:
-                    anyOf:
-                      - type: integer
-                      - type: string
                     pattern: ^.*
+                    type: integer
                     x-kubernetes-int-or-string: true
                   type: array
                 logActionRateLimit:
@@ -30159,13 +30155,11 @@ spec:
                     - IPPoolsAndHostIPs
                   type: string
                 natPortRange:
-                  anyOf:
-                    - type: integer
-                    - type: string
                   description: |-
                     NATPortRange specifies the range of ports that is used for port mapping when doing outgoing NAT. When unset the default behavior of the
                     network stack is used.
                   pattern: ^.*
+                  type: integer
                   x-kubernetes-int-or-string: true
                 netlinkTimeout:
                   description: |-
@@ -30519,7 +30513,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: globalnetworkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -30566,20 +30560,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -30641,16 +30631,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -30666,20 +30652,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -30724,20 +30706,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -30799,16 +30777,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -30824,20 +30798,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -30894,7 +30864,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: globalnetworksets.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -30932,7 +30902,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: hostendpoints.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -30972,10 +30942,8 @@ spec:
                       port:
                         type: integer
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                     required:
                       - name
@@ -30997,7 +30965,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ipamblocks.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -31079,7 +31047,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ipamconfigs.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -31124,7 +31092,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ipamhandles.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -31169,7 +31137,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ippools.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -31242,7 +31210,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: ipreservations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -31280,7 +31248,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: kubecontrollersconfigurations.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -31498,7 +31466,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: networkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -31541,20 +31509,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -31616,16 +31580,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -31641,20 +31601,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -31699,20 +31655,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -31774,16 +31726,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -31799,20 +31747,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -31865,7 +31809,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: networksets.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -31903,7 +31847,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: stagedglobalnetworkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -31950,20 +31894,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -32025,16 +31965,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -32050,20 +31986,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -32108,20 +32040,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -32183,16 +32111,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -32208,20 +32132,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -32280,7 +32200,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: stagedkubernetesnetworkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -32528,7 +32448,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: stagednetworkpolicies.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
@@ -32571,20 +32491,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -32646,16 +32562,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -32671,20 +32583,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -32729,20 +32637,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -32804,16 +32708,12 @@ spec:
                             type: integer
                         type: object
                       notProtocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       protocol:
-                        anyOf:
-                          - type: integer
-                          - type: string
                         pattern: ^.*
+                        type: integer
                         x-kubernetes-int-or-string: true
                       source:
                         properties:
@@ -32829,20 +32729,16 @@ spec:
                             type: array
                           notPorts:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           notSelector:
                             type: string
                           ports:
                             items:
-                              anyOf:
-                                - type: integer
-                                - type: string
                               pattern: ^.*
+                              type: integer
                               x-kubernetes-int-or-string: true
                             type: array
                           selector:
@@ -32897,7 +32793,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: tiers.crd.projectcalico.org
 spec:
   group: crd.projectcalico.org
diff --git a/metadata.mk b/metadata.mk
index c88c5cdbe33..e3aff066581 100644
--- a/metadata.mk
+++ b/metadata.mk
@@ -3,7 +3,7 @@
 #################################################################################################
 
 # The version of calico/go-build and calico/base to use.
-GO_BUILD_VER=1.25.5-llvm18.1.8-k8s1.34.2
+GO_BUILD_VER=vanilla-ctlgen-20-1
 CALICO_BASE_VER=ubi9-1764706938
 
 # Env var to ACK Ginkgo deprecation warnings, may need updating with go-build.