fix code gen and lint

kubernetes · Mar 14, 2024 · 4a66724 · 4a66724
1 parent 833f573
commit 4a66724
Show file tree

Hide file tree

Showing 9 changed files with 130 additions and 15 deletions.
diff --git a/api/api-rules/violation_exceptions.list b/api/api-rules/violation_exceptions.list
@@ -138,6 +138,11 @@ API rule violation: names_match,k8s.io/cloud-provider/config/v1alpha1,KubeCloudS
 API rule violation: names_match,k8s.io/cloud-provider/config/v1alpha1,KubeCloudSharedConfiguration,NodeSyncPeriod
 API rule violation: names_match,k8s.io/cloud-provider/config/v1alpha1,KubeCloudSharedConfiguration,RouteReconciliationPeriod
 API rule violation: names_match,k8s.io/cloud-provider/config/v1alpha1,KubeCloudSharedConfiguration,UseServiceAccountCredentials
+API rule violation: names_match,k8s.io/cloud-provider/config/v1alpha1,WebhookConfiguration,CaBundle
+API rule violation: names_match,k8s.io/cloud-provider/config/v1alpha1,WebhookConfiguration,MutatingWebhookConfiguration
+API rule violation: names_match,k8s.io/cloud-provider/config/v1alpha1,WebhookConfiguration,ValidatingWebhookConfiguration
+API rule violation: names_match,k8s.io/cloud-provider/config/v1alpha1,WebhookConfiguration,WebhookAddress
+API rule violation: names_match,k8s.io/cloud-provider/config/v1alpha1,WebhookConfiguration,WebhookPort
 API rule violation: names_match,k8s.io/cloud-provider/config/v1alpha1,WebhookConfiguration,Webhooks
 API rule violation: names_match,k8s.io/controller-manager/config/v1alpha1,GenericControllerManagerConfiguration,Address
 API rule violation: names_match,k8s.io/controller-manager/config/v1alpha1,GenericControllerManagerConfiguration,ClientConnection

diff --git a/pkg/generated/openapi/zz_generated.openapi.go b/pkg/generated/openapi/zz_generated.openapi.go
diff --git a/staging/src/k8s.io/cloud-provider/app/controllermanager.go b/staging/src/k8s.io/cloud-provider/app/controllermanager.go
@@ -213,20 +213,20 @@ func createOrUpdateWebhookConfiguration(ctx context.Context, webhooks map[string
 		} else {
 			if !apierrors.IsAlreadyExists(err) {
 				klog.ErrorS(err, "Unable to create validating webhook configuration with API server", "webhookconfiguration", klog.KObj(webhooksConfig.ValidatingWebhookConfiguration))
-				return fmt.Errorf("unable to create validating webhook configuration with API server %v", err)
+				return fmt.Errorf("unable to create validating webhook configuration with API server %w", err)
 			}
 
 			currentConfiguration, err := kubeClient.AdmissionregistrationV1().ValidatingWebhookConfigurations().Get(ctx, webhooksConfig.ValidatingWebhookConfiguration.Name, metav1.GetOptions{})
 			if err != nil {
 				klog.ErrorS(err, "Unable to create validating webhook configuration with API server, error getting existing webhook configuration", "webhookconfiguration", webhooksConfig.ValidatingWebhookConfiguration.Name)
-				return fmt.Errorf("unable to get validating webhook configuration from API server %v", err)
+				return fmt.Errorf("unable to get validating webhook configuration from API server %w", err)
 			}
 			currentConfiguration.Webhooks = webhooksConfig.ValidatingWebhookConfiguration.Webhooks
 
 			_, err = kubeClient.AdmissionregistrationV1().ValidatingWebhookConfigurations().Update(ctx, currentConfiguration, metav1.UpdateOptions{})
 			if err != nil {
 				klog.ErrorS(err, "Unable to update validating webhook configuration with API server", "webhookconfiguration", klog.KObj(webhooksConfig.ValidatingWebhookConfiguration))
-				return fmt.Errorf("unable to update validating webhook configuration with API server %v", err)
+				return fmt.Errorf("unable to update validating webhook configuration with API server %w", err)
 			}
 		}
 	}
