From 2ed802730b57cff58e178c1bce91780243b9ea64 Mon Sep 17 00:00:00 2001 From: grzegorz-ciezkowski Date: Mon, 20 Jan 2025 12:42:02 +0100 Subject: [PATCH] feat(deployments) Linter fixes (#808) --- pkg/internal/local/setup/webhook.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/internal/local/setup/webhook.go b/pkg/internal/local/setup/webhook.go index 30929940a..81734a74a 100644 --- a/pkg/internal/local/setup/webhook.go +++ b/pkg/internal/local/setup/webhook.go @@ -58,7 +58,7 @@ const ( // modifies cert job (charts/manager/templates/kube-webhook-certgen.yaml) to include host.docker.internal // if devMode is enabled, modifies mutating and validating webhook configurations to use host.docker.internal URL and removes service from clientConfig // extracts the webhook certs from the secret and writes them to tmp/k8s-webhook-server/serving-certs directory -func (m *Manifest) setupWebhookManifest(resources []map[string]interface{}, clusterName string, resourceSuffix string) ([]map[string]interface{}, error) { +func (m *Manifest) setupWebhookManifest(resources []map[string]interface{}, clusterName, resourceSuffix string) ([]map[string]interface{}, error) { webhookManifests := make([]map[string]interface{}, 0) releaseName := m.ReleaseName managerDeployment, err := extractResourceByNameKind(resources, releaseName+resourceSuffix, DeploymentKind) @@ -324,7 +324,7 @@ func extractResourceByKind(resources []map[string]interface{}, kind string) map[ return nil } -func (m *Manifest) waitUntilDeploymentReady(ctx context.Context, clusterName, namespace string, nameSuffix string) error { +func (m *Manifest) waitUntilDeploymentReady(ctx context.Context, clusterName, namespace, nameSuffix string) error { deploymentName := m.ReleaseName + nameSuffix cl, err := getKubeClient(clusterName) if err != nil { @@ -342,7 +342,7 @@ func (m *Manifest) waitUntilDeploymentReady(ctx context.Context, clusterName, na return err } if deployment.Status.Conditions == nil { - return errors.New(fmt.Sprintf("deployment %s is not yet ready", deploymentName)) + return fmt.Errorf("deployment %s is not yet ready", deploymentName) } available := false for _, condition := range deployment.Status.Conditions { @@ -352,7 +352,7 @@ func (m *Manifest) waitUntilDeploymentReady(ctx context.Context, clusterName, na } } if !available { - return errors.New(fmt.Sprintf("deployment %s is not yet ready", deploymentName)) + return fmt.Errorf("deployment %s is not yet ready", deploymentName) } return nil }, b)