Skip to content

Commit

Permalink
chore(master): merge maint-0.9
Browse files Browse the repository at this point in the history
* feat(helm): allow cluster administrator to configure ingress host (#588)
  • Loading branch information
tiborsimko committed Jun 26, 2024
2 parents 33f08d0 + a7c9c85 commit 915249d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
1 change: 1 addition & 0 deletions AUTHORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
The list of contributors in alphabetical order:

- [Adelina Lintuluoto](https://orcid.org/0000-0002-0726-1452)
- [Alp Tuna](https://orcid.org/0009-0001-1915-3993)
- [Anton Khodak](https://orcid.org/0000-0003-3263-4553)
- [Audrius Mecionis](https://orcid.org/0000-0002-3759-1663)
- [Camila Diaz](https://orcid.org/0000-0001-5543-797X)
Expand Down
3 changes: 3 additions & 0 deletions reana_workflow_controller/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,9 @@ def _env_vars_dict_to_k8s_list(env_vars):
REANA_INGRESS_CLASS_NAME = os.getenv("REANA_INGRESS_CLASS_NAME")
"""REANA Ingress class name defined by the administrator to be used for interactive sessions."""

REANA_INGRESS_HOST = os.getenv("REANA_INGRESS_HOST", "")
"""REANA Ingress host defined by the administrator."""

IMAGE_PULL_SECRETS = os.getenv("IMAGE_PULL_SECRETS", "").split(",")
"""Docker image pull secrets which allow the usage of private images."""

Expand Down
5 changes: 4 additions & 1 deletion reana_workflow_controller/k8s.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
JUPYTER_INTERACTIVE_SESSION_DEFAULT_PORT,
REANA_INGRESS_ANNOTATIONS,
REANA_INGRESS_CLASS_NAME,
REANA_INGRESS_HOST,
)


Expand Down Expand Up @@ -104,7 +105,9 @@ def _build_ingress(self):
]
)
spec = client.V1IngressSpec(
rules=[client.V1IngressRule(http=ingress_rule_value)]
rules=[
client.V1IngressRule(http=ingress_rule_value, host=REANA_INGRESS_HOST)
]
)
if REANA_INGRESS_CLASS_NAME:
spec.ingress_class_name = REANA_INGRESS_CLASS_NAME
Expand Down

0 comments on commit 915249d

Please sign in to comment.