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.

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

feat(helm): add value to customise URL of privacy notice (#778) #778

Merged
merged 1 commit into from
Feb 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions helm/reana/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ This Helm automatically prefixes all names using the release name to avoid colli
| `components.reana_ui.imagePullPolicy` | REANA-UI image pull policy | IfNotPresent |
| `components.reana_ui.polling_secs` | Frequency of workflow list page reload in seconds | 15 |
| `components.reana_ui.client_pyvenv` | REANA-Client python environment to source in the welcome example. | None |
| `components.reana_ui.docs_url` | URL of documentation site (footer icon) | None |
| `components.reana_ui.forum_url` | URL of forum site (footer icon) | None |
| `components.reana_ui.docs_url` | URL of documentation site (footer icon) | https://docs.reana.io |
| `components.reana_ui.forum_url` | URL of forum site (footer icon) | https://forum.reana.io |
| `components.reana_ui.chat_url` | URL of chat channel (footer icon) | None |
| `components.reana_ui.privacy_notice_url` | URL of the privacy notice (footer icon) | None |
| `components.reana_ui.cern_sso` | Enable CERN SSO sign in | false |
| `components.reana_ui.cern_ropo` | Display CERN RoPO privacy policy page | false |
| `components.reana_ui.local_users` | Enable local users sign in/up | true |
| `components.reana_ui.hide_signup` | Hide users sign up form | false |
| `components.reana_workflow_controller.environment` | REANA-Workflow-Controller environment variables | `{SHARED_VOLUME_PATH: /var/reana}` |
Expand Down
5 changes: 4 additions & 1 deletion helm/reana/templates/reana-config.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
---
{{- if .Values.components.reana_ui.cern_ropo }}
{{- fail "`components.reana_ui.cern_ropo` is deprecated, please use `components.reana_ui.privacy_notice_url` instead." }}
{{- end }}
apiVersion: v1
kind: ConfigMap
metadata:
Expand All @@ -12,9 +15,9 @@ data:
client_pyvenv: {{ .Values.components.reana_ui.client_pyvenv | quote | default "null" }}
forum_url: {{ .Values.components.reana_ui.forum_url | quote | default "null" }}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we update the default value for the forum and docs URLs in the README, shouldn't we update them here as well?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They are already set in the values file, I am just keeping the docs up to date:

docs_url: https://docs.reana.io
forum_url: https://forum.reana.io

chat_url: {{ .Values.components.reana_ui.chat_url | quote | default "null" }}
privacy_notice_url: {{ .Values.components.reana_ui.privacy_notice_url | quote | default "null"}}
cern_sso: {{ .Values.components.reana_ui.cern_sso | default false }}
login_provider_config: {{ .Values.login | toJson }}
cern_ropo: {{ .Values.components.reana_ui.cern_ropo | default false }}
hide_signup: {{ .Values.components.reana_ui.hide_signup | default false }}
admin_email: {{ .Values.notifications.email_config.receiver | quote | default "null" }}
{{- if not (contains "forever" (.Values.interactive_sessions.maximum_inactivity_period | quote)) }}
Expand Down
Loading