public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chore: Update k8s.io to v0.33.1 (#105307)

Browse Source
This commit is contained in:
Ryan McKinley
2025-05-28 00:13:18 +03:00
committed by GitHub
parent b11be2f37d
commit d4c446f42c
63 changed files with 689 additions and 524 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/generated/clientset/versioned/fake/clientset_generated.go
+11 -2
View File
@@ -11,6 +11,7 @@ import (
fakeprovisioningv0alpha1 "github.com/grafana/grafana/pkg/generated/clientset/versioned/typed/provisioning/v0alpha1/fake"
servicev0alpha1 "github.com/grafana/grafana/pkg/generated/clientset/versioned/typed/service/v0alpha1"
fakeservicev0alpha1 "github.com/grafana/grafana/pkg/generated/clientset/versioned/typed/service/v0alpha1/fake"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/watch"
"k8s.io/client-go/discovery"
@@ -38,9 +39,13 @@ func NewSimpleClientset(objects ...runtime.Object) *Clientset {
cs.discovery = &fakediscovery.FakeDiscovery{Fake: &cs.Fake}
cs.AddReactor("*", "*", testing.ObjectReaction(o))
cs.AddWatchReactor("*", func(action testing.Action) (handled bool, ret watch.Interface, err error) {
var opts metav1.ListOptions
if watchActcion, ok := action.(testing.WatchActionImpl); ok {
opts = watchActcion.ListOptions
}
gvr := action.GetResource()
ns := action.GetNamespace()
watch, err := o.Watch(gvr, ns)
watch, err := o.Watch(gvr, ns, opts)
if err != nil {
return false, nil, err
}
@@ -87,9 +92,13 @@ func NewClientset(objects ...runtime.Object) *Clientset {
cs.discovery = &fakediscovery.FakeDiscovery{Fake: &cs.Fake}
cs.AddReactor("*", "*", testing.ObjectReaction(o))
cs.AddWatchReactor("*", func(action testing.Action) (handled bool, ret watch.Interface, err error) {
var opts metav1.ListOptions
if watchActcion, ok := action.(testing.WatchActionImpl); ok {
opts = watchActcion.ListOptions
}
gvr := action.GetResource()
ns := action.GetNamespace()
watch, err := o.Watch(gvr, ns)
watch, err := o.Watch(gvr, ns, opts)
if err != nil {
return false, nil, err
}
pkg/generated/clientset/versioned/typed/provisioning/v0alpha1/provisioning_client.go
+3 -9
View File
@@ -31,9 +31,7 @@ func (c *ProvisioningV0alpha1Client) Repositories(namespace string) RepositoryIn
// where httpClient was generated with rest.HTTPClientFor(c).
func NewForConfig(c *rest.Config) (*ProvisioningV0alpha1Client, error) {
config := *c
if err := setConfigDefaults(&config); err != nil {
return nil, err
}
setConfigDefaults(&config)
httpClient, err := rest.HTTPClientFor(&config)
if err != nil {
return nil, err
@@ -45,9 +43,7 @@ func NewForConfig(c *rest.Config) (*ProvisioningV0alpha1Client, error) {
// Note the http client provided takes precedence over the configured transport values.
func NewForConfigAndClient(c *rest.Config, h *http.Client) (*ProvisioningV0alpha1Client, error) {
config := *c
if err := setConfigDefaults(&config); err != nil {
return nil, err
}
setConfigDefaults(&config)
client, err := rest.RESTClientForConfigAndClient(&config, h)
if err != nil {
return nil, err
@@ -70,7 +66,7 @@ func New(c rest.Interface) *ProvisioningV0alpha1Client {
return &ProvisioningV0alpha1Client{c}
}
func setConfigDefaults(config *rest.Config) error {
func setConfigDefaults(config *rest.Config) {
gv := provisioningv0alpha1.SchemeGroupVersion
config.GroupVersion = &gv
config.APIPath = "/apis"
@@ -79,8 +75,6 @@ func setConfigDefaults(config *rest.Config) error {
if config.UserAgent == "" {
config.UserAgent = rest.DefaultKubernetesUserAgent()
}
return nil
}
// RESTClient returns a RESTClient that is used to communicate
pkg/generated/clientset/versioned/typed/service/v0alpha1/service_client.go
+3 -9
View File
@@ -31,9 +31,7 @@ func (c *ServiceV0alpha1Client) ExternalNames(namespace string) ExternalNameInte
// where httpClient was generated with rest.HTTPClientFor(c).
func NewForConfig(c *rest.Config) (*ServiceV0alpha1Client, error) {
config := *c
if err := setConfigDefaults(&config); err != nil {
return nil, err
}
setConfigDefaults(&config)
httpClient, err := rest.HTTPClientFor(&config)
if err != nil {
return nil, err
@@ -45,9 +43,7 @@ func NewForConfig(c *rest.Config) (*ServiceV0alpha1Client, error) {
// Note the http client provided takes precedence over the configured transport values.
func NewForConfigAndClient(c *rest.Config, h *http.Client) (*ServiceV0alpha1Client, error) {
config := *c
if err := setConfigDefaults(&config); err != nil {
return nil, err
}
setConfigDefaults(&config)
client, err := rest.RESTClientForConfigAndClient(&config, h)
if err != nil {
return nil, err
@@ -70,7 +66,7 @@ func New(c rest.Interface) *ServiceV0alpha1Client {
return &ServiceV0alpha1Client{c}
}
func setConfigDefaults(config *rest.Config) error {
func setConfigDefaults(config *rest.Config) {
gv := servicev0alpha1.SchemeGroupVersion
config.GroupVersion = &gv
config.APIPath = "/apis"
@@ -79,8 +75,6 @@ func setConfigDefaults(config *rest.Config) error {
if config.UserAgent == "" {
config.UserAgent = rest.DefaultKubernetesUserAgent()
}
return nil
}
// RESTClient returns a RESTClient that is used to communicate
pkg/generated/informers/externalversions/provisioning/v0alpha1/repository.go
+14 -2
View File
@@ -48,13 +48,25 @@ func NewFilteredRepositoryInformer(client versioned.Interface, namespace string,
if tweakListOptions != nil {
tweakListOptions(&options)
}
return client.ProvisioningV0alpha1().Repositories(namespace).List(context.TODO(), options)
return client.ProvisioningV0alpha1().Repositories(namespace).List(context.Background(), options)
},
WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
if tweakListOptions != nil {
tweakListOptions(&options)
}
return client.ProvisioningV0alpha1().Repositories(namespace).Watch(context.TODO(), options)
return client.ProvisioningV0alpha1().Repositories(namespace).Watch(context.Background(), options)
},
ListWithContextFunc: func(ctx context.Context, options v1.ListOptions) (runtime.Object, error) {
if tweakListOptions != nil {
tweakListOptions(&options)
}
return client.ProvisioningV0alpha1().Repositories(namespace).List(ctx, options)
},
WatchFuncWithContext: func(ctx context.Context, options v1.ListOptions) (watch.Interface, error) {
if tweakListOptions != nil {
tweakListOptions(&options)
}
return client.ProvisioningV0alpha1().Repositories(namespace).Watch(ctx, options)
},
},
&apisprovisioningv0alpha1.Repository{},
pkg/generated/informers/externalversions/service/v0alpha1/externalname.go
+14 -2
View File
@@ -48,13 +48,25 @@ func NewFilteredExternalNameInformer(client versioned.Interface, namespace strin
if tweakListOptions != nil {
tweakListOptions(&options)
}
return client.ServiceV0alpha1().ExternalNames(namespace).List(context.TODO(), options)
return client.ServiceV0alpha1().ExternalNames(namespace).List(context.Background(), options)
},
WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
if tweakListOptions != nil {
tweakListOptions(&options)
}
return client.ServiceV0alpha1().ExternalNames(namespace).Watch(context.TODO(), options)
return client.ServiceV0alpha1().ExternalNames(namespace).Watch(context.Background(), options)
},
ListWithContextFunc: func(ctx context.Context, options v1.ListOptions) (runtime.Object, error) {
if tweakListOptions != nil {
tweakListOptions(&options)
}
return client.ServiceV0alpha1().ExternalNames(namespace).List(ctx, options)
},
WatchFuncWithContext: func(ctx context.Context, options v1.ListOptions) (watch.Interface, error) {
if tweakListOptions != nil {
tweakListOptions(&options)
}
return client.ServiceV0alpha1().ExternalNames(namespace).Watch(ctx, options)
},
},
&apisservicev0alpha1.ExternalName{},