feat: add noprefix labels (#44) (#46)

Signed-off-by: Patrik Cyvoct <[email protected]>

Author: Sh4d1

docs/tags.md

@@ -11,6 +11,13 @@ In this case, the Kuebrnetes nodes will have the label `k8s.scaleway.com/foo=bar
 
 Once the tag is removed from the instance, it will also be removed as a label on the node.
 
+### Non prefixed labels
+
+It is possible to add labels nop prefixed with `k8s.scaleway.com`. The downside, is that when you will delete the associated tag, the label won't get removed.
+In order to have non prefixed labels, you should prefix the tag with `noprefix=`.
+
+For intance the tag `noprefix=foo=bar` will yield the `foo=bar` label on the Kubernetes nodes.
+
 ## Taints
 
 In order for a tag to be synced to a taint, it needs to be of the form `taint=foo:bar:Effect`, where `Effect` is one of `NoExecute`, `NoSchedule` or `PreferNoSchedule`.

scaleway/sync.go

@@ -59,6 +59,7 @@ var (
 	labelsPrefix     = "k8s.scaleway.com/"
 	taintsPrefix     = "k8s.scaleway.com/"
 	labelTaintPrefix = "taint="
+	labelNoPrefix    = "noprefix="
 
 	// K8S labels
 	labelNodeRoleExcludeBalancer      = "node.kubernetes.io/exclude-from-external-load-balancers"
@@ -333,10 +334,17 @@ func (s *syncController) SyncLBTags() {
 }
 
 func tagLabelParser(tag string) (key string, value string) {
+	prefix := labelsPrefix
+
+	if strings.HasPrefix(tag, labelNoPrefix) {
+		prefix = ""
+		tag = strings.TrimPrefix(tag, labelNoPrefix)
+	}
+
 	split := splitRegexp.Split(tag, -1)
 
-	key = labelsPrefix + labelsRegexp.FindString(split[0])
-	if key == labelsPrefix || len(key) > 63 {
+	key = prefix + labelsRegexp.FindString(split[0])
+	if key == prefix || len(key) > 63 {
 		return "", ""
 	}
 

scaleway/sync_test.go

@@ -52,29 +52,32 @@ func TestTagTaintParser(t *testing.T) {
 
 func TestTagLabelParser(t *testing.T) {
 	tagsTest := map[string][2]string{
-		"":                  {"", ""},
-		"word":              {"k8s.scaleway.com/word", ""},
-		"underscore_word":   {"k8s.scaleway.com/underscore_word", ""},
-		"dash-word":         {"k8s.scaleway.com/dash-word", ""},
-		"equal1=value":      {"k8s.scaleway.com/equal1", "value"},
-		"equal2 = value":    {"k8s.scaleway.com/equal2", "value"},
-		"equal3 =value":     {"k8s.scaleway.com/equal3", "value"},
-		"equal4= value":     {"k8s.scaleway.com/equal4", "value"},
-		"equal5==value":     {"k8s.scaleway.com/equal5", "value"},
-		"equal6= =value":    {"k8s.scaleway.com/equal6", "value"},
-		"colon1:value":      {"k8s.scaleway.com/colon1", "value"},
-		"colon2 : value":    {"k8s.scaleway.com/colon2", "value"},
-		"colon3 :value":     {"k8s.scaleway.com/colon3", "value"},
-		"colon4: value":     {"k8s.scaleway.com/colon4", "value"},
-		"colon5::value":     {"k8s.scaleway.com/colon5", "value"},
-		"colon6: :value":    {"k8s.scaleway.com/colon6", "value"},
-		"space word":        {"k8s.scaleway.com/space", "word"},
-		"two space word":    {"k8s.scaleway.com/two", "space"},
-		"key=accentué":      {"", ""},
-		"accentué=value":    {"", ""},
-		"word=invalid/dash": {"", ""},
-		"dash/word":         {"", ""},
-		"dash/equal=value":  {"", ""},
+		"":                      {"", ""},
+		"word":                  {"k8s.scaleway.com/word", ""},
+		"noprefix=word":         {"word", ""},
+		"underscore_word":       {"k8s.scaleway.com/underscore_word", ""},
+		"dash-word":             {"k8s.scaleway.com/dash-word", ""},
+		"equal1=value":          {"k8s.scaleway.com/equal1", "value"},
+		"noprefix=equal1=value": {"equal1", "value"},
+		"equal2 = value":        {"k8s.scaleway.com/equal2", "value"},
+		"equal3 =value":         {"k8s.scaleway.com/equal3", "value"},
+		"equal4= value":         {"k8s.scaleway.com/equal4", "value"},
+		"equal5==value":         {"k8s.scaleway.com/equal5", "value"},
+		"equal6= =value":        {"k8s.scaleway.com/equal6", "value"},
+		"colon1:value":          {"k8s.scaleway.com/colon1", "value"},
+		"noprefix=colon1:value": {"colon1", "value"},
+		"colon2 : value":        {"k8s.scaleway.com/colon2", "value"},
+		"colon3 :value":         {"k8s.scaleway.com/colon3", "value"},
+		"colon4: value":         {"k8s.scaleway.com/colon4", "value"},
+		"colon5::value":         {"k8s.scaleway.com/colon5", "value"},
+		"colon6: :value":        {"k8s.scaleway.com/colon6", "value"},
+		"space word":            {"k8s.scaleway.com/space", "word"},
+		"two space word":        {"k8s.scaleway.com/two", "space"},
+		"key=accentué":          {"", ""},
+		"accentué=value":        {"", ""},
+		"word=invalid/dash":     {"", ""},
+		"dash/word":             {"", ""},
+		"dash/equal=value":      {"", ""},
 	}
 
 	for tag, expected := range tagsTest {