From c3eba35aa2c772dfe487a062e4056fee39a8bb55 Mon Sep 17 00:00:00 2001
From: Tobias Klauser <tklauser@distanz.ch>
Date: Sun, 15 Dec 2024 23:19:00 +0100
Subject: [PATCH] Remove always-nil setConfigDefaults error return value in
 generated clients

The error returned by setConfigDefaults called in
NewForConfig{,AndClient} in generated clients is always nil. Hence, the
error return can be omitted and the respective error checking code can
be avoided.
---
 .../client-gen/generators/generator_for_group.go | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_group.go b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_group.go
index 8196871753f..b75b2758eab 100644
--- a/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_group.go
+++ b/staging/src/k8s.io/code-generator/cmd/client-gen/generators/generator_for_group.go
@@ -169,9 +169,7 @@ var newClientForConfigTemplate = `
 // where httpClient was generated with rest.HTTPClientFor(c).
 func NewForConfig(c *$.restConfig|raw$) (*$.GroupGoName$$.Version$Client, error) {
 	config := *c
-	if err := setConfigDefaults(&config); err != nil {
-		return nil, err
-	}
+	setConfigDefaults(&config)
 	httpClient, err := $.RESTHTTPClientFor|raw$(&config)
 	if err != nil {
 		return nil, err
@@ -185,9 +183,7 @@ var newClientForConfigAndClientTemplate = `
 // Note the http client provided takes precedence over the configured transport values.
 func NewForConfigAndClient(c *$.restConfig|raw$, h *$.httpClient|raw$) (*$.GroupGoName$$.Version$Client, error) {
 	config := *c
-	if err := setConfigDefaults(&config); err != nil {
-		return nil, err
-	}
+	setConfigDefaults(&config)
 	client, err := $.restRESTClientForConfigAndClient|raw$(&config, h)
 	if err != nil {
 		return nil, err
@@ -227,7 +223,7 @@ func New(c $.restRESTClientInterface|raw$) *$.GroupGoName$$.Version$Client {
 `
 
 var setInternalVersionClientDefaultsTemplate = `
-func setConfigDefaults(config *$.restConfig|raw$) error {
+func setConfigDefaults(config *$.restConfig|raw$) {
 	config.APIPath = $.apiPath$
 	if config.UserAgent == "" {
 		config.UserAgent = $.restDefaultKubernetesUserAgent|raw$()
@@ -244,13 +240,11 @@ func setConfigDefaults(config *$.restConfig|raw$) error {
 	if config.Burst == 0 {
 		config.Burst = 10
 	}
-
-	return nil
 }
 `
 
 var setClientDefaultsTemplate = `
-func setConfigDefaults(config *$.restConfig|raw$) error {
+func setConfigDefaults(config *$.restConfig|raw$) {
 	gv := $.SchemeGroupVersion|raw$
 	config.GroupVersion =  &gv
 	config.APIPath = $.apiPath$
@@ -259,7 +253,5 @@ func setConfigDefaults(config *$.restConfig|raw$) error {
 	if config.UserAgent == "" {
 		config.UserAgent = $.restDefaultKubernetesUserAgent|raw$()
 	}
-
-	return nil
 }
 `