From 2bd3f492360701f79b104bc95dfabf3fb1474c5f Mon Sep 17 00:00:00 2001 From: Jefftree Date: Thu, 1 Jun 2023 18:25:39 +0000 Subject: [PATCH] Update gnostic references Kubernetes-commit: 2111e79f56acdfa6a8dab56780c52e3abc608758 --- discovery/cached/disk/cached_discovery.go | 2 +- discovery/cached/disk/cached_discovery_test.go | 2 +- discovery/cached/memory/memcache.go | 2 +- discovery/discovery_client.go | 2 +- discovery/discovery_client_test.go | 4 ++-- discovery/fake/discovery.go | 2 +- restmapper/discovery_test.go | 2 +- restmapper/shortcut_test.go | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/discovery/cached/disk/cached_discovery.go b/discovery/cached/disk/cached_discovery.go index 82137a8e..158810ee 100644 --- a/discovery/cached/disk/cached_discovery.go +++ b/discovery/cached/disk/cached_discovery.go @@ -25,7 +25,7 @@ import ( "sync" "time" - openapi_v2 "github.com/google/gnostic/openapiv2" + openapi_v2 "github.com/google/gnostic-models/openapiv2" "k8s.io/klog/v2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/discovery/cached/disk/cached_discovery_test.go b/discovery/cached/disk/cached_discovery_test.go index 1b22cd5f..e6c7a03a 100644 --- a/discovery/cached/disk/cached_discovery_test.go +++ b/discovery/cached/disk/cached_discovery_test.go @@ -26,7 +26,7 @@ import ( "testing" "time" - openapi_v2 "github.com/google/gnostic/openapiv2" + openapi_v2 "github.com/google/gnostic-models/openapiv2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/discovery/cached/memory/memcache.go b/discovery/cached/memory/memcache.go index 9143ce00..3829b3cc 100644 --- a/discovery/cached/memory/memcache.go +++ b/discovery/cached/memory/memcache.go @@ -22,7 +22,7 @@ import ( "sync" "syscall" - openapi_v2 "github.com/google/gnostic/openapiv2" + openapi_v2 "github.com/google/gnostic-models/openapiv2" errorsutil "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/discovery/discovery_client.go b/discovery/discovery_client.go index 1253fa1f..a4f083a1 100644 --- a/discovery/discovery_client.go +++ b/discovery/discovery_client.go @@ -30,7 +30,7 @@ import ( //nolint:staticcheck // SA1019 Keep using module since it's still being maintained and the api of google.golang.org/protobuf/proto differs "github.com/golang/protobuf/proto" - openapi_v2 "github.com/google/gnostic/openapiv2" + openapi_v2 "github.com/google/gnostic-models/openapiv2" apidiscovery "k8s.io/api/apidiscovery/v2beta1" "k8s.io/apimachinery/pkg/api/errors" diff --git a/discovery/discovery_client_test.go b/discovery/discovery_client_test.go index d956f378..7bb62fe9 100644 --- a/discovery/discovery_client_test.go +++ b/discovery/discovery_client_test.go @@ -26,8 +26,8 @@ import ( "time" "github.com/gogo/protobuf/proto" - openapi_v2 "github.com/google/gnostic/openapiv2" - openapi_v3 "github.com/google/gnostic/openapiv3" + openapi_v2 "github.com/google/gnostic-models/openapiv2" + openapi_v3 "github.com/google/gnostic-models/openapiv3" "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/discovery/fake/discovery.go b/discovery/fake/discovery.go index d234db89..f8a78e1e 100644 --- a/discovery/fake/discovery.go +++ b/discovery/fake/discovery.go @@ -20,7 +20,7 @@ import ( "fmt" "net/http" - openapi_v2 "github.com/google/gnostic/openapiv2" + openapi_v2 "github.com/google/gnostic-models/openapiv2" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/restmapper/discovery_test.go b/restmapper/discovery_test.go index f0cfba38..b0c90fe1 100644 --- a/restmapper/discovery_test.go +++ b/restmapper/discovery_test.go @@ -31,7 +31,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" - openapi_v2 "github.com/google/gnostic/openapiv2" + openapi_v2 "github.com/google/gnostic-models/openapiv2" "github.com/stretchr/testify/assert" ) diff --git a/restmapper/shortcut_test.go b/restmapper/shortcut_test.go index cd8506a9..fa2355d5 100644 --- a/restmapper/shortcut_test.go +++ b/restmapper/shortcut_test.go @@ -19,7 +19,7 @@ package restmapper import ( "testing" - openapi_v2 "github.com/google/gnostic/openapiv2" + openapi_v2 "github.com/google/gnostic-models/openapiv2" "github.com/google/go-cmp/cmp" "k8s.io/apimachinery/pkg/api/errors"