update the ips for Q4 2025 and fix up some scripts

Author: upodroid

Makefile

@@ -124,5 +124,9 @@ lint:
 # shell linter
 shellcheck:
 	hack/make-rules/shellcheck.sh
+
+# Run all the code generators
+codegen:
+	hack/make-rules/codegen.sh
 #################################################################################
 .PHONY: all archeio geranos build unit integration test e2e-test clean update gofmt verify verify-generated lint shellcheck

…net/cloudcidrs/internal/ranges2go/run.sh hack/make-rules/codegen.shpkg/net/cloudcidrs/internal/ranges2go/run.sh renamed to hack/make-rules/codegen.sh pkg/net/cloudcidrs/internal/ranges2go/run.sh renamed to hack/make-rules/codegen.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Copyright 2022 The Kubernetes Authors.
+# Copyright 2025 The Kubernetes Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,13 +14,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# wrapper script so we can go:generate with this tool
-
+# script to run all codegen
 set -o errexit -o nounset -o pipefail
 
-SELF_DIR="$(dirname "${BASH_SOURCE[0]}")"
-REPO_ROOT="$(cd "${SELF_DIR}/../../../../../.." && pwd -P)"
-BIN_PATH="${REPO_ROOT}/bin/ranges2go"
+# cd to the repo root
+REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." &> /dev/null && pwd -P)"
+cd "${REPO_ROOT}"
+
+source hack/tools/setup-go.sh
+
+echo "Downloading AWS & GCP IP ranges data..."
+curl -fLo 'pkg/net/cloudcidrs/internal/ranges2go/data/aws-ip-ranges.json' 'https://ip-ranges.amazonaws.com/ip-ranges.json'
+curl -fLo 'pkg/net/cloudcidrs/internal/ranges2go/data/gcp-cloud.json' 'https://www.gstatic.com/ipranges/cloud.json'
 
-go build -o "${BIN_PATH}" "${SELF_DIR}"
-"${BIN_PATH}" "$@"
+go generate ./...

hack/make-rules/verify-generated.sh

@@ -30,10 +30,10 @@ OUT_FILE="${tmpdir}"/zz_generated_range_data.go
 export OUT_FILE
 DATA_DIR="${REPO_ROOT}"/pkg/net/cloudcidrs/internal/ranges2go/data
 export DATA_DIR
-./pkg/net/cloudcidrs/internal/ranges2go/run.sh
+go run ./pkg/net/cloudcidrs/internal/ranges2go
 
 if ! diff "${OUT_FILE}" ./pkg/net/cloudcidrs/zz_generated_range_data.go; then
     >&2 echo ""
-    >&2 echo "generated file is out of date, please run 'go generate ./...' to regenerate"
+    >&2 echo "generated file is out of date, please run 'make codegen' to regenerate"
     exit 1
 fi

pkg/net/cloudcidrs/doc.go

@@ -17,4 +17,4 @@ limitations under the License.
 // cloudcidrs contains Cloud CIDR matching
 package cloudcidrs
 
-//go:generate ./internal/ranges2go/run.sh
+//go:generate go run ./internal/ranges2go