allow uppercase in labels and properly handle parsing errors

symbiosis-cloud · Nov 20, 2022 · 98174a0 · 98174a0
1 parent ab238f0
commit 98174a0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/commands/cluster/create.go b/commands/cluster/create.go
@@ -56,6 +56,10 @@ func (c *CreateClusterCommand) Command() *cobra.Command {
 
 			nodeTaints, nodeLabels, err := util.ParseTaintsAndLabels(taints, labels)
 
+			if err != nil {
+				return err
+			}
+
 			clusterName := args[0]
 			c.CommandOpts.Logger.Info().Msgf("Creating cluster %s", clusterName)
 

diff --git a/pkg/util/kubernetes.go b/pkg/util/kubernetes.go
@@ -31,7 +31,7 @@ func ParseTaintsAndLabels(taints []string, labels []string) ([]symbiosis.NodeTai
 
 	for i, taint := range taints {
 
-		re := regexp.MustCompile(`([a-z0-9\-\_]+)\=([a-z0-9\-\_]+)\=(NoSchedule|NoExecute|PreferNoSchedule)`)
+		re := regexp.MustCompile(`([a-z0-9\-\_]+)\=([a-zA-Z0-9\-\_]+)\=(NoSchedule|NoExecute|PreferNoSchedule)`)
 		if ok := re.Match([]byte(taint)); !ok {
 			return nil, nil, fmt.Errorf("Taint %s could not be parsed. Format: key=value=NoSchedule. Types currently supported are: NoSchedule, NoExecute and PreferNoSchedule.", taint)
 		}
@@ -45,7 +45,7 @@ func ParseTaintsAndLabels(taints []string, labels []string) ([]symbiosis.NodeTai
 	}
 
 	for x, label := range labels {
-		re := regexp.MustCompile(`([a-z0-9\-\_]+)\=([a-z0-9\-\_]+)`)
+		re := regexp.MustCompile(`([a-z0-9\-\_]+)\=([a-zA-Z0-9\-\_]+)`)
 		if ok := re.Match([]byte(label)); !ok {
 			return nil, nil, fmt.Errorf("Label %s could not be parsed. Format: key=value", label)
 		}