Skip to content

chore: simplify ui config for openshift #4065

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

Merged
olevski merged 6 commits into from
Jul 2, 2025
Merged

chore: simplify ui config for openshift #4065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
523ace9
chore: create release 2.3.0
RenkuBot Jun 18, 2025
a8eced5
chore: simplify ui config for openshift
olevski Jun 25, 2025
9d15e1f
squashme: minor fix
olevski Jun 30, 2025
8d7f5b2
Merge branch 'release-2.3.0' into ui-openshift-changes
olevski Jun 30, 2025
9fc7613
squashme: minor fix
olevski Jun 30, 2025
6a0415b
Merge branch 'release-2.3.0' into ui-openshift-changes
olevski Jul 2, 2025
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
45 changes: 0 additions & 45 deletions helm-chart/renku/templates/ui/ui-client-configmap.yaml
View file
Open in desktop

This file was deleted.

40 changes: 6 additions & 34 deletions helm-chart/renku/templates/ui/ui-client-deployment-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,26 +25,6 @@ spec:
app: ui
release: {{ .Release.Name }}
spec:
{{- if .Values.ui.client.privacy.page.enabled }}
volumes:
- name: privacy
configMap:
name: {{ printf "%s-privacy-and-terms" (include "renku.fullname" .) | quote }}
items:
{{- if .Values.ui.client.privacy.page.privacyPolicyContent }}
- key: "privacy_statement"
{{- else }}
- key: "sample_privacy_statement"
{{- end }}
path: statement.md
{{- if .Values.ui.client.privacy.page.termsContent }}
- key: "terms"
{{- else }}
- key: "sample_terms"
{{- end }}
path: terms.md

{{- end }}
automountServiceAccountToken: {{ .Values.global.debug }}
containers:
- name: {{ .Chart.Name }}
Expand All @@ -54,11 +34,6 @@ spec:
- name: http
containerPort: 8080
protocol: TCP
{{- if .Values.ui.client.privacy.page.enabled }}
volumeMounts:
- mountPath: /config-privacy
name: privacy
{{- end }}
env:
- name: BASE_URL
value: {{ (include "renku.baseUrl" .) | quote }}
Expand Down Expand Up @@ -90,17 +65,14 @@ spec:
value: {{ .Values.ui.client.privacy.banner.enabled | quote }}
- name: TERMS_PAGES_ENABLED
value: {{ .Values.ui.client.privacy.page.enabled | quote }}
{{- if .Values.ui.client.privacy.banner.enabled }}
- name: TERMS_CONTENT
value: {{ .Values.ui.client.privacy.page.termsContent | default "" | quote }}
- name: PRIVACY_CONTENT
value: {{ .Values.ui.client.privacy.page.privacyPolicyContent | default "" | quote }}
- name: PRIVACY_BANNER_CONTENT
value: {{ .Values.ui.client.privacy.banner.content | default (printf "") | b64enc | quote }}
value: {{ .Values.ui.client.privacy.banner.content | default "" | b64enc | quote }}
- name: PRIVACY_BANNER_LAYOUT
value: {{ toJson .Values.ui.client.privacy.banner.layout | default (printf "") | quote }}
{{ else }}
- name: PRIVACY_BANNER_CONTENT
value: ""
- name: PRIVACY_BANNER_LAYOUT
value: "{}"
{{- end }}
value: {{ toJson .Values.ui.client.privacy.banner.layout | default "{}" | quote }}
- name: TEMPLATES
value: {{ toJson .Values.ui.client.templates | quote }}
- name: PREVIEW_THRESHOLD
Expand Down
1 change: 0 additions & 1 deletion helm-chart/renku/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,6 @@ ui:
privacy:
# If you want to enable the Privacy Policy and Terms of Service pages, you shoud add your custom content
# in privacyPolicyContent and termsContent. Markdown is supported.
# As a reference, you can use the "ui-client-configmap" configMap content in the "sample" sections.
page:
enabled: false
#privacyPolicyContent: ""
Expand Down