kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #132221 from dims/new-cmp-diff-impl 

New implementation for `Diff` (drop in replacement for `cmp.Diff`)

Kubernetes-commit: 3e39d1074fc717a883aaf57b966dd7a06dfca2ec
This commit is contained in:
Kubernetes Publisher 2025-06-16 18:02:58 -07:00
parent 3b43a1a7f8 6db9ead72a
commit d76c79a4e9
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
go.mod
View File

@ -49,9 +49,9 @@ require (
gopkg.in/go-jose/go-jose.v2 v2.6.3
gopkg.in/natefinch/lumberjack.v2 v2.2.1
k8s.io/api v0.0.0-20250616192729-f4a3fcd2245e
k8s.io/apimachinery v0.0.0-20250612195403-e0270fe44c97
k8s.io/client-go v0.0.0-20250613134311-62b0aba8c9b6
k8s.io/component-base v0.0.0-20250613180050-de927569f3fd
k8s.io/apimachinery v0.0.0-20250617032454-d2d60b8eb21f
k8s.io/client-go v0.0.0-20250617033148-10fe56d6e0ce
k8s.io/component-base v0.0.0-20250617034450-dc0881cd03da
k8s.io/klog/v2 v2.130.1
k8s.io/kms v0.0.0-20250527175117-e6cd4d7331a4
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff

12
go.sum
View File

@ -295,12 +295,12 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
k8s.io/api v0.0.0-20250616192729-f4a3fcd2245e h1:YVWWCL8/51Adbyo/pps3kAK1Asi7W8RSFVU9JbJJAkU=
k8s.io/api v0.0.0-20250616192729-f4a3fcd2245e/go.mod h1:+9QbMyXTXctHAXg3fdhJbuZgyzhYgprCn43M5NqoJzw=
k8s.io/apimachinery v0.0.0-20250612195403-e0270fe44c97 h1:h2og30eGCCk1GOEZK6+LNhhlydDcWY3wJaWDIs05xR8=
k8s.io/apimachinery v0.0.0-20250612195403-e0270fe44c97/go.mod h1:EZ7eIfFAwky7ktmG4Pu9XWxBxFG++4dxPDOM0GL3abw=
k8s.io/client-go v0.0.0-20250613134311-62b0aba8c9b6 h1:3JROzxB0hC3Re9ERr+S0TtE0NpTg4vEqo+B+KZWREjQ=
k8s.io/client-go v0.0.0-20250613134311-62b0aba8c9b6/go.mod h1:hktzpPyrdfB1WrXOvdnDayNSrngzEwWjiwTGqq6Zjns=
k8s.io/component-base v0.0.0-20250613180050-de927569f3fd h1:hGffspZ98AS2Mf+LD96QkAiZUanidND5jydlQ7IMkb8=
k8s.io/component-base v0.0.0-20250613180050-de927569f3fd/go.mod h1:u4ewnv5vMzoE9HEt+wofSMqKIX7SByTiNAAK/9s6Z24=
k8s.io/apimachinery v0.0.0-20250617032454-d2d60b8eb21f h1:+TyAxkvb3oaCIN4Ev+o9FvyFVd1VDcWHHrEKB5V6zRE=
k8s.io/apimachinery v0.0.0-20250617032454-d2d60b8eb21f/go.mod h1:/kMnP8WowZRse4LjwOCxh+RR0W03jl2f/gCRYqeYMZA=
k8s.io/client-go v0.0.0-20250617033148-10fe56d6e0ce h1:RImJppLyEBAjmdOtDd48dCKVFl3e8HR8XtiHeR1N09s=
k8s.io/client-go v0.0.0-20250617033148-10fe56d6e0ce/go.mod h1:oP97QArDmRQMXTG+rljxoy/wvK5GEl6w8Dp6Y9mloSA=
k8s.io/component-base v0.0.0-20250617034450-dc0881cd03da h1:JIslv7EMZ/AS8fKVL2ttpIbKiLKiMc4FEBiFepcaHCk=
k8s.io/component-base v0.0.0-20250617034450-dc0881cd03da/go.mod h1:iMJjQa+o/mr6ZuRxeZJyv/X6qV7SlKwQtmX4TSYQais=
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
k8s.io/kms v0.0.0-20250527175117-e6cd4d7331a4 h1:zom2NKyPKUou0oBny5sJa6yZotv/e31dPlvGctPVzU4=

2
pkg/admission/testing/helpers.go
View File

@ -21,7 +21,7 @@ import (
"reflect"
"testing"
"github.com/google/go-cmp/cmp" //nolint:depguard
"github.com/google/go-cmp/cmp"
apiequality "k8s.io/apimachinery/pkg/api/equality"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apiserver/pkg/admission"

4
pkg/endpoints/discovery/aggregated/fake.go
View File

@ -25,9 +25,9 @@ import (
"time"
"github.com/emicklei/go-restful/v3"
"github.com/google/go-cmp/cmp" //nolint:depguard
apidiscoveryv2 "k8s.io/api/apidiscovery/v2"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/diff"
"k8s.io/apimachinery/pkg/util/wait"
)
@ -91,7 +91,7 @@ func (f *fakeResourceManager) Validate() error {
defer f.expect.lock.RUnlock()
if !reflect.DeepEqual(f.expect.Actions, f.Actions) {
return errors.New(cmp.Diff(f.expect.Actions, f.Actions))
return errors.New(diff.Diff(f.expect.Actions, f.Actions))
}
return nil
}

2
pkg/storage/testing/store_tests.go
View File

@ -29,7 +29,7 @@ import (
"sync"
"testing"
"github.com/google/go-cmp/cmp" //nolint:depguard
"github.com/google/go-cmp/cmp"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
apierrors "k8s.io/apimachinery/pkg/api/errors"

2
pkg/storage/testing/utils.go
View File

@ -28,7 +28,7 @@ import (
"testing"
"time"
"github.com/google/go-cmp/cmp" //nolint:depguard
"github.com/google/go-cmp/cmp"
"k8s.io/apimachinery/pkg/api/meta"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/fields"

4
pkg/util/flowcontrol/apf_controller.go
View File

@ -28,11 +28,11 @@ import (
"sync"
"time"
"github.com/google/go-cmp/cmp" //nolint:depguard
apiequality "k8s.io/apimachinery/pkg/api/equality"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/util/diff"
utilerrors "k8s.io/apimachinery/pkg/util/errors"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apimachinery/pkg/util/sets"
@ -607,7 +607,7 @@ func (cfgCtlr *configController) digestConfigObjects(newPLs []*flowcontrol.Prior
currResult.updatedItems.Insert(fsu.flowSchema.Name)
if klogV := klog.V(4); klogV.Enabled() {
klogV.Infof("%s writing Condition %s to FlowSchema %s, which had ResourceVersion=%s, because its previous value was %s, diff: %s",
cfgCtlr.name, fsu.condition, fsu.flowSchema.Name, fsu.flowSchema.ResourceVersion, fcfmt.Fmt(fsu.oldValue), cmp.Diff(fsu.oldValue, fsu.condition))
cfgCtlr.name, fsu.condition, fsu.flowSchema.Name, fsu.flowSchema.ResourceVersion, fcfmt.Fmt(fsu.oldValue), diff.Diff(fsu.oldValue, fsu.condition))
}
if err := apply(cfgCtlr.flowcontrolClient.FlowSchemas(), fsu, cfgCtlr.asFieldManager); err != nil {