Designate the apps.kubevirt.io/component label for KubeVirt components.

Exposes relationship label "apps.kubevirt.io/component " to HCO via the KubeVirt CR, set it's default value to be `kubevirt`. Signed-off-by: Barak Mordehai <[email protected]>
zyjj1 · Nov 17, 2021 · 6b9cc63 · 6b9cc63
1 parent debf29e
commit 6b9cc63
Show file tree

Hide file tree

Showing 11 changed files with 28,559 additions and 3 deletions.
diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
@@ -12548,6 +12548,10 @@
       "description": "The namespace Prometheus is deployed in Defaults to openshift-monitor",
       "type": "string"
      },
+     "productComponent": {
+      "description": "Designate the apps.kubevirt.io/component label for KubeVirt components. Useful if KubeVirt is included as part of a product. If ProductComponent is not specified, the component label will be omitted.",
+      "type": "string"
+     },
      "productName": {
       "description": "Designate the apps.kubevirt.io/part-of label for KubeVirt components. Useful if KubeVirt is included as part of a product. If ProductName is not specified, the part-of label will be omitted.",
       "type": "string"

diff --git a/manifests/generated/kv-resource.yaml b/manifests/generated/kv-resource.yaml
@@ -1209,6 +1209,12 @@ spec:
               monitorNamespace:
                 description: The namespace Prometheus is deployed in Defaults to openshift-monitor
                 type: string
+              productComponent:
+                description: Designate the apps.kubevirt.io/component label for KubeVirt
+                  components. Useful if KubeVirt is included as part of a product.
+                  If ProductComponent is not specified, the component label will be
+                  omitted. TODO set this label with default value kubevirt.
+                type: string
               productName:
                 description: Designate the apps.kubevirt.io/part-of label for KubeVirt
                   components. Useful if KubeVirt is included as part of a product.
@@ -3255,6 +3261,12 @@ spec:
               monitorNamespace:
                 description: The namespace Prometheus is deployed in Defaults to openshift-monitor
                 type: string
+              productComponent:
+                description: Designate the apps.kubevirt.io/component label for KubeVirt
+                  components. Useful if KubeVirt is included as part of a product.
+                  If ProductComponent is not specified, the component label will be
+                  omitted. TODO set this label with default value kubevirt.
+                type: string
               productName:
                 description: Designate the apps.kubevirt.io/part-of label for KubeVirt
                   components. Useful if KubeVirt is included as part of a product.

diff --git a/pkg/virt-operator/kubevirt_test.go b/pkg/virt-operator/kubevirt_test.go
@@ -2740,6 +2740,9 @@ func injectMetadata(objectMeta *metav1.ObjectMeta, config *util.KubeVirtDeployme
 	objectMeta.Annotations[v1.KubeVirtGenerationAnnotation] = "1"
 
 	objectMeta.Labels[v1.AppComponentLabel] = v1.AppComponent
+	if config.GetProductComponent() != "" {
+		objectMeta.Labels[v1.AppComponentLabel] = config.GetProductComponent()
+	}
 }
 
 func shouldExpectHCOConditions(kv *v1.KubeVirt, available k8sv1.ConditionStatus, progressing k8sv1.ConditionStatus, degraded k8sv1.ConditionStatus) {

diff --git a/pkg/virt-operator/resource/apply/reconcile.go b/pkg/virt-operator/resource/apply/reconcile.go
@@ -94,6 +94,10 @@ func injectOperatorMetadata(kv *v1.KubeVirt, objectMeta *metav1.ObjectMeta, vers
 	}
 	objectMeta.Labels[v1.AppComponentLabel] = v1.AppComponent
 
+	if kv.Spec.ProductComponent != "" && util.IsValidLabel(kv.Spec.ProductComponent) {
+		objectMeta.Labels[v1.AppComponentLabel] = kv.Spec.ProductComponent
+	}
+
 	objectMeta.Labels[v1.ManagedByLabel] = v1.ManagedByLabelOperatorValue
 
 	if objectMeta.Annotations == nil {

diff --git a/pkg/virt-operator/resource/generate/components/validations_generated.go b/pkg/virt-operator/resource/generate/components/validations_generated.go
@@ -1588,6 +1588,12 @@ var CRDsValidation map[string]string = map[string]string{
         monitorNamespace:
           description: The namespace Prometheus is deployed in Defaults to openshift-monitor
           type: string
+        productComponent:
+          description: Designate the apps.kubevirt.io/component label for KubeVirt
+            components. Useful if KubeVirt is included as part of a product. If ProductComponent
+            is not specified, the component label will be omitted. TODO set this label
+            with default value kubevirt.
+          type: string
         productName:
           description: Designate the apps.kubevirt.io/part-of label for KubeVirt components.
             Useful if KubeVirt is included as part of a product. If ProductName is

diff --git a/pkg/virt-operator/util/config.go b/pkg/virt-operator/util/config.go
@@ -69,9 +69,10 @@ const (
 	DefaultMonitorAccount = "prometheus-k8s"
 
 	// lookup keys in AdditionalProperties
-	ImagePrefixKey    = "imagePrefix"
-	ProductNameKey    = "productName"
-	ProductVersionKey = "productVersion"
+	ImagePrefixKey      = "imagePrefix"
+	ProductNameKey      = "productName"
+	ProductComponentKey = "productComponent"
+	ProductVersionKey   = "productVersion"
 
 	// the regex used to parse the operator image
 	operatorImageRegex = "^(.*)/(.*)virt-operator([@:].*)?$"
@@ -435,6 +436,10 @@ func (c *KubeVirtDeploymentConfig) GetVerbosity() string {
 	return "2"
 }
 
+func (c *KubeVirtDeploymentConfig) GetProductComponent() string {
+	return c.AdditionalProperties[ProductComponentKey]
+}
+
 func (c *KubeVirtDeploymentConfig) GetProductName() string {
 	return c.AdditionalProperties[ProductNameKey]
 }

diff --git a/staging/src/kubevirt.io/api/core/v1/types.go b/staging/src/kubevirt.io/api/core/v1/types.go
@@ -1551,6 +1551,12 @@ type KubeVirtSpec struct {
 	// If ProductName is not specified, the part-of label will be omitted.
 	ProductName string `json:"productName,omitempty"`
 
+	// Designate the apps.kubevirt.io/component label for KubeVirt components.
+	// Useful if KubeVirt is included as part of a product.
+	// If ProductComponent is not specified, the component label will be omitted.
+	//TODO set this label with default value kubevirt.
+	ProductComponent string `json:"productComponent,omitempty"`
+
 	// holds kubevirt configurations.
 	// same as the virt-configMap
 	Configuration KubeVirtConfiguration `json:"configuration,omitempty"`

diff --git a/staging/src/kubevirt.io/api/core/v1/types_swagger_generated.go b/staging/src/kubevirt.io/api/core/v1/types_swagger_generated.go
diff --git a/staging/src/kubevirt.io/client-go/api/openapi_generated.go b/staging/src/kubevirt.io/client-go/api/openapi_generated.go
diff --git a/staging/src/kubevirt.io/client-go/apis/core/v1/BUILD.bazel b/staging/src/kubevirt.io/client-go/apis/core/v1/BUILD.bazel
@@ -0,0 +1,15 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name = "go_default_library",
+    srcs = ["openapi_generated.go"],
+    importpath = "kubevirt.io/client-go/apis/core/v1",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//vendor/github.com/go-openapi/spec:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library",
+        "//vendor/k8s.io/kube-openapi/pkg/common:go_default_library",
+    ],
+)