Enable using custom image tags (#671)

* Weaken the version recognition regex for pre-releasess

Author: Daniel-B-Smith

api/v1beta1/foundationdb_version.go

@@ -42,7 +42,7 @@ type FdbVersion struct {
 }
 
 // FDBVersionRegex describes the format of a FoundationDB version.
-var FDBVersionRegex = regexp.MustCompile(`^(\d+)\.(\d+)\.(\d+)$`)
+var FDBVersionRegex = regexp.MustCompile(`(\d+)\.(\d+)\.(\d+)`)
 
 // ParseFdbVersion parses a version from its string representation.
 func ParseFdbVersion(version string) (FdbVersion, error) {

api/v1beta1/foundationdbcluster_types.go

@@ -70,7 +70,7 @@ func init() {
 // FoundationDBClusterSpec defines the desired state of a cluster.
 type FoundationDBClusterSpec struct {
 	// Version defines the version of FoundationDB the cluster should run.
-	// +kubebuilder:validation:Pattern:=^(\d+)\.(\d+)\.(\d+)$
+	// +kubebuilder:validation:Pattern:=(\d+)\.(\d+)\.(\d+)
 	Version string `json:"version"`
 
 	// SidecarVersions defines the build version of the sidecar to run. This

api/v1beta1/foundationdbcluster_types_test.go

@@ -1195,6 +1195,14 @@ var _ = Describe("[api] FoundationDBCluster", func() {
 			Expect(err).NotTo(HaveOccurred())
 			Expect(version).To(Equal(FdbVersion{Major: 6, Minor: 2, Patch: 11}))
 
+			version, err = ParseFdbVersion("prerelease-6.2.11")
+			Expect(err).NotTo(HaveOccurred())
+			Expect(version).To(Equal(FdbVersion{Major: 6, Minor: 2, Patch: 11}))
+
+			version, err = ParseFdbVersion("test-6.2.11-test")
+			Expect(err).NotTo(HaveOccurred())
+			Expect(version).To(Equal(FdbVersion{Major: 6, Minor: 2, Patch: 11}))
+
 			_, err = ParseFdbVersion("6.2")
 			Expect(err).To(HaveOccurred())
 			Expect(err.Error()).To(Equal("could not parse FDB version from 6.2"))

config/crd/bases/apps.foundationdb.org_foundationdbclusters.yaml

@@ -7604,7 +7604,7 @@ spec:
                 updatePodsByReplacement:
                   type: boolean
                 version:
-                  pattern: ^(\d+)\.(\d+)\.(\d+)$
+                  pattern: (\d+)\.(\d+)\.(\d+)
                   type: string
                 volumeClaim:
                   properties: