Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix update_status.yml issue when finding api route #249

Merged
merged 1 commit into from
Sep 3, 2024
Merged

Fix update_status.yml issue when finding api route #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions dev/eda-cr/eda-openshift-cr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ spec:
- redhat-operators-pull-secret
admin_password_secret: custom-admin-password

# Disable UI
ui_disabled: false

# -- Example image overrides
# image: quay.io/ansible/eda-server
# image_version: main
Expand Down
2 changes: 1 addition & 1 deletion roles/eda/tasks/update_status.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
api_version: 'route.openshift.io/v1'
kind: Route
namespace: '{{ ansible_operator_meta.namespace }}'
name: '{{ ui_disabled | bool | ternary(ansible_operator_meta.name + "-api", ansible_operator_meta.name) }}'
name: "{{ ansible_operator_meta.name }}{{ '' if ui_disabled else '-ui' }}"
register: route_url

- name: Update URL status
Expand Down
4 changes: 2 additions & 2 deletions roles/eda/templates/eda-ui.ingress.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ apiVersion: '{{ ingress_api_version }}'
{% endif %}
kind: Ingress
metadata:
name: '{{ ansible_operator_meta.name }}-ingress'
name: '{{ ansible_operator_meta.name }}-ui-ingress'
namespace: '{{ ansible_operator_meta.namespace }}'
labels:
{{ lookup("template", "../common/templates/labels/common.yaml.j2") | indent(width=4) | trim }}
Expand Down Expand Up @@ -52,7 +52,7 @@ apiVersion: '{{ route_api_version }}'
{% endif %}
kind: Route
metadata:
name: '{{ ansible_operator_meta.name }}'
name: '{{ ansible_operator_meta.name }}-ui'
namespace: '{{ ansible_operator_meta.namespace }}'
labels:
{{ lookup("template", "../common/templates/labels/common.yaml.j2") | indent(width=4) | trim }}
Expand Down