Skip to content

Commit

Permalink
Merge pull request #750 from at88mph/storage-ui-config-update
Browse files Browse the repository at this point in the history
Storage UI config update
  • Loading branch information
shinybrar authored Dec 4, 2024
2 parents d7f2eb8 + 1263d85 commit 7535168
Show file tree
Hide file tree
Showing 9 changed files with 35 additions and 13 deletions.
7 changes: 7 additions & 0 deletions deployment/helm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -482,6 +482,13 @@ deployment:
# canfar: The CANFAR theme for internal CADC deployment
# themeName: {src | canfar}

# Labels on the tabs
# Default:
# tabLabels:
# - Public
# - Advanced
# tabLabels: []

# Other data to be included in the main ConfigMap of this deployment.
# Of note, files that end in .key are special and base64 decoded.
#
Expand Down
6 changes: 5 additions & 1 deletion deployment/helm/science-portal/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
# CHANGELOG for Science Portal UI (Chart 0.2.8)
# CHANGELOG for Science Portal UI (Chart 0.4.0)

## 2024.12.04 (0.4.0)
- Select by project enabled to constrain images in pull-down menu
- Add Advanced tab to enable proprietary image support

## 2024.09.05 (0.2.11)
- Fix screen blanking when image selection not yet loaded
Expand Down
4 changes: 2 additions & 2 deletions deployment/helm/science-portal/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ 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: 0.3.1
version: 0.4.0

# 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.
appVersion: "0.3.1"
appVersion: "0.5.3"

dependencies:
- name: "redis"
Expand Down
2 changes: 1 addition & 1 deletion deployment/helm/science-portal/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ skaha:
deployment:
hostname: example.host.com # Change this!
sciencePortal:
image: images.opencadc.org/platform/science-portal:0.3.1
image: images.opencadc.org/platform/science-portal:0.5.3
imagePullPolicy: Always

tabLabels:
Expand Down
6 changes: 5 additions & 1 deletion deployment/helm/storage-ui/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
# Storage User Interface Helm Chart (0.1.7)
# Storage User Interface Helm Chart (0.3.0)

## December 3, 2024 (0.3.0)
* Add batch download options
* Small optimizations and fixes

## June 24, 2024 (0.2.3)
* Fix to use tokens for APIs on a different host.
Expand Down
4 changes: 2 additions & 2 deletions deployment/helm/storage-ui/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ 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: 0.2.5
version: 0.3.0

# 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.
appVersion: "1.1.8"
appVersion: "1.2.1"

dependencies:
- name: "redis"
Expand Down
1 change: 1 addition & 0 deletions deployment/helm/storage-ui/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ deployment:
batchUpload: false
externalLinks: false
paging: false
directDownload: false

# Specify the SRC theme.
themeName: src
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,15 @@ org.opencadc.vosui.{{ $name }}.user.home = {{ $nameConfig.userHomeDir }}
# Features for this service.
# batchDownload: true/false - Whether the batch downloadManager service is available for batch downloads.
# batchUpload: true/false - Whether the batch downloadManager service is available for batch downloads.
# externalLinks: false - Whether this service supports creating hyperlinks (external to the system), such as http(s) links or ftp links. File systems do not support this.
# paging: false - Whether this VOSpace service supports the limit=<int> and startURI=<uri> features.
# externalLinks: true/false - Whether this service supports creating hyperlinks (external to the system), such as http(s) links or ftp links. File systems do not support this.
# paging: true/false - Whether this VOSpace service supports the limit=<int> and startURI=<uri> features.
# directDownload: true/false - Optional as to whether downloads directly from the VOSpace backend are supported to optimize a redirect from the browser, rather than proxying it. Default is false.
{{- with $nameConfig.features }}
org.opencadc.vosui.{{ $name }}.service.features.batchDownload = {{ required "The service.features.batchDownload flag is required." .batchDownload }}
org.opencadc.vosui.{{ $name }}.service.features.batchUpload = {{ required "The service.features.batchUpload flag is required." .batchUpload }}
org.opencadc.vosui.{{ $name }}.service.features.externalLinks = {{ required "The service.features.externalLinks flag is required." .externalLinks }}
org.opencadc.vosui.{{ $name }}.service.features.paging = {{ required "The service.features.paging flag is required." .paging }}
org.opencadc.vosui.{{ $name }}.service.features.directDownload = {{ default false .directDownload }}
{{- end }}
{{ end }}

Expand Down
12 changes: 8 additions & 4 deletions deployment/helm/storage-ui/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ skaha:
deployment:
hostname: example.host.com # Change this!
storageUI:
image: images.opencadc.org/client/storage-ui:1.1.8
image: images.opencadc.org/client/storage-ui:1.2.1
imagePullPolicy: Always

# Optionally set the DEBUG port.
Expand Down Expand Up @@ -52,9 +52,10 @@ deployment:
# batchUpload: false
# externalLinks: false
# paging: false
# directDownload: false

# ID (URI) of the GMS Service.
gmsID: ivo://skao.int/gms
# gmsID: ivo://example.org/gms

# OIDC (IAM) server configuration. These are required
# oidc:
Expand Down Expand Up @@ -97,8 +98,11 @@ deployment:
# defaultMode: 420
# secretName: storage-ui-cacert-secret

# Default theme is the SRC one.
themeName: src
# Theme to use for presentation layer.
# Values are:
# - src (SRCNet)
# - canfar (CANFAR)
# themeName: src

# secrets:
# Uncomment to enable local or self-signed CA certificates for your domain to be trusted.
Expand Down

0 comments on commit 7535168

Please sign in to comment.