diff --git a/helm/reana/README.md b/helm/reana/README.md index 0a2d4b53..ec768706 100644 --- a/helm/reana/README.md +++ b/helm/reana/README.md @@ -137,7 +137,8 @@ collisions. | `notifications.email_config.smtp_port` | SMTP email server port | None | | `notifications.enabled` | Enable REANA system events notifications. For more information, visit the [documentation page](https://docs.reana.io/administration/configuration/configuring-access/) on user sign up. | false | | `notifications.system_status` | Cronjob pattern representing how often the system status notification should be sent. Leave it empty to deactivate it | `"0 0 * * *"` | -| `reana_hostname` | REANA hostname (e.g. reana.example.org) | None | +| `reana_hostname` | REANA hostname (e.g. reana.example.org) | localhost | +| `reana_hostport` | REANA ingress port | 30443 | | `namespace_runtime` | Namespace in which the REANA runtime pods (workflow engines, jobs etc...) will run | `.Release.Namespace` | | `naming_scheme` | REANA component naming scheme | None | | `opensearch.*` | Pass any value from [OpenSearch Helm chart values](https://github.com/opensearch-project/helm-charts/tree/main/charts/opensearch#configuration) here | - | diff --git a/helm/reana/templates/NOTES.txt b/helm/reana/templates/NOTES.txt index e8f2aa38..8ca5c050 100644 --- a/helm/reana/templates/NOTES.txt +++ b/helm/reana/templates/NOTES.txt @@ -29,14 +29,14 @@ finalise its configuration. 4. Try to run your first REANA example: - $ firefox https://{{ default "localhost:30443" .Values.reana_hostname }} + $ firefox https://{{ .Values.reana_hostname }}:{{.Values.reana_hostport}} Or, using command line: $ # install REANA client $ pip install --user reana-client $ # set environment variables for REANA client - $ export REANA_SERVER_URL=https://{{ default "localhost:30443" .Values.reana_hostname }} + $ export REANA_SERVER_URL=https://{{ .Values.reana_hostname }}:{{.Values.reana_hostport}} $ export REANA_ACCESS_TOKEN="$mytoken" $ # test connection to the REANA cluster $ reana-client ping diff --git a/helm/reana/templates/reana-server.yaml b/helm/reana/templates/reana-server.yaml index d81c917c..29d77ccc 100644 --- a/helm/reana/templates/reana-server.yaml +++ b/helm/reana/templates/reana-server.yaml @@ -128,10 +128,10 @@ spec: - name: {{ $key }} value: {{ $value | quote }} {{- end }} - {{- if .Values.reana_hostname }} - - name: REANA_HOSTNAME - value: {{ .Values.reana_hostname }} - {{- end }} + {{- if .Values.reana_hostname }} + - name: REANA_HOSTNAME + value: {{ .Values.reana_hostname }} + {{- end }} - name: CERN_CONSUMER_KEY valueFrom: secretKeyRef: diff --git a/helm/reana/templates/reana-workflow-controller.yaml b/helm/reana/templates/reana-workflow-controller.yaml index d80cb6c8..746d90ba 100644 --- a/helm/reana/templates/reana-workflow-controller.yaml +++ b/helm/reana/templates/reana-workflow-controller.yaml @@ -197,10 +197,14 @@ spec: - name: REANA_DASK_CLUSTER_MAX_SINGLE_WORKER_MEMORY value: {{ .Values.dask.cluster_max_single_worker_memory | default "8Gi" }} {{- end }} - {{- if .Values.reana_hostname }} - - name: REANA_HOSTNAME - value: {{ .Values.reana_hostname }} - {{- end }} + {{- if .Values.reana_hostname }} + - name: REANA_HOSTNAME + value: {{ .Values.reana_hostname }} + {{- end }} + {{- if .Values.reana_hostport }} + - name: REANA_HOSTPORT + value: {{ .Values.reana_hostport }} + {{- end }} {{- if .Values.eos.enabled }} - name: K8S_CERN_EOS_AVAILABLE value: "True" @@ -292,6 +296,10 @@ spec: - name: REANA_HOSTNAME value: {{ .Values.reana_hostname }} {{- end }} + {{- if .Values.reana_hostport }} + - name: REANA_HOSTPORT + value: {{ .Values.reana_hostport }} + {{- end }} {{- if .Values.debug.enabled }} - name: WDB_SOCKET_SERVER value: "{{ include "reana.prefix" . }}-wdb" diff --git a/helm/reana/templates/secrets.yaml b/helm/reana/templates/secrets.yaml index 8d0357a3..f8cad217 100644 --- a/helm/reana/templates/secrets.yaml +++ b/helm/reana/templates/secrets.yaml @@ -95,7 +95,7 @@ metadata: "helm.sh/resource-policy": keep type: kubernetes.io/tls data: - {{- $cert := genSelfSignedCert (.Values.reana_hostname | default "localhost") nil nil 90 }} + {{- $cert := genSelfSignedCert (.Values.reana_hostname) nil nil 90 }} tls.crt: {{ $cert.Cert | b64enc | quote }} tls.key: {{ $cert.Key | b64enc | quote }} {{- end }} diff --git a/helm/reana/values.yaml b/helm/reana/values.yaml index 090cb731..8201e94a 100644 --- a/helm/reana/values.yaml +++ b/helm/reana/values.yaml @@ -2,9 +2,14 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. -# reana_hostname: reana.cern.ch +reana_hostname: localhost # `reana_hostname` should be set for third party integrations to work and for -# production deployments to be secure. +# production deployments to be secure. The default `localhost` value is used +# in local deployment scenarios. +reana_hostport_http: 30080 +reana_hostport_https: 30443 +# `reana_hostport_http` and `reana_hostport_https` should be set to same port +# you expose in your ingress controller. debug: enabled: false