diff --git a/go.mod b/go.mod index ca0916bee..e0d74bdc0 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,6 @@ go 1.20 require ( github.com/coreos/go-oidc v2.1.0+incompatible github.com/coreos/go-systemd/v22 v22.4.0 - github.com/davecgh/go-spew v1.1.1 github.com/emicklei/go-restful/v3 v3.9.0 github.com/evanphx/json-patch v4.12.0+incompatible github.com/fsnotify/fsnotify v1.6.0 @@ -43,8 +42,8 @@ require ( gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/square/go-jose.v2 v2.6.0 k8s.io/api v0.0.0-20230413214513-e2bb673563f3 - k8s.io/apimachinery v0.0.0-20230413213732-71d667e55043 - k8s.io/client-go v0.0.0-20230413215200-4e89310f6ea6 + k8s.io/apimachinery v0.0.0-20230414053554-40ea93bb2f46 + k8s.io/client-go v0.0.0-20230414055356-1dc92da6638c k8s.io/component-base v0.0.0-20230413220226-c4f7b7e7a6ce k8s.io/klog/v2 v2.90.1 k8s.io/kms v0.0.0-20230413003758-a38ec9832062 @@ -66,6 +65,7 @@ require ( github.com/cenkalti/backoff/v4 v4.1.3 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/coreos/go-semver v0.3.0 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect github.com/dustin/go-humanize v1.0.0 // indirect github.com/felixge/httpsnoop v1.0.3 // indirect github.com/go-logr/logr v1.2.3 // indirect @@ -125,8 +125,8 @@ require ( replace ( k8s.io/api => k8s.io/api v0.0.0-20230413214513-e2bb673563f3 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230413213732-71d667e55043 - k8s.io/client-go => k8s.io/client-go v0.0.0-20230413215200-4e89310f6ea6 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230414053554-40ea93bb2f46 + k8s.io/client-go => k8s.io/client-go v0.0.0-20230414055356-1dc92da6638c k8s.io/component-base => k8s.io/component-base v0.0.0-20230413220226-c4f7b7e7a6ce k8s.io/kms => k8s.io/kms v0.0.0-20230413003758-a38ec9832062 ) diff --git a/go.sum b/go.sum index fbec4a989..93e051b19 100644 --- a/go.sum +++ b/go.sum @@ -881,10 +881,10 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.0.0-20230413214513-e2bb673563f3 h1:7cfkxfIlr7ggIqRXLQJI9AGPlw4MpZoMvvOrxfWozA8= k8s.io/api v0.0.0-20230413214513-e2bb673563f3/go.mod h1:66bUJJkYkHsgTaCJvmLcO3K1js02rhyJxO2Ghgb4u3U= -k8s.io/apimachinery v0.0.0-20230413213732-71d667e55043 h1:z1mXDRFnQs+G2UBA4Z7+orSi6YR1gx0vpqyfMhT+uUs= -k8s.io/apimachinery v0.0.0-20230413213732-71d667e55043/go.mod h1:GBAjO2cow0Oymo5PgZq/mZf1haAb11cT37eQBWNSWXg= -k8s.io/client-go v0.0.0-20230413215200-4e89310f6ea6 h1:iEt1NajD/t+3z1DWPCPBEqqxIIUZZVWKuxQ2XtWkJag= -k8s.io/client-go v0.0.0-20230413215200-4e89310f6ea6/go.mod h1:L9OgCwLFWVNt1/bk8/U+NdUKmQyA/8/zGEjPYPFjFdw= +k8s.io/apimachinery v0.0.0-20230414053554-40ea93bb2f46 h1:2nlN/Or7sZ69tvoL3dLqv0VxQ962+2jpmU/Oun/h1Fs= +k8s.io/apimachinery v0.0.0-20230414053554-40ea93bb2f46/go.mod h1:GBAjO2cow0Oymo5PgZq/mZf1haAb11cT37eQBWNSWXg= +k8s.io/client-go v0.0.0-20230414055356-1dc92da6638c h1:X8xsm/lUxXloIap0I23fyRMVCfZX7VHLfaTM+U/vLcA= +k8s.io/client-go v0.0.0-20230414055356-1dc92da6638c/go.mod h1:BL1nAy0U+dUle4+/DKwGgav866GPI2ljVe1fYzfKy80= k8s.io/component-base v0.0.0-20230413220226-c4f7b7e7a6ce h1:1WsHtnSsHzpwL2CZ7mfqeYgTWe8PEd7vrALDEFMev0g= k8s.io/component-base v0.0.0-20230413220226-c4f7b7e7a6ce/go.mod h1:weVi4KM3RM1DL9QUTIAw5wkXXivtImoORUMMl4nJJrg= k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw= diff --git a/pkg/server/deleted_kinds_test.go b/pkg/server/deleted_kinds_test.go index 12af7fadc..c033990b4 100644 --- a/pkg/server/deleted_kinds_test.go +++ b/pkg/server/deleted_kinds_test.go @@ -21,9 +21,9 @@ import ( "strings" "testing" - "github.com/davecgh/go-spew/spew" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/util/dump" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/version" "k8s.io/apiserver/pkg/registry/rest" @@ -330,7 +330,7 @@ func Test_removeDeletedKinds(t *testing.T) { convertor := &dummyConvertor{} tt.resourceExpirationEvaluator.RemoveDeletedKinds("group.name", convertor, tt.versionedResourcesStorageMap) if !reflect.DeepEqual(tt.expectedStorage, tt.versionedResourcesStorageMap) { - t.Fatal(spew.Sdump(tt.versionedResourcesStorageMap)) + t.Fatal(dump.Pretty(tt.versionedResourcesStorageMap)) } }) } diff --git a/pkg/server/dynamiccertificates/tlsconfig_test.go b/pkg/server/dynamiccertificates/tlsconfig_test.go index 6503d197c..322cd7141 100644 --- a/pkg/server/dynamiccertificates/tlsconfig_test.go +++ b/pkg/server/dynamiccertificates/tlsconfig_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - "github.com/davecgh/go-spew/spew" + "k8s.io/apimachinery/pkg/util/dump" ) var serverKey = []byte(`-----BEGIN RSA PRIVATE KEY----- @@ -114,7 +114,7 @@ func TestNewStaticCertKeyContent(t *testing.T) { } actual, err := c.newTLSContent() if !reflect.DeepEqual(actual, test.expected) { - t.Error(spew.Sdump(actual)) + t.Error(dump.Pretty(actual)) } switch { case err == nil && len(test.expectedErr) == 0: