Skip to content

Commit f687e86

Browse files
committed
chore(master): merge maint-0.9 (reanahub#590)
feat(helm): allow cluster administrator to configure ingress host (reanahub#588)
2 parents 33f08d0 + a7c9c85 commit f687e86

3 files changed

Lines changed: 8 additions & 1 deletion

File tree

AUTHORS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
The list of contributors in alphabetical order:
44

55
- [Adelina Lintuluoto](https://orcid.org/0000-0002-0726-1452)
6+
- [Alp Tuna](https://orcid.org/0009-0001-1915-3993)
67
- [Anton Khodak](https://orcid.org/0000-0003-3263-4553)
78
- [Audrius Mecionis](https://orcid.org/0000-0002-3759-1663)
89
- [Camila Diaz](https://orcid.org/0000-0001-5543-797X)

reana_workflow_controller/config.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,9 @@ def _env_vars_dict_to_k8s_list(env_vars):
200200
REANA_INGRESS_CLASS_NAME = os.getenv("REANA_INGRESS_CLASS_NAME")
201201
"""REANA Ingress class name defined by the administrator to be used for interactive sessions."""
202202

203+
REANA_INGRESS_HOST = os.getenv("REANA_INGRESS_HOST", "")
204+
"""REANA Ingress host defined by the administrator."""
205+
203206
IMAGE_PULL_SECRETS = os.getenv("IMAGE_PULL_SECRETS", "").split(",")
204207
"""Docker image pull secrets which allow the usage of private images."""
205208

reana_workflow_controller/k8s.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
JUPYTER_INTERACTIVE_SESSION_DEFAULT_PORT,
2828
REANA_INGRESS_ANNOTATIONS,
2929
REANA_INGRESS_CLASS_NAME,
30+
REANA_INGRESS_HOST,
3031
)
3132

3233

@@ -104,7 +105,9 @@ def _build_ingress(self):
104105
]
105106
)
106107
spec = client.V1IngressSpec(
107-
rules=[client.V1IngressRule(http=ingress_rule_value)]
108+
rules=[
109+
client.V1IngressRule(http=ingress_rule_value, host=REANA_INGRESS_HOST)
110+
]
108111
)
109112
if REANA_INGRESS_CLASS_NAME:
110113
spec.ingress_class_name = REANA_INGRESS_CLASS_NAME

0 commit comments

Comments
 (0)