[IUO] Add kubevirt-apiserver-proxy-np relate object (RedHatQE#2020)

* [IUO] Add kubevirt-apiserver-proxy-np relate object

Signed-off-by: Harel Meir <hmeir@redhat.com>

* Add jira CNV-68999

The np component relationship label isn't correct.
Skipping it until its fixed

Signed-off-by: Harel Meir <hmeir@redhat.com>

---------

Signed-off-by: Harel Meir <hmeir@redhat.com>

Author: hmeir

tests/install_upgrade_operators/relationship_labels/constants.py

@@ -28,8 +28,10 @@
     KUBEMACPOOL_CERT_MANAGER,
     KUBEMACPOOL_MAC_CONTROLLER_MANAGER,
     KUBEVIRT_APISERVER_PROXY,
+    KUBEVIRT_APISERVER_PROXY_NP,
     KUBEVIRT_CLUSTER_CRITICAL,
     KUBEVIRT_CONSOLE_PLUGIN,
+    KUBEVIRT_CONSOLE_PLUGIN_NP,
     KUBEVIRT_CONSOLE_PLUGIN_SERVICE,
     KUBEVIRT_HYPERCONVERGED_OPERATOR_METRICS,
     KUBEVIRT_HYPERCONVERGED_PROMETHEUS_RULE,
@@ -430,4 +432,16 @@
         VERSION_LABEL_KEY: None,
         PART_OF_LABEL_KEY: HCO_PART_OF_LABEL_VALUE,
     },
+    KUBEVIRT_CONSOLE_PLUGIN_NP: {
+        MANAGED_BY_LABEL_KEY: HCO_OPERATOR,
+        COMPONENT_LABEL_KEY: KUBEVIRT_CONSOLE_PLUGIN,
+        VERSION_LABEL_KEY: None,
+        PART_OF_LABEL_KEY: HCO_PART_OF_LABEL_VALUE,
+    },
+    KUBEVIRT_APISERVER_PROXY_NP: {
+        MANAGED_BY_LABEL_KEY: HCO_OPERATOR,
+        COMPONENT_LABEL_KEY: KUBEVIRT_APISERVER_PROXY,
+        VERSION_LABEL_KEY: None,
+        PART_OF_LABEL_KEY: HCO_PART_OF_LABEL_VALUE,
+    },
 }

tests/install_upgrade_operators/relationship_labels/test_relationship_labels.py

@@ -12,7 +12,8 @@
 from tests.install_upgrade_operators.relationship_labels.utils import (
     verify_component_labels_by_resource,
 )
-from utilities.constants import VERSION_LABEL_KEY
+from utilities.constants import KUBEVIRT_APISERVER_PROXY_NP, VERSION_LABEL_KEY
+from utilities.infra import is_jira_open
 
 pytestmark = [pytest.mark.post_upgrade, pytest.mark.sno, pytest.mark.gating, pytest.mark.arm64, pytest.mark.s390x]
 LOGGER = logging.getLogger(__name__)
@@ -99,6 +100,9 @@ def test_verify_relationship_labels_hco_components(
         expected_label_dictionary,
         ocp_resource_by_name,
     ):
+        if ocp_resource_by_name.name == KUBEVIRT_APISERVER_PROXY_NP and is_jira_open(jira_id="CNV-68999"):
+            pytest.skip(f"Currently {KUBEVIRT_APISERVER_PROXY_NP} resource have the wrong relationship labels")
+
         verify_component_labels_by_resource(
             component=ocp_resource_by_name,
             expected_component_labels=expected_label_dictionary,

utilities/constants.py

@@ -385,6 +385,8 @@ class S390X:
 KUBEVIRT_UI_CONFIG_READER = "kubevirt-ui-config-reader"
 KUBEVIRT_UI_CONFIG_READER_ROLE_BINDING = "kubevirt-ui-config-reader-rolebinding"
 HCO_BEARER_AUTH = "hco-bearer-auth"
+KUBEVIRT_CONSOLE_PLUGIN_NP = "kubevirt-console-plugin-np"
+KUBEVIRT_APISERVER_PROXY_NP = "kubevirt-apiserver-proxy-np"
 # components kind
 ROLEBINDING_STR = "RoleBinding"
 POD_STR = "Pod"
@@ -407,6 +409,7 @@ class S390X:
 SSP_STR = "SSP"
 SECRET_STR = "Secret"
 KUBEVIRT_APISERVER_PROXY = "kubevirt-apiserver-proxy"
+NETWORKPOLICY_STR = "NetworkPolicy"
 AAQ_OPERATOR = "aaq-operator"
 WINDOWS_BOOTSOURCE_PIPELINE = "windows-bootsource-pipeline"
 # All hco relate objects with kind
@@ -446,7 +449,8 @@ class S390X:
     {KUBEVIRT_UI_CONFIG_READER: ROLE_STR},
     {KUBEVIRT_UI_CONFIG_READER_ROLE_BINDING: ROLEBINDING_STR},
     {HCO_BEARER_AUTH: SECRET_STR},
-    {"kubevirt-console-plugin-np": "NetworkPolicy"},
+    {KUBEVIRT_CONSOLE_PLUGIN_NP: NETWORKPOLICY_STR},
+    {KUBEVIRT_APISERVER_PROXY_NP: NETWORKPOLICY_STR},
 ]
 CNV_PODS_NO_HPP_CSI_HPP_POOL = [
     AAQ_OPERATOR,