Browse Source

Merge pull request #3841 from jarrpa/oc_label-get-fix

Merged by openshift-bot
OpenShift Bot 8 năm trước cách đây
mục cha
commit
6cb58041aa

+ 2 - 2
roles/lib_openshift/library/oc_label.py

@@ -1551,9 +1551,9 @@ class OCLabel(OpenShiftCLI):
         label_list = []
 
         if self.name:
-            result = self._get(resource=self.kind, rname=self.name, selector=self.selector)
+            result = self._get(resource=self.kind, rname=self.name)
 
-            if 'labels' in result['results'][0]['metadata']:
+            if result['results'][0] and 'labels' in result['results'][0]['metadata']:
                 label_list.append(result['results'][0]['metadata']['labels'])
             else:
                 label_list.append({})

+ 2 - 2
roles/lib_openshift/src/class/oc_label.py

@@ -134,9 +134,9 @@ class OCLabel(OpenShiftCLI):
         label_list = []
 
         if self.name:
-            result = self._get(resource=self.kind, rname=self.name, selector=self.selector)
+            result = self._get(resource=self.kind, rname=self.name)
 
-            if 'labels' in result['results'][0]['metadata']:
+            if result['results'][0] and 'labels' in result['results'][0]['metadata']:
                 label_list.append(result['results'][0]['metadata']['labels'])
             else:
                 label_list.append({})