Merge pull request #793 from redhatci/hcp_creds

Get HCP creds via Clusterinstance

Author: betoredhat

roles/acm/utils/tasks/get-credentials.yml

@@ -15,7 +15,8 @@
 
 - name: Get kubeadmin credentials for HCP
   when:
-    - kubeconfig_secret.resources[0].metadata.labels.keys() | list is search('hypershift')
+    - kubeconfig_secret.resources[0].metadata.labels.keys() | list is search('hypershift') or
+      kubeconfig_secret.resources[0].metadata.annotations.keys() | default({}) | list is search('hypershift')
   block:
     - name: Get kubeadmin credentials for HCP
       kubernetes.core.k8s_info:
@@ -40,6 +41,7 @@
 - name: Get kubeadmin credentials for non-HCP
   when:
     - kubeconfig_secret.resources[0].metadata.labels.keys() | list is not search('hypershift')
+    - kubeconfig_secret.resources[0].metadata.annotations.keys() | default({}) | list is not search('hypershift')
   block:
     - name: Get kubeadmin credentials for non-HCP
       kubernetes.core.k8s_info:

roles/check_resource/tasks/wait-mcp.yml

@@ -1,20 +1,32 @@
 ---
-- name: "Pause 60 seconds to wait for MC to be triggered by a resource change"
-  ansible.builtin.pause:
-    seconds: 60
-
-- name: Wait for MCP to be updated
+- name: "Check if MachineConfigPools exist in the cluster"
   kubernetes.core.k8s_info:
     api_version: machineconfiguration.openshift.io/v1
     kind: MachineConfigPool
-  register: _cr_mcp_status
-  vars:
-    _cr_status_query: "resources[*].status.conditions[?type=='Updated'].status"
-    _cr_update_status: "{{ _cr_mcp_status | json_query(_cr_status_query) | flatten | unique }}"
-  until:
-    - _cr_mcp_status.resources is defined
-    - _cr_update_status == ['True']
-  retries: "{{ check_wait_retries }}"
-  delay: "{{ check_wait_delay }}"
+  register: _cr_mcp_check
+  no_log: true
+
+- name: "Wait for MCP updates"
+  when:
+    - _cr_mcp_check.resources is defined
+    - _cr_mcp_check.resources | length > 0
+  block:
+    - name: "Pause 60 seconds to wait for MC to be triggered by a resource change"
+      ansible.builtin.pause:
+        seconds: 60
+
+    - name: Wait for MCP to be updated
+      kubernetes.core.k8s_info:
+        api_version: machineconfiguration.openshift.io/v1
+        kind: MachineConfigPool
+      register: _cr_mcp_status
+      vars:
+        _cr_status_query: "resources[*].status.conditions[?type=='Updated'].status"
+        _cr_update_status: "{{ _cr_mcp_status | json_query(_cr_status_query) | flatten | unique }}"
+      until:
+        - _cr_mcp_status.resources is defined
+        - _cr_update_status == ['True']
+      retries: "{{ check_wait_retries }}"
+      delay: "{{ check_wait_delay }}"
 
 ...