From e22eecb91ce04d5af10c83cbed21db6518008d9c Mon Sep 17 00:00:00 2001 From: Alexey Igrychev Date: Mon, 4 Apr 2022 20:45:07 +0100 Subject: [PATCH] fix(slugification): kubernetes namespace and release name cannot contain dots Signed-off-by: Alexey Igrychev --- pkg/slug/slug.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/slug/slug.go b/pkg/slug/slug.go index c6d2956c10..136342b2d7 100644 --- a/pkg/slug/slug.go +++ b/pkg/slug/slug.go @@ -148,12 +148,12 @@ func ValidateKubernetesNamespace(namespace string) error { } func validateKubernetesNamespace(name string) error { - errorMsgPrefix := fmt.Sprintf("kubernetes namespace should be a valid DNS-1123 subdomain") + errorMsgPrefix := fmt.Sprintf("kubernetes namespace should be a valid DNS-1123 label") if len(name) == 0 { return nil } else if len(name) > kubernetesNamespaceMaxSize { return fmt.Errorf("%s: %q is %d chars long", errorMsgPrefix, name, len(name)) - } else if msgs := validation.IsDNS1123Subdomain(name); len(msgs) > 0 { + } else if msgs := validation.IsDNS1123Label(name); len(msgs) > 0 { return fmt.Errorf("%s: %s", errorMsgPrefix, strings.Join(msgs, ", ")) } return nil @@ -171,12 +171,12 @@ func ValidateHelmRelease(name string) error { } func validateHelmRelease(name string) error { - errorMsgPrefix := fmt.Sprintf("helm release name should be a valid DNS-1123 subdomain and be maximum %d chars", helmReleaseMaxSize) + errorMsgPrefix := fmt.Sprintf("helm release name should be a valid DNS-1123 label and be maximum %d chars", helmReleaseMaxSize) if len(name) == 0 { return nil } else if len(name) > helmReleaseMaxSize { return fmt.Errorf("%s: %q is %d chars long", errorMsgPrefix, name, len(name)) - } else if msgs := validation.IsDNS1123Subdomain(name); len(msgs) > 0 { + } else if msgs := validation.IsDNS1123Label(name); len(msgs) > 0 { return fmt.Errorf("%s: %s", errorMsgPrefix, strings.Join(msgs, ", ")) } return nil