Merge branch 'main' into conflict-fix

Author: at88mph

helm/applications/posix-mapper/values.yaml

@@ -49,7 +49,7 @@ deployment:
         memory: "1Gi"
         cpu: "500m"
       limits:
-        memory: "1500Mi"
+        memory: "1750Mi"
         cpu: "750m"
 
     minUID: 10000

helm/applications/science-portal/CHANGELOG.md

@@ -1,4 +1,8 @@
-# CHANGELOG for Science Portal UI (Chart 1.0.2)
+# CHANGELOG for Science Portal UI (Chart 1.0.3)
+
+## 2025.10.31 (1.0.3)
+- Feature: Add experimental slider feature gate
+  - Add `experimentalFeatures.slider` section to `values.yaml` to enable/disable the slider feature.
 
 ## 2025.10.27 (1.0.2)
 - Add configuration for default project to pre-select in the pull-down menu.

helm/applications/science-portal/Chart.yaml

@@ -18,7 +18,7 @@ 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.0.2
+version: 1.0.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

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

@@ -29,16 +29,16 @@ org.opencadc.science-portal.oidc.scope = {{ .scope }}
 
 org.opencadc.science-portal.tokenCache.url = redis://{{ $.Release.Name }}-redis-master.{{ $.Release.Namespace }}.svc.{{ $.Values.kubernetesClusterDomain }}:6379
 
+{{ if .Values.deployment.sciencePortal.storageHomeURL -}}
+org.opencadc.science-portal.storageXmlInfoUrl = {{ .Values.deployment.sciencePortal.storageHomeURL }}
+{{ end }}
+
 {{ with .Values.experimentalFeatures }}
-{{- with .storageHomePanel }}
 {{- if .enabled }}
-# This feature is NOT namespaced with experimental as it's grandfathered.
-org.opencadc.science-portal.storageXmlInfoUrl = {{ .url }}
-{{- end }}
-{{- end }}
 {{- with .slider }}
 {{- if .enabled }}
 org.opencadc.science-portal.experimental.slider.enabled = true
 {{- end }}
 {{- end }}
 {{- end }}
+{{- end }}

helm/applications/science-portal/values.yaml

@@ -127,14 +127,21 @@ deployment:
     # themeName: canfar
     themeName:
 
+    # 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.
+    # Example:
+    #   storageHomeURL: https://example.org/cavern/nodes/home
+    # storageHomeURL:
+
+# Experimental features that can be enabled.  These represent features that are not released and confined behind feature flags.
 experimentalFeatures:
   enabled: false
-  # Required. The absolute URL of the /home folder containing the user's home directories.  This is used to query the storage quota information.
-  # A typical value would be the /nodes/home endpoint of the Cavern service.
-  # Example:
-  #   storageHomeURL: https://example.org/cavern/nodes/home
-  # storageHomeURL:
 
+  # Enable the slider experimental feature.
+  # This feature allows users to dynamically adjust the resource limits of their jobs with a different User Interface experience.
+  slider:
+    enabled: false
+    
 # This is a list of tolerations that will be added to the Pod spec of the Science Portal UI.
 # @see https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
 #

helm/applications/skaha/Chart.yaml

@@ -21,13 +21,12 @@ 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.1
+version: 1.1.2
 
 # 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/skaha
 appVersion: "1.1.2"
 
 dependencies:

helm/applications/skaha/README.md

@@ -37,8 +37,9 @@ A Helm chart to install the Skaha web service of the CANFAR Science Platform
 | deployment.skaha.sessions.expirySeconds | string | `"345600"` |  |
 | deployment.skaha.sessions.imagePullPolicy | string | `"Always"` |  |
 | deployment.skaha.sessions.initContainerImage | string | `"redis:8.2.2-bookworm"` |  |
+| deployment.skaha.sessions.nodeLabelSelector | string | `""` | Used to identify Kubernetes Worker Nodes when querying for resources available to User Sessions. |
 | deployment.skaha.sessions.kueue | object | `{}` |  |
-| deployment.skaha.sessions.maxCount | string | `"3"` |  |
+| deployment.skaha.sessions.maxCount | string | `"5"` | Maximum number of concurrent interactive user sessions.  Does not apply to `headless` User Sessions. |
 | deployment.skaha.sessions.maxEphemeralStorage | string | `"200Gi"` |  |
 | deployment.skaha.sessions.minEphemeralStorage | string | `"20Gi"` |  |
 | deployment.skaha.sessions.persistentVolumeClaimName | string | `"skaha-workload-cavern-pvc"` |  |

helm/applications/skaha/templates/skaha-tomcat-deployment.yaml

@@ -72,6 +72,10 @@ spec:
         - name: SKAHA_HEADLESS_PRIORITY_CLASS
           value: "{{ . }}"
         {{- end }}
+        {{- with .Values.deployment.skaha.sessions.nodeLabelSelector }}
+        - name: SKAHA_WORKER_NODE_LABEL_SELECTOR
+          value: "{{ . }}"
+        {{- end }}
         {{- with .Values.deployment.skaha.sessions.kueue }}
         {{- range $queueConfigKey, $queueConfig := . }}
         - name: SKAHA_QUEUE_{{ $queueConfigKey | upper }}_NAME

helm/applications/skaha/values.yaml

@@ -15,7 +15,7 @@ skahaWorkload:
 deployment:
   hostname: myhost.example.com  # Change this!
   skaha:
-    image: images.opencadc.org/platform/skaha:1.1.2
+    image: images.opencadc.org/platform/skaha:1.1.3
     imagePullPolicy: Always
 
     # Cron string for the image caching cron job schedule. Defaults to every half hour.
@@ -103,6 +103,19 @@ deployment:
       # initContainerImage:
       initContainerImage: "redis:8.2.2-bookworm"
 
+      # Optionally set the node label selector to identify Kubernetes Worker Nodes.  This is used to accurately query for available 
+      # resources from schedulable Nodes by eliminating, for example, Nodes that are only cordoned for Web APIs.
+      # Example:
+      #   nodeLabelSelector: "node-role.kubernetes.io/node-type=worker"
+      #
+      # Example (multiple labels ANDed):
+      #   nodeLabelSelector: "node-role.kubernetes.io/node-type=worker,environment=production"
+      #
+      #
+      # Example (multiple labels ORed):
+      #   nodeLabelSelector: "node-role.kubernetes.io/node-type in (worker,worker-gpu)"
+      nodeLabelSelector:
+
       # Optionally configure the Kueue system to handle large workloads.  Configurable per session type (e.g. desktop, notebook, etc.).
       # Leaving this empty will default to submitting Jobs to the base Kubernetes system.
       # Provide a default configuration for all session types, or omit and only configure specific session types.