github/sample-controller
github/sample-controller
4
0
Fork 0
mirror of https://github.com/kubernetes/sample-controller.git synced 2025-03-13 15:41:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #129139 from tklauser/client-setconfigdefaults-noerror

Browse Source 
Remove always-`nil` `setConfigDefaults` error return value in generated clients

Kubernetes-commit: 2331c028c2000f7d31efeeb405d8151a78a9de9c
This commit is contained in:
Kubernetes Publisher 2025-01-09 07:48:32 -08:00
commit 9595b8e4ba
3 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
go.mod
View File

@ -10,10 +10,10 @@ godebug winsymlink=0
require ( require (
golang.org/x/time v0.7.0 golang.org/x/time v0.7.0
k8s.io/api v0.0.0-20250106201850-018f9a59fc40 k8s.io/api v0.0.0-20250107083829-9e7d345b161c
k8s.io/apimachinery v0.0.0-20250106201545-3e8e52d6a125 k8s.io/apimachinery v0.0.0-20250106201545-3e8e52d6a125
k8s.io/client-go v0.0.0-20250106202309-ca1e525bb47b k8s.io/client-go v0.0.0-20250109163042-e421aed7f1b4
k8s.io/code-generator v0.0.0-20250106203108-fd5ea63b1460 k8s.io/code-generator v0.0.0-20250109164240-cbf803ea1cb0
k8s.io/klog/v2 v2.130.1 k8s.io/klog/v2 v2.130.1
) )

12
go.sum
View File

@ -138,14 +138,14 @@ gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
k8s.io/api v0.0.0-20250106201850-018f9a59fc40 h1:Iwg5OLnTsPB6uTOBsPevZgVRZVQRIC/JRtQ1kGBQm2k= k8s.io/api v0.0.0-20250107083829-9e7d345b161c h1:3OdBzgr0PF+mKK9xH/ycqxxZacdV2JJnaxgj32yUc8o=
k8s.io/api v0.0.0-20250106201850-018f9a59fc40/go.mod h1:bcTx9U6z8NtpUbnc3va/3EXi9J7dYqxrv93ABhJNcQ0= k8s.io/api v0.0.0-20250107083829-9e7d345b161c/go.mod h1:bcTx9U6z8NtpUbnc3va/3EXi9J7dYqxrv93ABhJNcQ0=
k8s.io/apimachinery v0.0.0-20250106201545-3e8e52d6a125 h1:DKE2wIHpBRYleqyn7WO7dmFTMvZWXwaKvB3qyZaKV/o= k8s.io/apimachinery v0.0.0-20250106201545-3e8e52d6a125 h1:DKE2wIHpBRYleqyn7WO7dmFTMvZWXwaKvB3qyZaKV/o=
k8s.io/apimachinery v0.0.0-20250106201545-3e8e52d6a125/go.mod h1:iKrKOPQq2bzYghWivf0Pyy2ZJ8A6WtFW16/tSLqk0Sg= k8s.io/apimachinery v0.0.0-20250106201545-3e8e52d6a125/go.mod h1:iKrKOPQq2bzYghWivf0Pyy2ZJ8A6WtFW16/tSLqk0Sg=
k8s.io/client-go v0.0.0-20250106202309-ca1e525bb47b h1:VYZC/349kyKmT4SJmtItkoQuTuOdCu3UHEfI1wBMhls= k8s.io/client-go v0.0.0-20250109163042-e421aed7f1b4 h1:dkMbB6IsTiifZ8oZq19z53UIeJJsdXTzs/ZayyPsTI0=
k8s.io/client-go v0.0.0-20250106202309-ca1e525bb47b/go.mod h1:knu3ObGdtq5u0QzoHMvCVo/brQVmG3TMrWSgbAkz0IQ= k8s.io/client-go v0.0.0-20250109163042-e421aed7f1b4/go.mod h1:kzkJf3BkWtP6EjVvIciiwPndNECuAuU6gh0sADdY65g=
k8s.io/code-generator v0.0.0-20250106203108-fd5ea63b1460 h1:QrbZeeZ5V/Fy9Dp8D/Zjm+YRMAPE3fCdrmTe1//kMwQ= k8s.io/code-generator v0.0.0-20250109164240-cbf803ea1cb0 h1:BurmPjj+8usxwOeeGyqPwgaW+eCGdkH1sQ+D/rQxYjU=
k8s.io/code-generator v0.0.0-20250106203108-fd5ea63b1460/go.mod h1:WylcaMP6Y9QULxO9l0HVVzP1zETWH6ngLqFXcGPH44E= k8s.io/code-generator v0.0.0-20250109164240-cbf803ea1cb0/go.mod h1:WylcaMP6Y9QULxO9l0HVVzP1zETWH6ngLqFXcGPH44E=
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 h1:si3PfKm8dDYxgfbeA6orqrtLkvvIeH8UqffFJDl0bz4= k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 h1:si3PfKm8dDYxgfbeA6orqrtLkvvIeH8UqffFJDl0bz4=
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU= k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU=
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=

