diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/openapi/v2/conversion_test.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/openapi/v2/conversion_test.go index 2857d75d886..f6957267932 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/openapi/v2/conversion_test.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/controller/openapi/v2/conversion_test.go @@ -25,7 +25,7 @@ import ( "testing" "time" - openapi_v2 "github.com/google/gnostic/openapiv2" + openapi_v2 "github.com/google/gnostic-models/openapiv2" "github.com/google/go-cmp/cmp" fuzz "github.com/google/gofuzz" "gopkg.in/yaml.v2" diff --git a/staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/testing/openapi.go b/staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/testing/openapi.go index 971614975f5..ae8fbfafacf 100644 --- a/staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/testing/openapi.go +++ b/staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/testing/openapi.go @@ -20,7 +20,7 @@ import ( "os" "sync" - openapi_v2 "github.com/google/gnostic/openapiv2" + openapi_v2 "github.com/google/gnostic-models/openapiv2" openapi "k8s.io/kube-openapi/pkg/util/proto" ) diff --git a/staging/src/k8s.io/apiserver/pkg/util/openapi/proto.go b/staging/src/k8s.io/apiserver/pkg/util/openapi/proto.go index 162812f145d..e36bf452b16 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/openapi/proto.go +++ b/staging/src/k8s.io/apiserver/pkg/util/openapi/proto.go @@ -19,7 +19,7 @@ package openapi import ( "encoding/json" - openapi_v2 "github.com/google/gnostic/openapiv2" + openapi_v2 "github.com/google/gnostic-models/openapiv2" "k8s.io/kube-openapi/pkg/util/proto" "k8s.io/kube-openapi/pkg/validation/spec" diff --git a/staging/src/k8s.io/cli-runtime/pkg/resource/query_param_verifier.go b/staging/src/k8s.io/cli-runtime/pkg/resource/query_param_verifier.go index 3b08025c3ef..4dcea560b84 100644 --- a/staging/src/k8s.io/cli-runtime/pkg/resource/query_param_verifier.go +++ b/staging/src/k8s.io/cli-runtime/pkg/resource/query_param_verifier.go @@ -20,7 +20,7 @@ import ( "errors" "fmt" - openapi_v2 "github.com/google/gnostic/openapiv2" + openapi_v2 "github.com/google/gnostic-models/openapiv2" yaml "gopkg.in/yaml.v2" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/discovery" diff --git a/staging/src/k8s.io/cli-runtime/pkg/resource/query_param_verifier_test.go b/staging/src/k8s.io/cli-runtime/pkg/resource/query_param_verifier_test.go index b1c1bb620ba..c2d3c176a0f 100644 --- a/staging/src/k8s.io/cli-runtime/pkg/resource/query_param_verifier_test.go +++ b/staging/src/k8s.io/cli-runtime/pkg/resource/query_param_verifier_test.go @@ -20,7 +20,7 @@ import ( "path/filepath" "testing" - openapi_v2 "github.com/google/gnostic/openapiv2" + openapi_v2 "github.com/google/gnostic-models/openapiv2" "k8s.io/apimachinery/pkg/runtime/schema" openapitesting "k8s.io/kube-openapi/pkg/util/proto/testing" ) diff --git a/staging/src/k8s.io/client-go/discovery/cached/disk/cached_discovery.go b/staging/src/k8s.io/client-go/discovery/cached/disk/cached_discovery.go index 82137a8ee4b..158810ee53d 100644 --- a/staging/src/k8s.io/client-go/discovery/cached/disk/cached_discovery.go +++ b/staging/src/k8s.io/client-go/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/staging/src/k8s.io/client-go/discovery/cached/disk/cached_discovery_test.go b/staging/src/k8s.io/client-go/discovery/cached/disk/cached_discovery_test.go index 1b22cd5fe52..e6c7a03af76 100644 --- a/staging/src/k8s.io/client-go/discovery/cached/disk/cached_discovery_test.go +++ b/staging/src/k8s.io/client-go/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/staging/src/k8s.io/client-go/discovery/cached/memory/memcache.go b/staging/src/k8s.io/client-go/discovery/cached/memory/memcache.go index 9143ce00ab4..3829b3cc09c 100644 --- a/staging/src/k8s.io/client-go/discovery/cached/memory/memcache.go +++ b/staging/src/k8s.io/client-go/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/staging/src/k8s.io/client-go/discovery/discovery_client.go b/staging/src/k8s.io/client-go/discovery/discovery_client.go index 1253fa1f44a..a4f083a1ac3 100644 --- a/staging/src/k8s.io/client-go/discovery/discovery_client.go +++ b/staging/src/k8s.io/client-go/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/staging/src/k8s.io/client-go/discovery/discovery_client_test.go b/staging/src/k8s.io/client-go/discovery/discovery_client_test.go index d956f3787ed..7bb62fe98b9 100644 --- a/staging/src/k8s.io/client-go/discovery/discovery_client_test.go +++ b/staging/src/k8s.io/client-go/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/staging/src/k8s.io/client-go/discovery/fake/discovery.go b/staging/src/k8s.io/client-go/discovery/fake/discovery.go index d234db893dd..f8a78e1ef43 100644 --- a/staging/src/k8s.io/client-go/discovery/fake/discovery.go +++ b/staging/src/k8s.io/client-go/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/staging/src/k8s.io/client-go/restmapper/discovery_test.go b/staging/src/k8s.io/client-go/restmapper/discovery_test.go index f0cfba38278..b0c90fe19c8 100644 --- a/staging/src/k8s.io/client-go/restmapper/discovery_test.go +++ b/staging/src/k8s.io/client-go/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/staging/src/k8s.io/client-go/restmapper/shortcut_test.go b/staging/src/k8s.io/client-go/restmapper/shortcut_test.go index cd8506a9066..fa2355d5f1d 100644 --- a/staging/src/k8s.io/client-go/restmapper/shortcut_test.go +++ b/staging/src/k8s.io/client-go/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" diff --git a/staging/src/k8s.io/code-generator/cmd/applyconfiguration-gen/generators/openapi.go b/staging/src/k8s.io/code-generator/cmd/applyconfiguration-gen/generators/openapi.go index 940926f3456..00d119dd65c 100644 --- a/staging/src/k8s.io/code-generator/cmd/applyconfiguration-gen/generators/openapi.go +++ b/staging/src/k8s.io/code-generator/cmd/applyconfiguration-gen/generators/openapi.go @@ -22,7 +22,7 @@ import ( "os" "strings" - openapiv2 "github.com/google/gnostic/openapiv2" + openapiv2 "github.com/google/gnostic-models/openapiv2" "k8s.io/gengo/types" utilproto "k8s.io/kube-openapi/pkg/util/proto" "k8s.io/kube-openapi/pkg/validation/spec" diff --git a/staging/src/k8s.io/kubectl/pkg/util/openapi/openapi.go b/staging/src/k8s.io/kubectl/pkg/util/openapi/openapi.go index f99e0df5076..de2fffad88f 100644 --- a/staging/src/k8s.io/kubectl/pkg/util/openapi/openapi.go +++ b/staging/src/k8s.io/kubectl/pkg/util/openapi/openapi.go @@ -17,7 +17,7 @@ limitations under the License. package openapi import ( - openapi_v2 "github.com/google/gnostic/openapiv2" + openapi_v2 "github.com/google/gnostic-models/openapiv2" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/kube-openapi/pkg/util/proto" diff --git a/staging/src/k8s.io/kubectl/pkg/util/openapi/openapi_getter.go b/staging/src/k8s.io/kubectl/pkg/util/openapi/openapi_getter.go index 1af4566bbc4..3179161ee03 100644 --- a/staging/src/k8s.io/kubectl/pkg/util/openapi/openapi_getter.go +++ b/staging/src/k8s.io/kubectl/pkg/util/openapi/openapi_getter.go @@ -19,7 +19,7 @@ package openapi import ( "sync" - openapi_v2 "github.com/google/gnostic/openapiv2" + openapi_v2 "github.com/google/gnostic-models/openapiv2" "k8s.io/client-go/discovery" ) diff --git a/staging/src/k8s.io/kubectl/pkg/util/openapi/openapi_getter_test.go b/staging/src/k8s.io/kubectl/pkg/util/openapi/openapi_getter_test.go index d30d142783f..a7d33b26b75 100644 --- a/staging/src/k8s.io/kubectl/pkg/util/openapi/openapi_getter_test.go +++ b/staging/src/k8s.io/kubectl/pkg/util/openapi/openapi_getter_test.go @@ -19,7 +19,7 @@ package openapi_test import ( "fmt" - openapi_v2 "github.com/google/gnostic/openapiv2" + openapi_v2 "github.com/google/gnostic-models/openapiv2" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/test/e2e/kubectl/kubectl.go b/test/e2e/kubectl/kubectl.go index 1ab8317da5a..9f5bf0dc48f 100644 --- a/test/e2e/kubectl/kubectl.go +++ b/test/e2e/kubectl/kubectl.go @@ -37,7 +37,7 @@ import ( "strings" "time" - openapi_v2 "github.com/google/gnostic/openapiv2" + openapi_v2 "github.com/google/gnostic-models/openapiv2" "github.com/google/go-cmp/cmp" "sigs.k8s.io/yaml" diff --git a/test/integration/apiserver/openapi/openapiv3_test.go b/test/integration/apiserver/openapi/openapiv3_test.go index 1f0369e48d9..b15a608680f 100644 --- a/test/integration/apiserver/openapi/openapiv3_test.go +++ b/test/integration/apiserver/openapi/openapiv3_test.go @@ -26,7 +26,7 @@ import ( "testing" "time" - openapi_v3 "github.com/google/gnostic/openapiv3" + openapi_v3 "github.com/google/gnostic-models/openapiv3" "google.golang.org/protobuf/proto" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"