mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-10-22 15:09:39 +00:00
mechanical repercussions
This commit is contained in:
@@ -22,7 +22,6 @@ go_library(
|
||||
"//pkg/client/testing/core:go_default_library",
|
||||
"//pkg/client/typed/discovery:go_default_library",
|
||||
"//pkg/client/typed/discovery/fake:go_default_library",
|
||||
"//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
|
||||
"//vendor:k8s.io/apimachinery/pkg/runtime",
|
||||
"//vendor:k8s.io/apimachinery/pkg/watch",
|
||||
],
|
||||
|
@@ -17,7 +17,6 @@ limitations under the License.
|
||||
package fake
|
||||
|
||||
import (
|
||||
"k8s.io/apimachinery/pkg/apimachinery/registered"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
"k8s.io/apimachinery/pkg/watch"
|
||||
clientset "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/clientset"
|
||||
@@ -42,7 +41,7 @@ func NewSimpleClientset(objects ...runtime.Object) *Clientset {
|
||||
}
|
||||
|
||||
fakePtr := core.Fake{}
|
||||
fakePtr.AddReactor("*", "*", core.ObjectReaction(o, registered.RESTMapper()))
|
||||
fakePtr.AddReactor("*", "*", core.ObjectReaction(o, api.Registry.RESTMapper()))
|
||||
|
||||
fakePtr.AddWatchReactor("*", core.DefaultWatchReactor(watch.NewFake(), nil))
|
||||
|
||||
|
@@ -21,7 +21,6 @@ go_library(
|
||||
"//pkg/api:go_default_library",
|
||||
"//pkg/api/v1:go_default_library",
|
||||
"//pkg/client/restclient:go_default_library",
|
||||
"//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
|
||||
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
|
||||
"//vendor:k8s.io/apimachinery/pkg/runtime/schema",
|
||||
"//vendor:k8s.io/apimachinery/pkg/runtime/serializer",
|
||||
|
@@ -18,7 +18,6 @@ package v1alpha1
|
||||
|
||||
import (
|
||||
fmt "fmt"
|
||||
registered "k8s.io/apimachinery/pkg/apimachinery/registered"
|
||||
schema "k8s.io/apimachinery/pkg/runtime/schema"
|
||||
serializer "k8s.io/apimachinery/pkg/runtime/serializer"
|
||||
api "k8s.io/kubernetes/pkg/api"
|
||||
@@ -30,7 +29,7 @@ type ApiregistrationV1alpha1Interface interface {
|
||||
APIServicesGetter
|
||||
}
|
||||
|
||||
// ApiregistrationV1alpha1Client is used to interact with features provided by the k8s.io/apimachinery/pkg/apimachinery/registered.Group group.
|
||||
// ApiregistrationV1alpha1Client is used to interact with features provided by the apiregistration.k8s.io group.
|
||||
type ApiregistrationV1alpha1Client struct {
|
||||
restClient restclient.Interface
|
||||
}
|
||||
@@ -73,7 +72,7 @@ func setConfigDefaults(config *restclient.Config) error {
|
||||
return err
|
||||
}
|
||||
// if apiregistration.k8s.io/v1alpha1 is not enabled, return an error
|
||||
if !registered.IsEnabledVersion(gv) {
|
||||
if !api.Registry.IsEnabledVersion(gv) {
|
||||
return fmt.Errorf("apiregistration.k8s.io/v1alpha1 is not enabled")
|
||||
}
|
||||
config.APIPath = "/apis"
|
||||
|
@@ -22,7 +22,6 @@ go_library(
|
||||
"//pkg/client/testing/core:go_default_library",
|
||||
"//pkg/client/typed/discovery:go_default_library",
|
||||
"//pkg/client/typed/discovery/fake:go_default_library",
|
||||
"//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
|
||||
"//vendor:k8s.io/apimachinery/pkg/runtime",
|
||||
"//vendor:k8s.io/apimachinery/pkg/watch",
|
||||
],
|
||||
|
@@ -17,7 +17,6 @@ limitations under the License.
|
||||
package fake
|
||||
|
||||
import (
|
||||
"k8s.io/apimachinery/pkg/apimachinery/registered"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
"k8s.io/apimachinery/pkg/watch"
|
||||
clientset "k8s.io/kubernetes/cmd/kube-aggregator/pkg/client/clientset_generated/internalclientset"
|
||||
@@ -42,7 +41,7 @@ func NewSimpleClientset(objects ...runtime.Object) *Clientset {
|
||||
}
|
||||
|
||||
fakePtr := core.Fake{}
|
||||
fakePtr.AddReactor("*", "*", core.ObjectReaction(o, registered.RESTMapper()))
|
||||
fakePtr.AddReactor("*", "*", core.ObjectReaction(o, api.Registry.RESTMapper()))
|
||||
|
||||
fakePtr.AddWatchReactor("*", core.DefaultWatchReactor(watch.NewFake(), nil))
|
||||
|
||||
|
@@ -20,7 +20,6 @@ go_library(
|
||||
"//cmd/kube-aggregator/pkg/apis/apiregistration:go_default_library",
|
||||
"//pkg/api:go_default_library",
|
||||
"//pkg/client/restclient:go_default_library",
|
||||
"//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
|
||||
"//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
|
||||
"//vendor:k8s.io/apimachinery/pkg/watch",
|
||||
],
|
||||
|
@@ -17,7 +17,6 @@ limitations under the License.
|
||||
package internalversion
|
||||
|
||||
import (
|
||||
registered "k8s.io/apimachinery/pkg/apimachinery/registered"
|
||||
api "k8s.io/kubernetes/pkg/api"
|
||||
restclient "k8s.io/kubernetes/pkg/client/restclient"
|
||||
)
|
||||
@@ -27,7 +26,7 @@ type ApiregistrationInterface interface {
|
||||
APIServicesGetter
|
||||
}
|
||||
|
||||
// ApiregistrationClient is used to interact with features provided by the k8s.io/apimachinery/pkg/apimachinery/registered.Group group.
|
||||
// ApiregistrationClient is used to interact with features provided by the apiregistration.k8s.io group.
|
||||
type ApiregistrationClient struct {
|
||||
restClient restclient.Interface
|
||||
}
|
||||
@@ -66,7 +65,7 @@ func New(c restclient.Interface) *ApiregistrationClient {
|
||||
|
||||
func setConfigDefaults(config *restclient.Config) error {
|
||||
// if apiregistration group is not registered, return an error
|
||||
g, err := registered.Group("apiregistration.k8s.io")
|
||||
g, err := api.Registry.Group("apiregistration.k8s.io")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
Reference in New Issue
Block a user