fix: add labels to component spec (#1112)

* add labels to component spec * chore: make test && make resources
flanksource · Jul 3, 2023 · 80a5658 · 80a5658
1 parent 304a7ab
commit 80a5658
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 6 deletions.
diff --git a/api/v1/component_types.go b/api/v1/component_types.go
@@ -18,12 +18,13 @@ type Component struct {
 }
 
 type ComponentSpec struct {
-	Name    string    `json:"name,omitempty"`
-	Tooltip string    `json:"tooltip,omitempty"`
-	Icon    string    `json:"icon,omitempty"`
-	Owner   string    `json:"owner,omitempty"`
-	Id      *Template `json:"id,omitempty"` //nolint
-	Order   int       `json:"order,omitempty"`
+	Name    string            `json:"name,omitempty"`
+	Tooltip string            `json:"tooltip,omitempty"`
+	Icon    string            `json:"icon,omitempty"`
+	Owner   string            `json:"owner,omitempty"`
+	Id      *Template         `json:"id,omitempty"` //nolint
+	Order   int               `json:"order,omitempty"`
+	Labels  map[string]string `json:"labels,omitempty"`
 	// The type of component, e.g. service, API, website, library, database, etc.
 	Type string `json:"type,omitempty"`
 	// The lifecycle state of the component e.g. production, staging, dev, etc.

diff --git a/api/v1/zz_generated.deepcopy.go b/api/v1/zz_generated.deepcopy.go
diff --git a/config/deploy/crd.yaml b/config/deploy/crd.yaml
@@ -4019,6 +4019,10 @@ spec:
                     template:
                       type: string
                   type: object
+                labels:
+                  additionalProperties:
+                    type: string
+                  type: object
                 lifecycle:
                   description: The lifecycle state of the component e.g. production, staging, dev, etc.
                   type: string
@@ -4310,6 +4314,10 @@ spec:
                           template:
                             type: string
                         type: object
+                      labels:
+                        additionalProperties:
+                          type: string
+                        type: object
                       lifecycle:
                         description: The lifecycle state of the component e.g. production, staging, dev, etc.
                         type: string

diff --git a/config/deploy/manifests.yaml b/config/deploy/manifests.yaml
@@ -4288,6 +4288,10 @@ spec:
                     template:
                       type: string
                   type: object
+                labels:
+                  additionalProperties:
+                    type: string
+                  type: object
                 lifecycle:
                   description: The lifecycle state of the component e.g. production, staging, dev, etc.
                   type: string
@@ -4579,6 +4583,10 @@ spec:
                           template:
                             type: string
                         type: object
+                      labels:
+                        additionalProperties:
+                          type: string
+                        type: object
                       lifecycle:
                         description: The lifecycle state of the component e.g. production, staging, dev, etc.
                         type: string

diff --git a/config/schemas/component.schema.json b/config/schemas/component.schema.json
@@ -659,6 +659,14 @@
         "order": {
           "type": "integer"
         },
+        "labels": {
+          "patternProperties": {
+            ".*": {
+              "type": "string"
+            }
+          },
+          "type": "object"
+        },
         "type": {
           "type": "string"
         },
@@ -731,6 +739,14 @@
         "order": {
           "type": "integer"
         },
+        "labels": {
+          "patternProperties": {
+            ".*": {
+              "type": "string"
+            }
+          },
+          "type": "object"
+        },
         "type": {
           "type": "string"
         },

diff --git a/config/schemas/topology.schema.json b/config/schemas/topology.schema.json
@@ -638,6 +638,14 @@
         "order": {
           "type": "integer"
         },
+        "labels": {
+          "patternProperties": {
+            ".*": {
+              "type": "string"
+            }
+          },
+          "type": "object"
+        },
         "type": {
           "type": "string"
         },
@@ -710,6 +718,14 @@
         "order": {
           "type": "integer"
         },
+        "labels": {
+          "patternProperties": {
+            ".*": {
+              "type": "string"
+            }
+          },
+          "type": "object"
+        },
         "type": {
           "type": "string"
         },

diff --git a/pkg/system_api.go b/pkg/system_api.go
@@ -267,6 +267,7 @@ func NewComponent(c v1.ComponentSpec) *Component {
 		Icon:            c.Icon,
 		Selectors:       c.Selectors,
 		ComponentChecks: c.ComponentChecks,
+		Labels:          c.Labels,
 		Configs:         configs,
 		LogSelectors:    c.LogSelectors,
 	}