From 8e69b2068a8bebb668b6317f50d581e9a9c78450 Mon Sep 17 00:00:00 2001
From: Roni Kishner <87259550+RoniKishner@users.noreply.github.com>
Date: Sun, 23 Apr 2023 12:41:04 +0300
Subject: [PATCH] Add label parameter to Resource object (#1192)

---
 ocp_resources/namespace.py | 9 ---------
 ocp_resources/resource.py  | 7 +++++++
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/ocp_resources/namespace.py b/ocp_resources/namespace.py
index 4bcb0367a4..bb67b5bd93 100644
--- a/ocp_resources/namespace.py
+++ b/ocp_resources/namespace.py
@@ -17,7 +17,6 @@ def __init__(
         name=None,
         client=None,
         teardown=True,
-        label=None,
         yaml_file=None,
         delete_timeout=TIMEOUT_4MINUTES,
         **kwargs,
@@ -30,11 +29,3 @@ def __init__(
             delete_timeout=delete_timeout,
             **kwargs,
         )
-        self.label = label
-
-    def to_dict(self):
-        super().to_dict()
-        if not self.yaml_file and self.label:
-            self.res.setdefault("metadata", {}).setdefault("labels", {}).update(
-                self.label
-            )
diff --git a/ocp_resources/resource.py b/ocp_resources/resource.py
index 5a92b6d144..1f2a3693aa 100644
--- a/ocp_resources/resource.py
+++ b/ocp_resources/resource.py
@@ -320,6 +320,7 @@ def __init__(
         node_selector_labels=None,
         config_file=None,
         context=None,
+        label=None,
         timeout_seconds=TIMEOUT_1MINUTE,
     ):
         """
@@ -338,6 +339,7 @@ def __init__(
             config_file (str): Path to config file for connecting to remote cluster.
             context (str): Context name for connecting to remote cluster.
             timeout_seconds (int): timeout for a get api call, call out be terminated after this many seconds
+            label (dict): Resource labels
 
         """
         if not self.api_group and not self.api_version:
@@ -352,6 +354,7 @@ def __init__(
         self.resource_dict = None  # Filled in case yaml_file is not None
         self.config_file = config_file
         self.context = context
+        self.label = label
         if not (self.name or self.yaml_file):
             raise ValueError("name or yaml file is required")
 
@@ -412,6 +415,10 @@ def _base_body(self):
                 "kind": self.kind,
                 "metadata": {"name": self.name},
             }
+            if self.label:
+                self.res.setdefault("metadata", {}).setdefault("labels", {}).update(
+                    self.label
+                )
 
     def to_dict(self):
         """