Skip to content

Commit

Permalink
we already do a check for ingress enablement if using openshift - thi…
Browse files Browse the repository at this point in the history
…s check is in the main task yaml

we also need to make sure we convert the ingress enable flag to bool
  • Loading branch information
jmazzitelli committed Dec 29, 2024
1 parent ae4e819 commit 84d8a9e
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions roles/default/kiali-deploy/tasks/openshift/os-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,6 @@
when:
- is_openshift == True

- fail:
msg: "You must have deployment.ingress.enabled set to 'true' if you are using auth.strategy of 'openshift'"
when:
- kiali_vars.deployment.ingress.enabled == False
- kiali_vars.auth.strategy == "openshift"

# If it is Removed, the web console is disabled.
# See: https://docs.openshift.com/container-platform/4.13/web_console/disabling-web-console.html
- name: Determine if OpenShift Console is installed and enabled
Expand Down Expand Up @@ -120,15 +114,15 @@
include_tasks: openshift/os-get-kiali-route-url.yml
when:
- is_openshift == True
- kiali_vars.deployment.ingress.enabled == True
- kiali_vars.deployment.ingress.enabled|bool == True
- kiali_vars.deployment.remote_cluster_resources_only|bool == False

- name: Process OpenShift OAuth client
k8s:
definition: "{{ lookup('template', 'templates/openshift/oauth.yaml') }}"
when:
- is_openshift == True
- kiali_vars.deployment.ingress.enabled == True
- kiali_vars.deployment.ingress.enabled|bool == True
- kiali_vars.auth.strategy == "openshift"

- name: Delete all ConsoleLinks for namespaces that are no longer accessible
Expand Down

0 comments on commit 84d8a9e

Please sign in to comment.