Update gnostic references

This commit is contained in:
Jefftree 2023-06-01 18:25:39 +00:00
parent 1993a4cb37
commit 2111e79f56
19 changed files with 20 additions and 20 deletions

View File

@ -25,7 +25,7 @@ import (
"testing" "testing"
"time" "time"
openapi_v2 "github.com/google/gnostic/openapiv2" openapi_v2 "github.com/google/gnostic-models/openapiv2"
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
fuzz "github.com/google/gofuzz" fuzz "github.com/google/gofuzz"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"

View File

@ -20,7 +20,7 @@ import (
"os" "os"
"sync" "sync"
openapi_v2 "github.com/google/gnostic/openapiv2" openapi_v2 "github.com/google/gnostic-models/openapiv2"
openapi "k8s.io/kube-openapi/pkg/util/proto" openapi "k8s.io/kube-openapi/pkg/util/proto"
) )

View File

@ -19,7 +19,7 @@ package openapi
import ( import (
"encoding/json" "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/util/proto"
"k8s.io/kube-openapi/pkg/validation/spec" "k8s.io/kube-openapi/pkg/validation/spec"

View File

@ -20,7 +20,7 @@ import (
"errors" "errors"
"fmt" "fmt"
openapi_v2 "github.com/google/gnostic/openapiv2" openapi_v2 "github.com/google/gnostic-models/openapiv2"
yaml "gopkg.in/yaml.v2" yaml "gopkg.in/yaml.v2"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/discovery" "k8s.io/client-go/discovery"

View File

@ -20,7 +20,7 @@ import (
"path/filepath" "path/filepath"
"testing" "testing"
openapi_v2 "github.com/google/gnostic/openapiv2" openapi_v2 "github.com/google/gnostic-models/openapiv2"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
openapitesting "k8s.io/kube-openapi/pkg/util/proto/testing" openapitesting "k8s.io/kube-openapi/pkg/util/proto/testing"
) )

View File

@ -25,7 +25,7 @@ import (
"sync" "sync"
"time" "time"
openapi_v2 "github.com/google/gnostic/openapiv2" openapi_v2 "github.com/google/gnostic-models/openapiv2"
"k8s.io/klog/v2" "k8s.io/klog/v2"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

View File

@ -26,7 +26,7 @@ import (
"testing" "testing"
"time" "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/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"

View File

@ -22,7 +22,7 @@ import (
"sync" "sync"
"syscall" "syscall"
openapi_v2 "github.com/google/gnostic/openapiv2" openapi_v2 "github.com/google/gnostic-models/openapiv2"
errorsutil "k8s.io/apimachinery/pkg/api/errors" errorsutil "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

View File

@ -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 //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" "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" apidiscovery "k8s.io/api/apidiscovery/v2beta1"
"k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/errors"

View File

@ -26,8 +26,8 @@ import (
"time" "time"
"github.com/gogo/protobuf/proto" "github.com/gogo/protobuf/proto"
openapi_v2 "github.com/google/gnostic/openapiv2" openapi_v2 "github.com/google/gnostic-models/openapiv2"
openapi_v3 "github.com/google/gnostic/openapiv3" openapi_v3 "github.com/google/gnostic-models/openapiv3"
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"

View File

@ -20,7 +20,7 @@ import (
"fmt" "fmt"
"net/http" "net/http"
openapi_v2 "github.com/google/gnostic/openapiv2" openapi_v2 "github.com/google/gnostic-models/openapiv2"
"k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

View File

@ -31,7 +31,7 @@ import (
restclient "k8s.io/client-go/rest" restclient "k8s.io/client-go/rest"
"k8s.io/client-go/rest/fake" "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" "github.com/stretchr/testify/assert"
) )

View File

@ -19,7 +19,7 @@ package restmapper
import ( import (
"testing" "testing"
openapi_v2 "github.com/google/gnostic/openapiv2" openapi_v2 "github.com/google/gnostic-models/openapiv2"
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
"k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/errors"

View File

@ -22,7 +22,7 @@ import (
"os" "os"
"strings" "strings"
openapiv2 "github.com/google/gnostic/openapiv2" openapiv2 "github.com/google/gnostic-models/openapiv2"
"k8s.io/gengo/types" "k8s.io/gengo/types"
utilproto "k8s.io/kube-openapi/pkg/util/proto" utilproto "k8s.io/kube-openapi/pkg/util/proto"
"k8s.io/kube-openapi/pkg/validation/spec" "k8s.io/kube-openapi/pkg/validation/spec"

View File

@ -17,7 +17,7 @@ limitations under the License.
package openapi package openapi
import ( import (
openapi_v2 "github.com/google/gnostic/openapiv2" openapi_v2 "github.com/google/gnostic-models/openapiv2"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/kube-openapi/pkg/util/proto" "k8s.io/kube-openapi/pkg/util/proto"

View File

@ -19,7 +19,7 @@ package openapi
import ( import (
"sync" "sync"
openapi_v2 "github.com/google/gnostic/openapiv2" openapi_v2 "github.com/google/gnostic-models/openapiv2"
"k8s.io/client-go/discovery" "k8s.io/client-go/discovery"
) )

View File

@ -19,7 +19,7 @@ package openapi_test
import ( import (
"fmt" "fmt"
openapi_v2 "github.com/google/gnostic/openapiv2" openapi_v2 "github.com/google/gnostic-models/openapiv2"
. "github.com/onsi/ginkgo/v2" . "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"

View File

@ -37,7 +37,7 @@ import (
"strings" "strings"
"time" "time"
openapi_v2 "github.com/google/gnostic/openapiv2" openapi_v2 "github.com/google/gnostic-models/openapiv2"
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
"sigs.k8s.io/yaml" "sigs.k8s.io/yaml"

View File

@ -26,7 +26,7 @@ import (
"testing" "testing"
"time" "time"
openapi_v3 "github.com/google/gnostic/openapiv3" openapi_v3 "github.com/google/gnostic-models/openapiv3"
"google.golang.org/protobuf/proto" "google.golang.org/protobuf/proto"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"