Skip to content

Commit e8c02c0

Browse files
committed
fix: add redis updates for cve fix and skaha limit range object
1 parent 60dd99c commit e8c02c0

File tree

6 files changed

+33
-7
lines changed

6 files changed

+33
-7
lines changed

helm/applications/science-portal/values.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,9 @@ tolerations: []
139139

140140
# For the token caching
141141
redis:
142+
image:
143+
repository: redis
144+
tag: 8.2.2-bookworm
142145
architecture: 'standalone'
143146
auth:
144147
enabled: false

helm/applications/skaha/templates/NOTES.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,10 @@ If user Jobs remain Pending:
3131
- Ensure LocalQueue exists in {{ .Values.skahaWorkload.namespace }} and references your configured ClusterQueue.
3232
- Verify ClusterQueue quotas are sufficient.
3333
- Confirm priority classes referenced by sessions exist or are created.
34+
35+
Experimental Features Configured:
36+
{{- if and .Values.experimentalFeatures .Values.experimentalFeatures.enabled }}
37+
{{ include "skaha.experimentalFeatureGates" $ }}
38+
{{- else }}
39+
None
40+
{{- end }}

helm/applications/skaha/templates/_helpers.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ The init containers for the launch scripts.
120120
drop:
121121
- ALL
122122
- name: init-users-groups
123-
image: {{ $.Values.deployment.skaha.sessions.initContainerImage | default "redis:7.4.2-alpine3.21" }}
123+
image: {{ $.Values.deployment.skaha.sessions.initContainerImage | default "redis:8.2.2-bookworm" }}
124124
command: ["/init-users-groups/init-users-groups.sh"]
125125
env:
126126
- name: HOME

helm/applications/skaha/templates/limit-range.yaml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,18 @@ spec:
1212
{{- with .limitSpec }}
1313
limits:
1414
- type: Container
15-
{{ . | toYaml | indent 6 }}
15+
{{- if .max }}
16+
max:
17+
{{ toYaml .max | indent 8 }}
18+
{{- end }}
19+
{{- if .default }}
20+
default:
21+
{{ toYaml .default | indent 8 }}
22+
{{- end }}
23+
{{- if .defaultRequest }}
24+
defaultRequest:
25+
{{ toYaml .defaultRequest | indent 8 }}
26+
{{- end }}
1627
{{- end }}
1728
---
1829
apiVersion: rbac.authorization.k8s.io/v1

helm/applications/skaha/values.yaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,11 @@ deployment:
9797
imagePullPolicy: Always
9898

9999
# Optionally configure the initContainer image for Redis. Useful for those not able to reach docker.io
100-
# Defaults to redis-7.4.2-alpine3.21.
100+
# Defaults to redis:8.2.2-bookworm.
101101
# Example:
102102
# initContainerImage: "private-image-repo/project/my-own-redis:1.0"
103103
# initContainerImage:
104+
initContainerImage: "redis:8.2.2-bookworm"
104105

105106
# Optionally configure the Kueue system to handle large workloads. Configurable per session type (e.g. desktop, notebook, etc.).
106107
# Leaving this empty will default to submitting Jobs to the base Kubernetes system.
@@ -289,6 +290,8 @@ experimentalFeatures:
289290

290291
# YAML to pass to a LimitRange object called "{{ .Release.Name }}-session-limit-range" in the workload Namespace to define the resource limits.
291292
# These limits will be applied to Container objects (User Sessions).
293+
# **NOTE**: This requires the experimentalFeatures.enabled to be true as well as the sessionLimitRange.enabled to be true.
294+
# **NOTE**: The min clause is ignored due to hard-coded resources for Desktop and Firefly sessions. The `defaultRequest` is used instead for these session types.
292295
# See https://kubernetes.io/docs/concepts/policy/limit-range/
293296
#
294297
# Example:
@@ -299,10 +302,6 @@ experimentalFeatures:
299302
# memory: "96Gi"
300303
# cpu: "12"
301304
# "nvidia.com/gpu": "4"
302-
# min:
303-
# memory: "1Gi"
304-
# cpu: "1"
305-
# "nvidia.com/gpu": "0"
306305
# default: # actually refers to default limit
307306
# memory: "32Gi"
308307
# cpu: "8"
@@ -330,6 +329,9 @@ storage:
330329

331330
# For caching images from the Image Repository and for the writing the POSIX Users and Groups to be shared with Job files
332331
redis:
332+
image:
333+
repository: redis
334+
tag: 8.2.2-bookworm
333335
architecture: 'standalone'
334336
auth:
335337
enabled: false

helm/applications/storage-ui/values.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,9 @@ tolerations: []
140140

141141
# For the token caching
142142
redis:
143+
image:
144+
repository: redis
145+
tag: 8.2.2-bookworm
143146
architecture: 'standalone'
144147
auth:
145148
enabled: false

0 commit comments

Comments
 (0)