scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 12:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #118707 from pacoxu/unwanted-status-order

Browse Source 
update the unwanted-dependencies order
This commit is contained in:
Kubernetes Prow Robot
2023-07-04 12:20:54 -07:00
committed by GitHub
parent cb7acfd46e 8cd65e9cee
commit 0235a5a206
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/dependencyverifier/dependencyverifier.go
View File

@@ -25,6 +25,8 @@ import (
"os/exec" "os/exec"
"sort" "sort"
"strings" "strings"
"github.com/google/go-cmp/cmp"
) )
type Unwanted struct { type Unwanted struct {
@@ -269,6 +271,7 @@ func main() {
if !bytes.Equal(expected, actual) { if !bytes.Equal(expected, actual) {
log.Printf("Expected status of\n%s", string(expected)) log.Printf("Expected status of\n%s", string(expected))
log.Printf("Got status of\n%s", string(actual)) 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 { for expectedRef, expectedFrom := range configFromFile.Status.UnwantedReferences {
actualFrom, ok := config.Status.UnwantedReferences[expectedRef] actualFrom, ok := config.Status.UnwantedReferences[expectedRef]

1
hack/lint-dependencies.sh
View File

@@ -43,6 +43,7 @@ rc=0
# List of dependencies we need to avoid dragging back into kubernetes/kubernetes # List of dependencies we need to avoid dragging back into kubernetes/kubernetes
# Check if unwanted dependencies are removed # 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" go run k8s.io/kubernetes/cmd/dependencyverifier "${KUBE_ROOT}/hack/unwanted-dependencies.json"
outdated=$(go list -m -json all | jq -r " outdated=$(go list -m -json all | jq -r "

8
hack/unwanted-dependencies.json
View File

@@ -153,6 +153,10 @@
"sigs.k8s.io/kustomize/api", "sigs.k8s.io/kustomize/api",
"sigs.k8s.io/kustomize/kustomize/v5" "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": [ "google.golang.org/api": [
"cloud.google.com/go", "cloud.google.com/go",
"cloud.google.com/go/bigquery", "cloud.google.com/go/bigquery",
@@ -184,10 +188,6 @@
"google.golang.org/genproto/googleapis/api", "google.golang.org/genproto/googleapis/api",
"google.golang.org/grpc", "google.golang.org/grpc",
"sigs.k8s.io/apiserver-network-proxy/konnectivity-client" "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"
] ]
} }
} }