pkg/internal/kubebuilder/validation: use k8s.io/validation instead

joelanford · Jul 2, 2020 · 88708e7 · 88708e7
1 parent 4537c53
commit 88708e7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 116 deletions.
diff --git a/pkg/internal/kubebuilder/validation/dns.go b/pkg/internal/kubebuilder/validation/dns.go
diff --git a/pkg/internal/kubebuilder/validation/project.go b/pkg/internal/kubebuilder/validation/project.go
@@ -19,6 +19,8 @@ package validation
 import (
 	"errors"
 	"regexp"
+
+	"k8s.io/apimachinery/pkg/util/validation"
 )
 
 // projectVersionFmt defines the project version format from a project config.
@@ -32,7 +34,7 @@ func ValidateProjectVersion(version string) error {
 		return errors.New("project version is empty")
 	}
 	if !projectVersionRe.MatchString(version) {
-		return errors.New(regexError("invalid value for project version", projectVersionFmt))
+		return errors.New(validation.RegexError("invalid value for project version", projectVersionFmt))
 	}
 	return nil
 }
diff --git a/pkg/plugin/v1/init.go b/pkg/plugin/v1/init.go
@@ -23,12 +23,12 @@ import (
 	"strings"
 
 	"github.com/spf13/pflag"
+	"k8s.io/apimachinery/pkg/util/validation"
 	"sigs.k8s.io/kubebuilder/pkg/model/config"
 	"sigs.k8s.io/kubebuilder/pkg/plugin"
 	"sigs.k8s.io/kubebuilder/pkg/plugin/scaffold"
 
 	"github.com/joelanford/helm-operator/pkg/internal/kubebuilder/cmdutil"
-	"github.com/joelanford/helm-operator/pkg/internal/kubebuilder/validation"
 	"github.com/joelanford/helm-operator/pkg/plugin/internal/chartutil"
 	"github.com/joelanford/helm-operator/pkg/plugin/v1/scaffolds"
 )