Merge pull request #83 from mbaldessari/v1-branch

Update v1 branch

Author: mbaldessari

.github/workflows/ansible-lint.yml

@@ -10,11 +10,11 @@ jobs:
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           persist-credentials: false
 
       - name: Lint Ansible Playbook
-        uses: ansible/ansible-lint@d7cd7cfa2469536527aceaef9ef2ec6f2fb331cb
+        uses: ansible/ansible-lint@43e758bad47344f1ce7b699c0020299f486a8026
         with:
           setup_python: "true"

.github/workflows/ansible-sanitytest.yml

@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: ansible_collections/rhvp/cluster_utils
           persist-credentials: false

.github/workflows/ansible-unittest.yml

@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: ansible_collections/rhvp/cluster_utils
           persist-credentials: false

.github/workflows/jsonschema.yaml

@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           persist-credentials: false
 

.github/workflows/superlinter.yml

@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           # Full git history is needed to get a proper list of changed files within `super-linter`
           fetch-depth: 0

roles/vault_utils/tasks/vault_spokes_init.yaml

@@ -37,8 +37,12 @@
   ansible.builtin.set_fact:
     clusters: "{{ clusters | default({}) | combine({item.metadata.name:
     {'server_api': item.spec.managedClusterClientConfigs[0].url,
-     'cluster_fqdn': item.spec.managedClusterClientConfigs[0].url | ansible.builtin.urlsplit('hostname') | regex_replace('^api\\.', '')}}, recursive=True) }}"
+     'cluster_fqdn':_cluster_fqdn }}, recursive=True) }}"
   loop: "{{ resources }}"
+  vars:
+    _cluster_fqdn: "{{ item.status.clusterClaims | selectattr('name', 'equalto', 'consoleurl.cluster.open-cluster-management.io')
+        | map(attribute='value')
+        | first | ansible.builtin.urlsplit('hostname') | regex_replace('console-openshift-console\\.apps\\.', '') }}"
   when: item.spec.managedClusterClientConfigs[0].url is defined
   loop_control:
     label: "{{ item.metadata.name }}"