diff --git a/roles/default/ossmconsole-deploy/tasks/main.yml b/roles/default/ossmconsole-deploy/tasks/main.yml index 1cbc277f..79fd7bf7 100644 --- a/roles/default/ossmconsole-deploy/tasks/main.yml +++ b/roles/default/ossmconsole-deploy/tasks/main.yml @@ -188,12 +188,31 @@ when: - ossmconsole_vars.kiali.servicePort == 0 +- name: Ask Kiali for information about itself + vars: + version_url: "{{ 'https://' + ossmconsole_vars.kiali.serviceName + '.' + ossmconsole_vars.kiali.serviceNamespace + '.svc.cluster.local:' + ossmconsole_vars.kiali.servicePort + '/api' }}" + uri: + url: "{{ version_url }}" + status_code: 200 + validate_certs: false + return_content: true + register: kiali_info_results + until: + - kiali_info_results is defined + - kiali_info_results.status is defined + - kiali_info_results.status == 200 + retries: 60 + delay: 5 + ignore_errors: yes + - name: Determine Kiali version - set_fact: - kiali_version: "{{ lookup('url', version_url, split_lines='no', validate_certs='no') | from_json | json_query(q) }}" vars: q: status."Kiali version" - version_url: "{{ 'https://' + ossmconsole_vars.kiali.serviceName + '.' + ossmconsole_vars.kiali.serviceNamespace + '.svc.cluster.local:' + ossmconsole_vars.kiali.servicePort + '/api' }}" + set_fact: + kiali_version: "{{ kiali_info_results.json | json_query(q) }}" + when: + - kiali_info_results is defined + - kiali_info_results.json is defined ignore_errors: yes - name: "Determine environment to store in status" diff --git a/roles/default/ossmconsole-deploy/tasks/process-resource.yml b/roles/default/ossmconsole-deploy/tasks/process-resource.yml index 9b165d44..5696ca25 100644 --- a/roles/default/ossmconsole-deploy/tasks/process-resource.yml +++ b/roles/default/ossmconsole-deploy/tasks/process-resource.yml @@ -1,6 +1,6 @@ # process all template names found in process_resource_templates - any empty strings in the list are ignored. # This will keep a running tally of all processed resources in "processed_resources_dict". -- name: "Create Kiali resources from templates" +- name: "Create OSSMConsole resources from templates" k8s: state: "present" continue_on_error: false @@ -28,4 +28,4 @@ - name: "Resource creation results" debug: - msg: "{{ processed_resources_dict }}" \ No newline at end of file + msg: "{{ processed_resources_dict }}" diff --git a/roles/v1.73/ossmconsole-deploy/tasks/main.yml b/roles/v1.73/ossmconsole-deploy/tasks/main.yml index 61f3a08b..ebdc7909 100644 --- a/roles/v1.73/ossmconsole-deploy/tasks/main.yml +++ b/roles/v1.73/ossmconsole-deploy/tasks/main.yml @@ -192,12 +192,31 @@ when: - ossmconsole_vars.kiali.servicePort == 0 +- name: Ask Kiali for information about itself + vars: + version_url: "{{ 'https://' + ossmconsole_vars.kiali.serviceName + '.' + ossmconsole_vars.kiali.serviceNamespace + '.svc.cluster.local:' + ossmconsole_vars.kiali.servicePort + '/api' }}" + uri: + url: "{{ version_url }}" + status_code: 200 + validate_certs: false + return_content: true + register: kiali_info_results + until: + - kiali_info_results is defined + - kiali_info_results.status is defined + - kiali_info_results.status == 200 + retries: 60 + delay: 5 + ignore_errors: yes + - name: Determine Kiali version - set_fact: - kiali_version: "{{ lookup('url', version_url, split_lines='no', validate_certs='no') | from_json | json_query(q) }}" vars: q: status."Kiali version" - version_url: "{{ 'https://' + ossmconsole_vars.kiali.serviceName + '.' + ossmconsole_vars.kiali.serviceNamespace + '.svc.cluster.local:' + ossmconsole_vars.kiali.servicePort + '/api' }}" + set_fact: + kiali_version: "{{ kiali_info_results.json | json_query(q) }}" + when: + - kiali_info_results is defined + - kiali_info_results.json is defined ignore_errors: yes - name: "Determine environment to store in status" diff --git a/roles/v1.73/ossmconsole-deploy/tasks/process-resource.yml b/roles/v1.73/ossmconsole-deploy/tasks/process-resource.yml index 9b165d44..5696ca25 100644 --- a/roles/v1.73/ossmconsole-deploy/tasks/process-resource.yml +++ b/roles/v1.73/ossmconsole-deploy/tasks/process-resource.yml @@ -1,6 +1,6 @@ # process all template names found in process_resource_templates - any empty strings in the list are ignored. # This will keep a running tally of all processed resources in "processed_resources_dict". -- name: "Create Kiali resources from templates" +- name: "Create OSSMConsole resources from templates" k8s: state: "present" continue_on_error: false @@ -28,4 +28,4 @@ - name: "Resource creation results" debug: - msg: "{{ processed_resources_dict }}" \ No newline at end of file + msg: "{{ processed_resources_dict }}"