12
pkg/generated/clientset/versioned/typed/samplecontroller/v1alpha1/samplecontroller_client.go
View File

@ -45,9 +45,7 @@ func (c *SamplecontrollerV1alpha1Client) Foos(namespace string) FooInterface {
// where httpClient was generated with rest.HTTPClientFor(c). // where httpClient was generated with rest.HTTPClientFor(c).
func NewForConfig(c *rest.Config) (*SamplecontrollerV1alpha1Client, error) { func NewForConfig(c *rest.Config) (*SamplecontrollerV1alpha1Client, error) {
config := *c config := *c
if err := setConfigDefaults(&config); err != nil { setConfigDefaults(&config)
return nil, err
}
httpClient, err := rest.HTTPClientFor(&config) httpClient, err := rest.HTTPClientFor(&config)
if err != nil { if err != nil {
return nil, err return nil, err
@ -59,9 +57,7 @@ func NewForConfig(c *rest.Config) (*SamplecontrollerV1alpha1Client, error) {
// Note the http client provided takes precedence over the configured transport values. // Note the http client provided takes precedence over the configured transport values.
func NewForConfigAndClient(c *rest.Config, h *http.Client) (*SamplecontrollerV1alpha1Client, error) { func NewForConfigAndClient(c *rest.Config, h *http.Client) (*SamplecontrollerV1alpha1Client, error) {
config := *c config := *c
if err := setConfigDefaults(&config); err != nil { setConfigDefaults(&config)
return nil, err
}
client, err := rest.RESTClientForConfigAndClient(&config, h) client, err := rest.RESTClientForConfigAndClient(&config, h)
if err != nil { if err != nil {
return nil, err return nil, err
@ -84,7 +80,7 @@ func New(c rest.Interface) *SamplecontrollerV1alpha1Client {
return &SamplecontrollerV1alpha1Client{c} return &SamplecontrollerV1alpha1Client{c}
} }
func setConfigDefaults(config *rest.Config) error { func setConfigDefaults(config *rest.Config) {
gv := samplecontrollerv1alpha1.SchemeGroupVersion gv := samplecontrollerv1alpha1.SchemeGroupVersion
config.GroupVersion = &gv config.GroupVersion = &gv
config.APIPath = "/apis" config.APIPath = "/apis"
@ -93,8 +89,6 @@ func setConfigDefaults(config *rest.Config) error {
if config.UserAgent == "" { if config.UserAgent == "" {
config.UserAgent = rest.DefaultKubernetesUserAgent() config.UserAgent = rest.DefaultKubernetesUserAgent()
} }
return nil
} }
// RESTClient returns a RESTClient that is used to communicate // RESTClient returns a RESTClient that is used to communicate