diff --git a/pkg/chart/chart.go b/pkg/chart/chart.go index 5b19bb3b..f235d333 100644 --- a/pkg/chart/chart.go +++ b/pkg/chart/chart.go @@ -846,7 +846,7 @@ func (t *Testing) CheckVersionIncrement(chart *Chart) error { } if result >= 0 { - return errors.New("chart version not ok. Needs a version bump! ") + return errors.New("chart version not ok. Needs a version bump!") } fmt.Println("Chart version ok.") diff --git a/pkg/tool/kubectl.go b/pkg/tool/kubectl.go index ed707a7c..d6040890 100644 --- a/pkg/tool/kubectl.go +++ b/pkg/tool/kubectl.go @@ -184,14 +184,16 @@ func (k Kubectl) WaitForDeployments(namespace string, selector string) error { } func (k Kubectl) GetPodsforDeployment(namespace string, deployment string) ([]string, error) { - jsonString, _ := k.exec.RunProcessAndCaptureStdout("kubectl", + jsonString, err := k.exec.RunProcessAndCaptureStdout("kubectl", fmt.Sprintf("--request-timeout=%s", k.timeout), "get", "deployment", deployment, "--namespace", namespace, "--output=json") - var deploymentMap map[string]any - err := json.Unmarshal([]byte(jsonString), &deploymentMap) if err != nil { return nil, err } + var deploymentMap map[string]any + if err := json.Unmarshal([]byte(jsonString), &deploymentMap); err != nil { + return nil, err + } spec := deploymentMap["spec"].(map[string]any) selector := spec["selector"].(map[string]any) diff --git a/pkg/util/util.go b/pkg/util/util.go index f084fd45..98540368 100644 --- a/pkg/util/util.go +++ b/pkg/util/util.go @@ -33,6 +33,8 @@ import ( const chars = "1234567890abcdefghijklmnopqrstuvwxyz" +var sanitizeNameRe = regexp.MustCompile("^[^a-zA-Z0-9]+") + type Maintainer struct { Name string `yaml:"name"` Email string `yaml:"email"` @@ -217,14 +219,12 @@ func GithubGroupsEnd(w io.Writer) { } func SanitizeName(s string, maxLength int) string { - reg := regexp.MustCompile("^[^a-zA-Z0-9]+") - excess := len(s) - maxLength result := s if excess > 0 { result = s[excess:] } - return reg.ReplaceAllString(result, "") + return sanitizeNameRe.ReplaceAllString(result, "") } func GetRandomPort() (int, error) {