Update kube-openapi and gnostic dependencies

Pulling in https://github.com/kubernetes/kube-openapi/pull/220

Kubernetes-commit: a849c8998c1ed71f25387a560f8359596aec8bd3
This commit is contained in:
John Howard
2021-03-23 08:33:15 -07:00
committed by Kubernetes Publisher
parent 10997424fc
commit 4b5d87d34b
3 changed files with 22 additions and 20 deletions

View File

@@ -29,7 +29,7 @@ import (
"github.com/gogo/protobuf/proto"
openapi_v2 "github.com/googleapis/gnostic/openapiv2"
"github.com/stretchr/testify/assert"
golangproto "google.golang.org/protobuf/proto"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/diff"
@@ -547,8 +547,8 @@ func TestGetOpenAPISchema(t *testing.T) {
if err != nil {
t.Fatalf("unexpected error getting openapi: %v", err)
}
if e, a := returnedOpenAPI(), got; !reflect.DeepEqual(e, a) {
t.Errorf("expected %v, got %v", e, a)
if e, a := returnedOpenAPI(), got; !golangproto.Equal(e, a) {
t.Errorf("expected \n%v, got \n%v", e, a)
}
}
@@ -564,7 +564,7 @@ func TestGetOpenAPISchemaForbiddenFallback(t *testing.T) {
if err != nil {
t.Fatalf("unexpected error getting openapi: %v", err)
}
if e, a := returnedOpenAPI(), got; !reflect.DeepEqual(e, a) {
if e, a := returnedOpenAPI(), got; !golangproto.Equal(e, a) {
t.Errorf("expected %v, got %v", e, a)
}
}
@@ -581,7 +581,7 @@ func TestGetOpenAPISchemaNotFoundFallback(t *testing.T) {
if err != nil {
t.Fatalf("unexpected error getting openapi: %v", err)
}
if e, a := returnedOpenAPI(), got; !reflect.DeepEqual(e, a) {
if e, a := returnedOpenAPI(), got; !golangproto.Equal(e, a) {
t.Errorf("expected %v, got %v", e, a)
}
}
@@ -598,7 +598,7 @@ func TestGetOpenAPISchemaNotAcceptableFallback(t *testing.T) {
if err != nil {
t.Fatalf("unexpected error getting openapi: %v", err)
}
if e, a := returnedOpenAPI(), got; !reflect.DeepEqual(e, a) {
if e, a := returnedOpenAPI(), got; !golangproto.Equal(e, a) {
t.Errorf("expected %v, got %v", e, a)
}
}