@@ -238,20 +238,20 @@ func createOrUpdateWebhookConfiguration(ctx context.Context, webhooks map[string
 		} else {
 			if !apierrors.IsAlreadyExists(err) {
 				klog.ErrorS(err, "Unable to create mutating webhook configuration with API server", "webhookconfiguration", klog.KObj(webhooksConfig.MutatingWebhookConfiguration))
-				return fmt.Errorf("unable to create mutating webhook configuration with API server %v", err)
+				return fmt.Errorf("unable to create mutating webhook configuration with API server %w", err)
 			}
 
 			currentConfiguration, err := kubeClient.AdmissionregistrationV1().MutatingWebhookConfigurations().Get(ctx, webhooksConfig.MutatingWebhookConfiguration.Name, metav1.GetOptions{})
 			if err != nil {
 				klog.ErrorS(err, "Unable to create mutating webhook configuration with API server, error fetching existing webhook configuration", "webhookconfiguration", webhooksConfig.MutatingWebhookConfiguration.Name)
-				return fmt.Errorf("unable to get mutating webhook configuration from API server %v", err)
+				return fmt.Errorf("unable to get mutating webhook configuration from API server %w", err)
 			}
 			currentConfiguration.Webhooks = webhooksConfig.MutatingWebhookConfiguration.Webhooks
 
 			_, err = kubeClient.AdmissionregistrationV1().MutatingWebhookConfigurations().Update(ctx, currentConfiguration, metav1.UpdateOptions{})
 			if err != nil {
 				klog.ErrorS(err, "Unable to update mutating webhook configuration with API server", "webhookconfiguration", klog.KObj(webhooksConfig.MutatingWebhookConfiguration))
-				return fmt.Errorf("unable to update mutating webhook configuration with API server %v", err)
+				return fmt.Errorf("unable to update mutating webhook configuration with API server %w", err)
 			}
 		}
 	}

