controller, util: make validLabelsMatch regex more lax (#3869)

Previously certain allowed (kubevirt.io) labels that included dots after
the / delimiter would be ignored as the expression only matched one or
more letters/digits/underscore/dashes. This commit adds dots to the list of
allowed symbols.

Signed-off-by: Adi Aloni <[email protected]>

Author: Acedus

pkg/controller/common/util.go

@@ -392,7 +392,7 @@ var (
 		AnnPodMultusDefaultNetwork:    "",
 	}
 
-	validLabelsMatch = regexp.MustCompile(`^([\w.]+\.kubevirt.io|kubevirt.io)/[\w-]+$`)
+	validLabelsMatch = regexp.MustCompile(`^([\w.]+\.kubevirt.io|kubevirt.io)/[\w.-]+$`)
 
 	ErrDataSourceMaxDepthReached = errors.New("DataSource reference chain exceeds maximum depth of 1")
 	ErrDataSourceSelfReference   = errors.New("DataSource cannot self-reference")

pkg/controller/common/util_test.go

@@ -328,18 +328,22 @@ var _ = Describe("CopyAllowedLabels", func() {
 		testKubevirtIoValueExisting     = "existing"
 		testKubevirtIoNewValueExisting  = "newvalue"
 		testUndesiredKey                = "undesired.key"
+		testCdiDatasourceKey            = "cdi.kubevirt.io/storage.import.datasource-name"
+		testCdiDatasourceKeyValue       = "testdatasource"
 	)
 
 	It("Should copy desired labels", func() {
 		srcLabels := map[string]string{
 			testKubevirtIoKey:             testKubevirtIoValue,
 			testInstancetypeKubevirtIoKey: testInstancetypeKubevirtIoValue,
 			testUndesiredKey:              "undesired.key",
+			testCdiDatasourceKey:          testCdiDatasourceKeyValue,
 		}
 		ds := &cdiv1.DataSource{}
 		CopyAllowedLabels(srcLabels, ds, false)
 		Expect(ds.Labels).To(HaveKeyWithValue(testKubevirtIoKey, testKubevirtIoValue))
 		Expect(ds.Labels).To(HaveKeyWithValue(testInstancetypeKubevirtIoKey, testInstancetypeKubevirtIoValue))
+		Expect(ds.Labels).To(HaveKeyWithValue(testCdiDatasourceKey, testCdiDatasourceKeyValue))
 		Expect(ds.Labels).ToNot(HaveKey(testUndesiredKey))
 	})