set oauth redirect to route with non-standard port (#649)

backport to versions 1.57 and 1.65 of the ansible roles part of kiali/kiali#6180
kiali · May 25, 2023 · 39c7bd7 · 39c7bd7
1 parent f85130a
commit 39c7bd7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/roles/default/kiali-deploy/templates/openshift/oauth.yaml b/roles/default/kiali-deploy/templates/openshift/oauth.yaml
@@ -5,6 +5,9 @@ metadata:
   labels: {{ kiali_resource_metadata_labels }}
 redirectURIs:
   - {{ kiali_route_url }}
+{% if kiali_vars.server.web_port | length > 0 %}
+  - {{ kiali_route_url }}:{{ kiali_vars.server.web_port }}
+{% endif %}
 grantMethod: auto
 {% if kiali_vars.auth.openshift.token_inactivity_timeout is defined %}
 accessTokenInactivityTimeoutSeconds: {{ kiali_vars.auth.openshift.token_inactivity_timeout }}

diff --git a/roles/v1.57/kiali-deploy/templates/openshift/oauth.yaml b/roles/v1.57/kiali-deploy/templates/openshift/oauth.yaml
@@ -5,6 +5,9 @@ metadata:
   labels: {{ kiali_resource_metadata_labels }}
 redirectURIs:
   - {{ kiali_route_url }}
+{% if kiali_vars.server.web_port | length > 0 %}
+  - {{ kiali_route_url }}:{{ kiali_vars.server.web_port }}
+{% endif %}
 grantMethod: auto
 {% if kiali_vars.auth.openshift.token_inactivity_timeout is defined %}
 accessTokenInactivityTimeoutSeconds: {{ kiali_vars.auth.openshift.token_inactivity_timeout }}

diff --git a/roles/v1.65/kiali-deploy/templates/openshift/oauth.yaml b/roles/v1.65/kiali-deploy/templates/openshift/oauth.yaml
@@ -5,6 +5,9 @@ metadata:
   labels: {{ kiali_resource_metadata_labels }}
 redirectURIs:
   - {{ kiali_route_url }}
+{% if kiali_vars.server.web_port | length > 0 %}
+  - {{ kiali_route_url }}:{{ kiali_vars.server.web_port }}
+{% endif %}
 grantMethod: auto
 {% if kiali_vars.auth.openshift.token_inactivity_timeout is defined %}
 accessTokenInactivityTimeoutSeconds: {{ kiali_vars.auth.openshift.token_inactivity_timeout }}