kubernetes
diff --git a/‎hack/unwanted-dependencies.json
Lines changed: 0 additions & 1 deletion b/‎hack/unwanted-dependencies.json
Lines changed: 0 additions & 1 deletion
diff --git a/‎hack/update-codegen.sh
Lines changed: 2 additions & 2 deletions b/‎hack/update-codegen.sh
Lines changed: 2 additions & 2 deletions
diff --git a/‎staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/config_test.go
Lines changed: 4 additions & 2 deletions b/‎staging/src/k8s.io/apiserver/pkg/server/options/encryptionconfig/config_test.go
Lines changed: 4 additions & 2 deletions
diff --git a/‎staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/envelope.go
Lines changed: 1 addition & 1 deletion b/‎staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/envelope.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/envelope_test.go
Lines changed: 2 additions & 4 deletions b/‎staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2/envelope_test.go
Lines changed: 2 additions & 4 deletions
@@ -152,7 +152,6 @@
         "k8s.io/apiserver",
         "k8s.io/client-go",
         "k8s.io/code-generator",
-        "k8s.io/kms",
         "k8s.io/kube-aggregator",
         "k8s.io/kubelet",
         "k8s.io/kubernetes",
 
@@ -1025,8 +1025,6 @@ function codegen::protobindings() {
 
         "staging/src/k8s.io/kubelet/pkg/apis/deviceplugin"
 
-        "staging/src/k8s.io/kms/apis"
-        "staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2"
 
         "staging/src/k8s.io/kubelet/pkg/apis/dra"
 
@@ -1035,6 +1033,8 @@ function codegen::protobindings() {
 
     )
     local apis_using_protoc=(
+        "staging/src/k8s.io/kms/apis"
+        "staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2"
         "staging/src/k8s.io/cri-api/pkg/apis/runtime"
         "staging/src/k8s.io/externaljwt/apis"
     )
 
@@ -30,6 +30,7 @@ import (
 	"time"
 
 	"github.com/google/go-cmp/cmp"
+	"github.com/google/go-cmp/cmp/cmpopts"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -2100,16 +2101,17 @@ func Test_kmsv2PluginProbe_rotateDEKOnKeyIDChange(t *testing.T) {
 			}
 
 			ignoredFields := sets.NewString("Transformer", "EncryptedObject.EncryptedDEKSource", "UID", "CacheKey")
+			ignoreUnexported := cmpopts.IgnoreUnexported(kmstypes.EncryptedObject{})
 
 			gotState := *h.state.Load()
 
 			if diff := cmp.Diff(tt.wantState, gotState,
-				cmp.FilterPath(func(path cmp.Path) bool { return ignoredFields.Has(path.String()) }, cmp.Ignore()),
+				cmp.FilterPath(func(path cmp.Path) bool { return ignoredFields.Has(path.String()) }, cmp.Ignore()), ignoreUnexported,
 			); len(diff) > 0 {
 				t.Errorf("state mismatch (-want +got):\n%s", diff)
 			}
 
-			if len(cmp.Diff(tt.wantState, gotState)) > 0 { // we only need to run this check when the state changes
+			if len(cmp.Diff(tt.wantState, gotState, ignoreUnexported)) > 0 { // we only need to run this check when the state changes
 				validCiphertext := len(gotState.EncryptedObject.EncryptedDEKSource) > 0
 				if tt.useSeed {
 					validCiphertext = validCiphertext && gotState.EncryptedObject.EncryptedDEKSourceType == kmstypes.EncryptedDEKSourceType_HKDF_SHA256_XNONCE_AES_GCM_SEED
 
@@ -27,9 +27,9 @@ import (
 	"time"
 	"unsafe"
 
-	"github.com/gogo/protobuf/proto"
 	"go.opentelemetry.io/otel/attribute"
 	"golang.org/x/crypto/cryptobyte"
+	"google.golang.org/protobuf/proto"
 
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/apimachinery/pkg/util/uuid"
 
@@ -35,9 +35,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gogo/protobuf/proto"
 	"go.opentelemetry.io/otel/sdk/trace"
 	"go.opentelemetry.io/otel/sdk/trace/tracetest"
+	"google.golang.org/protobuf/proto"
 
 	utilrand "k8s.io/apimachinery/pkg/util/rand"
 	"k8s.io/apimachinery/pkg/util/uuid"
@@ -552,9 +552,7 @@ func TestEncodeDecode(t *testing.T) {
 	if err != nil {
 		t.Fatalf("envelopeTransformer: error while decoding data: %s", err)
 	}
-	// reset internal field modified by marshaling obj
-	obj.XXX_sizecache = 0
-	if !reflect.DeepEqual(got, obj) {
+	if !proto.Equal(got, obj) {
 		t.Fatalf("envelopeTransformer: decoded data does not match original data. Got: %v, want %v", got, obj)
 	}
 }
Original file line number	Diff line number	Diff line change
`@@ -1025,8 +1025,6 @@ function codegen::protobindings() {`
`1025`	`1025`
`1026`	`1026`	`"staging/src/k8s.io/kubelet/pkg/apis/deviceplugin"`
`1027`	`1027`
`1028`		`- "staging/src/k8s.io/kms/apis"`
`1029`		`- "staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2"`
`1030`	`1028`
`1031`	`1029`	`"staging/src/k8s.io/kubelet/pkg/apis/dra"`
`1032`	`1030`
`@@ -1035,6 +1033,8 @@ function codegen::protobindings() {`
`1035`	`1033`
`1036`	`1034`	`)`
`1037`	`1035`	`local apis_using_protoc=(`
	`1036`	`+ "staging/src/k8s.io/kms/apis"`
	`1037`	`+ "staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/kmsv2"`
`1038`	`1038`	`"staging/src/k8s.io/cri-api/pkg/apis/runtime"`
`1039`	`1039`	`"staging/src/k8s.io/externaljwt/apis"`
`1040`	`1040`	`)`
Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,9 @@ import (`
`35`	`35`	`"testing"`
`36`	`36`	`"time"`
`37`	`37`
`38`		`- "github.com/gogo/protobuf/proto"`
`39`	`38`	`"go.opentelemetry.io/otel/sdk/trace"`
`40`	`39`	`"go.opentelemetry.io/otel/sdk/trace/tracetest"`
	`40`	`+ "google.golang.org/protobuf/proto"`
`41`	`41`
`42`	`42`	`utilrand "k8s.io/apimachinery/pkg/util/rand"`
`43`	`43`	`"k8s.io/apimachinery/pkg/util/uuid"`
`@@ -552,9 +552,7 @@ func TestEncodeDecode(t *testing.T) {`
`552`	`552`	`if err != nil {`
`553`	`553`	`t.Fatalf("envelopeTransformer: error while decoding data: %s", err)`
`554`	`554`	`}`
`555`		`- // reset internal field modified by marshaling obj`
`556`		`- obj.XXX_sizecache = 0`
`557`		`- if !reflect.DeepEqual(got, obj) {`
	`555`	`+ if !proto.Equal(got, obj) {`
`558`	`556`	`t.Fatalf("envelopeTransformer: decoded data does not match original data. Got: %v, want %v", got, obj)`
`559`	`557`	`}`
`560`	`558`	`}`