From 29de70f7226443fa9c17290130c3ebce977e6fac Mon Sep 17 00:00:00 2001 From: Colin Slater Date: Sun, 30 Jun 2024 22:42:42 -0500 Subject: [PATCH] Fix rapid-analysis chart when statefulset workers are not used. --- services/rapid-analysis/README.md | 8 +++++++- services/rapid-analysis/templates/gather-rollup-set.yaml | 2 ++ services/rapid-analysis/templates/gather2a-set.yaml | 2 ++ services/rapid-analysis/templates/worker-set.yaml | 2 ++ services/rapid-analysis/values.yaml | 8 +++++++- 5 files changed, 20 insertions(+), 2 deletions(-) diff --git a/services/rapid-analysis/README.md b/services/rapid-analysis/README.md index 2208f0a0..c172402a 100644 --- a/services/rapid-analysis/README.md +++ b/services/rapid-analysis/README.md @@ -13,6 +13,8 @@ A Helm chart for deploying the Rapid Analysis services. | env | object | `{}` | This section holds a set of key, value pairs for environmental variables (ENV_VAR: value). NOTE: RUN_ARG is taken care of by the chart using _script_. | | envSecrets | list | `[]` | This section holds specifications for secret injection. If this section is used, each object listed must have the following attributes defined: _name_ (The label for the secret), _secretName_ (The name of the vault store reference. Uses the _namespace_ attribute to construct the full name), _secretKey_ (The key in the vault store containing the necessary secret) | | fullnameOverride | string | `""` | Specify the deployed application name specifically. Overrides all other names. | +| gather2aSet | object | `{}` | This configures a StatefulSet used for visit-level gather processing. | +| gatherRollupSet | object | `{}` | This configures a StatefulSet used for night-summary rollup. | | image.pullPolicy | string | `"IfNotPresent"` | The policy to apply when pulling an image for deployment. | | image.repository | string | `"ts-dockerhub.lsst.org/rubintv-broadcaster"` | The Docker registry name for the container image. | | image.tag | string | `"develop"` | The tag of the container image to use. | @@ -40,8 +42,12 @@ A Helm chart for deploying the Rapid Analysis services. | redis.tolerations | list | `[]` | Toleration specifications for the redis pods | | resources | object | `{}` | This allows the specification of resources (CPU, memory) requires to run the container. | | rubinTvSecretsPath | string | `""` | | -| scripts | obj | `{}` | List of script objects to run for the broadcaster. This section MUST have the following attribute specified for each entry. _name_ (The full path for the script) The following attributes are optional _resources_ (A resource object specification) _nodeSelector_ (A node selector object specification) _tolerations_ (A list of tolerations) _affinity_ (An affinity object specification) | +| scripts | object | `{}` | List of script objects to run for the broadcaster. This section MUST have the following attribute specified for each entry. _name_ (The full path for the script) The following attributes are optional _resources_ (A resource object specification) _nodeSelector_ (A node selector object specification) _tolerations_ (A list of tolerations) _affinity_ (An affinity object specification) | | securityContext | object | `{}` | This section allows for specification of security context information. If the section is used, at least one of the following attributes must be specified. _uid_ (User id to run application as), _gid_ (Group id of the user that runs the application), _fid_ (File system context user id), | | siteTag | string | `""` | A special tag for letting the scripts know where they are running. | | tolerations | list | `[]` | This specifies the tolerations of the pod for any system taints. | | vaultPrefixPath | string | `""` | The Vault prefix path | +| workerSet | object | `{}` | This configures a StatefulSet used for single frame workers. | + +---------------------------------------------- +Autogenerated from chart metadata using [helm-docs v1.8.1](https://github.com/norwoodj/helm-docs/releases/v1.8.1) diff --git a/services/rapid-analysis/templates/gather-rollup-set.yaml b/services/rapid-analysis/templates/gather-rollup-set.yaml index eec3c68c..e0527f2f 100644 --- a/services/rapid-analysis/templates/gather-rollup-set.yaml +++ b/services/rapid-analysis/templates/gather-rollup-set.yaml @@ -1,5 +1,6 @@ {{ $_ := set $.Values "script" $.Values.gatherRollupSet }} {{ $script := $.Values.gatherRollupSet }} +{{- if .Values.name }} --- apiVersion: apps/v1 kind: StatefulSet @@ -227,3 +228,4 @@ spec: tolerations: {{- toYaml $tolerations | nindent 8 }} {{- end }} +{{- end }} diff --git a/services/rapid-analysis/templates/gather2a-set.yaml b/services/rapid-analysis/templates/gather2a-set.yaml index d87d0c46..f62be2e3 100644 --- a/services/rapid-analysis/templates/gather2a-set.yaml +++ b/services/rapid-analysis/templates/gather2a-set.yaml @@ -1,5 +1,6 @@ {{ $_ := set $.Values "script" $.Values.gather2aSet }} {{ $script := $.Values.gather2aSet }} +{{- if .Values.name }} --- apiVersion: apps/v1 kind: StatefulSet @@ -227,3 +228,4 @@ spec: tolerations: {{- toYaml $tolerations | nindent 8 }} {{- end }} +{{- end }} diff --git a/services/rapid-analysis/templates/worker-set.yaml b/services/rapid-analysis/templates/worker-set.yaml index 61df9d79..24d5f94d 100644 --- a/services/rapid-analysis/templates/worker-set.yaml +++ b/services/rapid-analysis/templates/worker-set.yaml @@ -1,5 +1,6 @@ {{ $_ := set $.Values "script" $.Values.workerSet }} {{ $script := $.Values.workerSet }} +{{- if .Values.name }} --- apiVersion: apps/v1 kind: StatefulSet @@ -227,3 +228,4 @@ spec: tolerations: {{- toYaml $tolerations | nindent 8 }} {{- end }} +{{- end }} diff --git a/services/rapid-analysis/values.yaml b/services/rapid-analysis/values.yaml index c8d8847c..7151ddc9 100644 --- a/services/rapid-analysis/values.yaml +++ b/services/rapid-analysis/values.yaml @@ -11,7 +11,7 @@ namespace: rapid-analysis siteTag: "" # -- Provide the location where the system is running. location: "" -# -- (obj) List of script objects to run for the broadcaster. +# -- List of script objects to run for the broadcaster. # This section MUST have the following attribute specified for each entry. # _name_ (The full path for the script) # The following attributes are optional @@ -90,6 +90,12 @@ affinity: {} # _gid_ (Group id of the user that runs the application), # _fid_ (File system context user id), securityContext: {} +# -- This configures a StatefulSet used for single frame workers. +workerSet: {} +# -- This configures a StatefulSet used for visit-level gather processing. +gather2aSet: {} +# -- This configures a StatefulSet used for night-summary rollup. +gatherRollupSet: {} redis: # -- This specifies whether to use redis or not. enabled: false