Portal logo url

.release-please-manifest.json

@@ -2,7 +2,7 @@
   "helm/applications/base": "0.4.1",
   "helm/applications/cavern": "0.8.0",
   "helm/applications/posix-mapper": "0.5.0",
-  "helm/applications/science-portal": "1.0.2",
+  "helm/applications/science-portal": "1.1.2",
   "helm/applications/skaha": "1.3.3",
   "helm/applications/sshd": "1.0.1",
   "helm/applications/storage-ui": "0.7.0",

helm/applications/science-portal/Chart.yaml

@@ -18,14 +18,14 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.1.2
+version: 1.1.3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
 # renovate: image=images.opencadc.org/platform/science-portal
-appVersion: "1.2.5"
+appVersion: "1.2.6"
 
 dependencies:
   - name: "redis"

helm/applications/science-portal/README.md

@@ -30,7 +30,8 @@ A Helm chart to install the Science Portal UI
 | deployment.sciencePortal.skahaResourceID | string | `nil` |  |
 | deployment.sciencePortal.tabLabels[0] | string | `"Standard"` |  |
 | deployment.sciencePortal.tabLabels[1] | string | `"Advanced"` |  |
-| deployment.sciencePortal.themeName | string | `nil` |  |
+| deployment.sciencePortal.theme.name | string | `nil` |  |
+| deployment.sciencePortal.theme.logoURL | string | `nil` |  |
 | experimentalFeatures.enabled | bool | `false` |  |
 | experimentalFeatures.slider.enabled | bool | `false` |  |
 | kubernetesClusterDomain | string | `"cluster.local"` |  |

helm/applications/science-portal/config/org.opencadc.science-portal.properties

@@ -1,7 +1,21 @@
 org.opencadc.science-portal.sessions.resourceID = {{ .Values.deployment.sciencePortal.skahaResourceID }}
 org.opencadc.science-portal.sessions.standard = vos://cadc.nrc.ca~vospace/CADC/std/Proc#sessions-1.0
-org.opencadc.science-portal.logoURL = {{ .Values.deployment.sciencePortal.logoURL }}
-org.opencadc.science-portal.themeName = {{ .Values.deployment.sciencePortal.themeName | required "Please set the deployment.sciencePortal.themeName to either src or canfar" }}
+
+{{- if .Values.deployment.sciencePortal.theme }}
+{{- with .Values.deployment.sciencePortal.theme }}
+org.opencadc.science-portal.theme.name = {{ .name | required "Please set the deployment.sciencePortal.theme.name to either src or canfar" }}
+{{- if .logoURL }}
+org.opencadc.science-portal.theme.logoURL = {{ .logoURL }}
+{{- end }}
+{{- end }}
+{{- else }}
+{{- if .Values.deployment.sciencePortal.themeName }}
+org.opencadc.science-portal.theme.name = {{ .Values.deployment.sciencePortal.themeName }}
+{{- else }}
+{{ required "Please set the deployment.sciencePortal.theme to either src or canfar configurations." .Values.deployment.sciencePortal.themeName }}
+{{- end }}
+{{- end }}
+
 org.opencadc.science-portal.defaultProjectName = {{ .Values.deployment.sciencePortal.defaultProjectName | default "skaha" }}
 
 {{- if empty .Values.deployment.sciencePortal.tabLabels }}

helm/applications/science-portal/templates/NOTES.txt

@@ -0,0 +1,13 @@
+{{- /*
+Post-installation notes for the Science Portal
+*/ -}}
+
+Release Name: {{ .Release.Name }}
+Namespace: {{ .Release.Namespace }}
+
+Check the deployment:
+https://{{ .Values.deployment.hostname }}/science-portal
+{{ if .Values.deployment.sciencePortal.themeName }}
+Issue(s):
+- Using the .Values.deployment.sciencePortal.themeName property is deprecated and will be removed.  Please use .Values.deployment.sciencePortal.theme instead.
+{{ end }}

helm/applications/science-portal/values.yaml

@@ -122,10 +122,12 @@ deployment:
     #     defaultMode: 420
     #     secretName: science-portal-cacert-secret
 
-    # Supported theme name (src or canfar).
+    # Supported themes (src or canfar), and optionally a logo URL.
     # Example:
-    # themeName: canfar
-    themeName:
+    # theme: 
+    #   name: canfar
+    #   logoURL: https://example.org/mylogo.png
+    theme: {}
 
     # Optional.  The absolute base URL of the /home folder containing the user's home directories.  This is used to query the storage quota
     # information, and display a panel in the Portal UI.