diff --git a/staging/src/k8s.io/cloud-provider/config/v1alpha1/types.go b/staging/src/k8s.io/cloud-provider/config/v1alpha1/types.go
@@ -17,6 +17,7 @@ limitations under the License.
 package v1alpha1
 
 import (
+	admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	nodeconfigv1alpha1 "k8s.io/cloud-provider/controllers/node/config/v1alpha1"
 	serviceconfigv1alpha1 "k8s.io/cloud-provider/controllers/service/config/v1alpha1"
@@ -98,4 +99,15 @@ type WebhookConfiguration struct {
 	// '-foo' means "disable 'foo'"
 	// first item for a particular name wins
 	Webhooks []string
+	// WebhookPort is the port that the controller-manager's webhook service runs on.
+	WebhookPort int32
+	// WebhookAddress is the IP address to serve on.
+	WebhookAddress string
+	// CaBundle is the ca certs to be used by apiserver for validating the webhook server certs.
+	CaBundle string
+	// ValidatingWebhookConfiguration is the config used for creating validation webhook config object.
+	ValidatingWebhookConfiguration *admissionregistrationv1.ValidatingWebhookConfiguration
+
+	// MutatingWebhookConfiguration is the config used for creating mutating webhook config object.
+	MutatingWebhookConfiguration *admissionregistrationv1.MutatingWebhookConfiguration
 }
diff --git a/staging/src/k8s.io/cloud-provider/config/v1alpha1/zz_generated.conversion.go b/staging/src/k8s.io/cloud-provider/config/v1alpha1/zz_generated.conversion.go
diff --git a/staging/src/k8s.io/cloud-provider/config/v1alpha1/zz_generated.deepcopy.go b/staging/src/k8s.io/cloud-provider/config/v1alpha1/zz_generated.deepcopy.go
diff --git a/staging/src/k8s.io/cloud-provider/config/v1alpha1/zz_generated.defaults.go b/staging/src/k8s.io/cloud-provider/config/v1alpha1/zz_generated.defaults.go
diff --git a/staging/src/k8s.io/cloud-provider/config/zz_generated.deepcopy.go b/staging/src/k8s.io/cloud-provider/config/zz_generated.deepcopy.go
diff --git a/staging/src/k8s.io/cloud-provider/options/webhook.go b/staging/src/k8s.io/cloud-provider/options/webhook.go
@@ -100,7 +100,7 @@ func (o *WebhookOptions) Validate(validatingWebhooks, mutatingWebhooks, disabled
 		if o.ValidatingWebhookConfiguration.Name == "" {
 			allErrors = append(allErrors, errors.New("validating webhook configuration name can't be empty"))
 		}
-		webhookConfigs := sets.NewString()
+		webhookConfigs := sets.New[string]()
 		for _, webhookConfig := range o.ValidatingWebhookConfiguration.Webhooks {
 			webhookConfigs.Insert(webhookConfig.Name)
 		}
@@ -114,7 +114,7 @@ func (o *WebhookOptions) Validate(validatingWebhooks, mutatingWebhooks, disabled
 		if o.MutatingWebhookConfiguration.Name == "" {
 			allErrors = append(allErrors, errors.New("mutating webhook configuration name can't be empty"))
 		}
-		webhookConfigs := sets.NewString()
+		webhookConfigs := sets.New[string]()
 		for _, webhookConfig := range o.MutatingWebhookConfiguration.Webhooks {
 			webhookConfigs.Insert(webhookConfig.Name)
 		}
@@ -134,7 +134,7 @@ func (o *WebhookOptions) getEnabledWebhooks(webhooks, disabledByDefaultWebhooks
 	return enabledWebhooks
 }
 
-func (o *WebhookOptions) validateWebhookConfiguration(webhookConfigs sets.String, webhooks []string) []error {
+func (o *WebhookOptions) validateWebhookConfiguration(webhookConfigs sets.Set[string], webhooks []string) []error {
 	allErrors := []error{}
 	for _, name := range webhooks {
 		if !webhookConfigs.Has(name) {
@@ -181,7 +181,7 @@ func (o *WebhookOptions) ApplyTo(cfg *config.WebhookConfiguration) error {
 func LoadConfigurationFromFile(path string, config runtime.Object) error {
 	configDef, err := os.ReadFile(path)
 	if err != nil {
-		return fmt.Errorf("failed to read file path %q: %+v", path, err)
+		return fmt.Errorf("failed to read file path %q: %w", path, err)
 	}
 
 	decoder := serializer.NewCodecFactory(runtime.NewScheme()).UniversalDecoder(admissionregistrationv1.SchemeGroupVersion)
@@ -287,7 +287,7 @@ func (o *WebhookServingOptions) ApplyTo(webhookCfg *config.WebhookConfiguration,
 	if webhookCfg.WebhookAddress == "0.0.0.0" {
 		ip, err := netutil.ChooseHostInterface()
 		if err != nil {
-			return fmt.Errorf("failed to get host ip %v", err)
+			return fmt.Errorf("failed to get host ip %w", err)
 		}
 		webhookCfg.WebhookAddress = ip.String()
 	}
@@ -322,14 +322,14 @@ func (o *WebhookServingOptions) ApplyTo(webhookCfg *config.WebhookConfiguration,
 		webhookCfg.CaBundle = string(caCert)
 	} else {
 		if err := o.MaybeDefaultWithSelfSignedCerts(webhookCfg.WebhookAddress, nil, []net.IP{netutils.ParseIPSloppy("127.0.0.1")}); err != nil {
-			return fmt.Errorf("error creating self-signed certificates for webhook: %v", err)
+			return fmt.Errorf("error creating self-signed certificates for webhook: %w", err)
 		}
 		(*cfg).Cert = o.ServerCert.GeneratedCert
 
 		cert, _ := o.ServerCert.GeneratedCert.CurrentCertKeyContent()
 		certs, err := certutil.ParseCertsPEM(cert)
 		if err != nil {
-			return fmt.Errorf("error parsing the certs %v", err)
+			return fmt.Errorf("error parsing the certs %w", err)
 		}
 		if len(certs) < 2 {
 			return fmt.Errorf("generated cert doesn't have the root cert, has only %v certs", len(certs))
@@ -340,7 +340,7 @@ func (o *WebhookServingOptions) ApplyTo(webhookCfg *config.WebhookConfiguration,
 			Bytes: certs[1].Raw,
 		})
 		if err != nil {
-			return fmt.Errorf("error encoding ca cert %v", err)
+			return fmt.Errorf("error encoding ca cert %w", err)
 		}
 		webhookCfg.CaBundle = caPEM.String()
 	}