feat(schema): add labels to cluster and scheduler_task

Also, remove deprecated tags field.
scylladb · Aug 9, 2024 · 11ecedd · 11ecedd
1 parent c0be79b
commit 11ecedd
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 17 deletions.
diff --git a/pkg/schema/table/table.go b/pkg/schema/table/table.go
diff --git a/pkg/schema/table/update.go b/pkg/schema/table/update.go
@@ -14,9 +14,9 @@ var SchedulerTaskUpdate = table.New(table.Metadata{
 		"enabled",
 		"id",
 		"name",
+		"labels",
 		"properties",
 		"sched",
-		"tags",
 		"type",
 	},
 	PartKey: []string{

diff --git a/pkg/service/cluster/model.go b/pkg/service/cluster/model.go
@@ -13,12 +13,13 @@ import (
 
 // Cluster specifies a cluster properties.
 type Cluster struct {
-	ID         uuid.UUID `json:"id"`
-	Name       string    `json:"name"`
-	Host       string    `json:"host"`
-	KnownHosts []string  `json:"-"`
-	Port       int       `json:"port,omitempty"`
-	AuthToken  string    `json:"auth_token"`
+	ID         uuid.UUID         `json:"id"`
+	Name       string            `json:"name"`
+	Labels     map[string]string `json:"labels"`
+	Host       string            `json:"host"`
+	KnownHosts []string          `json:"-"`
+	Port       int               `json:"port,omitempty"`
+	AuthToken  string            `json:"auth_token"`
 
 	ForceTLSDisabled       bool `json:"force_tls_disabled"`
 	ForceNonSSLSessionPort bool `json:"force_non_ssl_session_port"`

diff --git a/pkg/service/scheduler/model.go b/pkg/service/scheduler/model.go
@@ -323,15 +323,16 @@ func (s Schedule) backoff() retry.Backoff {
 
 // Task specify task type, properties and schedule.
 type Task struct {
-	ClusterID  uuid.UUID       `json:"cluster_id"`
-	Type       TaskType        `json:"type"`
-	ID         uuid.UUID       `json:"id"`
-	Name       string          `json:"name"`
-	Tags       []string        `json:"tags,omitempty"`
-	Enabled    bool            `json:"enabled,omitempty"`
-	Deleted    bool            `json:"deleted,omitempty"`
-	Sched      Schedule        `json:"schedule,omitempty"`
-	Properties json.RawMessage `json:"properties,omitempty"`
+	ClusterID  uuid.UUID         `json:"cluster_id"`
+	Type       TaskType          `json:"type"`
+	ID         uuid.UUID         `json:"id"`
+	Name       string            `json:"name"`
+	Labels     map[string]string `json:"labels"`
+	Enabled    bool              `json:"enabled,omitempty"`
+	Deleted    bool              `json:"deleted,omitempty"`
+	Sched      Schedule          `json:"schedule,omitempty"`
+	Properties json.RawMessage   `json:"properties,omitempty"`
+	Tags       []string
 
 	Status       Status     `json:"status"`
 	SuccessCount int        `json:"success_count"`

diff --git a/schema/v3.3.1.cql b/schema/v3.3.1.cql
@@ -0,0 +1,3 @@
+ALTER TABLE cluster ADD labels map<text, text>;
+ALTER TABLE scheduler_task DROP tags;
+ALTER TABLE scheduler_task ADD labels map<text, text>;