diff --git a/cmd/dependencyverifier/dependencyverifier.go b/cmd/dependencyverifier/dependencyverifier.go index a3f75a3d5da..24fe01fd8fd 100644 --- a/cmd/dependencyverifier/dependencyverifier.go +++ b/cmd/dependencyverifier/dependencyverifier.go @@ -25,6 +25,8 @@ import ( "os/exec" "sort" "strings" + + "github.com/google/go-cmp/cmp" ) type Unwanted struct { @@ -269,6 +271,7 @@ func main() { if !bytes.Equal(expected, actual) { log.Printf("Expected status of\n%s", string(expected)) log.Printf("Got status of\n%s", string(actual)) + log.Fatal("Status diff:\n", cmp.Diff(actual, expected)) } for expectedRef, expectedFrom := range configFromFile.Status.UnwantedReferences { actualFrom, ok := config.Status.UnwantedReferences[expectedRef] diff --git a/hack/lint-dependencies.sh b/hack/lint-dependencies.sh index 8c04f338225..b9c983d2912 100755 --- a/hack/lint-dependencies.sh +++ b/hack/lint-dependencies.sh @@ -43,6 +43,7 @@ rc=0 # List of dependencies we need to avoid dragging back into kubernetes/kubernetes # Check if unwanted dependencies are removed +# The array and map in `unwanted-dependencies.json` are in alphabetical order. go run k8s.io/kubernetes/cmd/dependencyverifier "${KUBE_ROOT}/hack/unwanted-dependencies.json" outdated=$(go list -m -json all | jq -r " diff --git a/hack/unwanted-dependencies.json b/hack/unwanted-dependencies.json index 4d8bc2dda2a..c2fa00a8502 100644 --- a/hack/unwanted-dependencies.json +++ b/hack/unwanted-dependencies.json @@ -153,6 +153,10 @@ "sigs.k8s.io/kustomize/api", "sigs.k8s.io/kustomize/kustomize/v5" ], + "golang.org/x/exp": [ + "github.com/antlr/antlr4/runtime/Go/antlr/v4", + "github.com/google/cel-go" + ], "google.golang.org/api": [ "cloud.google.com/go", "cloud.google.com/go/bigquery", @@ -184,10 +188,6 @@ "google.golang.org/genproto/googleapis/api", "google.golang.org/grpc", "sigs.k8s.io/apiserver-network-proxy/konnectivity-client" - ], - "golang.org/x/exp": [ - "github.com/google/cel-go", - "github.com/antlr/antlr4/runtime/Go/antlr/v4" ] } }