diff --git a/applications/argocd/values-usdf-rapid-analysis.yaml b/applications/argocd/values-usdf-rapid-analysis.yaml index 9e9d6ffcbe..02e3a9c6c2 100644 --- a/applications/argocd/values-usdf-rapid-analysis.yaml +++ b/applications/argocd/values-usdf-rapid-analysis.yaml @@ -27,7 +27,9 @@ argo-cd: g, ppascual@slac.stanford.edu, role:admin g, pav@slac.stanford.edu, role:admin g, reinking@slac.stanford.edu, role:admin + g, fritzm@slac.stanford.edu, role:admin g, cslater@slac.stanford.edu, role:admin + g, yusra@slac.stanford.edu, role:admin g, mfl@slac.stanford.edu, role:admin scopes: "[email]" diff --git a/applications/rapid-analysis/README.md b/applications/rapid-analysis/README.md index 06569d1293..be8aaaf2d2 100644 --- a/applications/rapid-analysis/README.md +++ b/applications/rapid-analysis/README.md @@ -8,13 +8,14 @@ A Helm chart for deploying the Rapid Analysis services. |-----|------|---------|-------------| | affinity | object | `{}` | This specifies the scheduling constraints of the pod. | | butlerSecret | object | `{}` | This section allows for specification of Butler secret information. If this section is used, it must contain the following attributes: _key_ (The vault key for the Butler secret), _containerPath_ (The directory location for the Butler secret), _dbUser_ (The username for the Butler backend database) | +| configMountpoint | list | `[]` | This section holds the information necessary to mount configmaps. If the section is used, each object listed can have the following attributes defined: _name_ (The name of the persistent volume and the configMap), _items_ (Files in the configmap to mount), | | env | object | `{"AWS_REQUEST_CHECKSUM_CALCULATION":"WHEN_REQUIRED","AWS_RESPONSE_CHECKSUM_VALIDATION":"WHEN_REQUIRED"}` | 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 | `"ghcr.io/lsst-sitcom/rubintv_production"` | The Docker registry name for the container image. | +| image.repository | string | `"ghcr.io/lsst-so/rubintv_production"` | The Docker registry name for the container image. | | image.tag | string | `"develop"` | The tag of the container image to use. | | imagePullSecrets | list | `[]` | The list of pull secrets needed for the images. If this section is used, each object listed can have the following attributes defined: _name_ (The label identifying the pull-secret to use) | | location | string | `""` | Provide the location where the system is running. | @@ -41,7 +42,6 @@ A Helm chart for deploying the Rapid Analysis services. | resources | object | `{}` | This allows the specification of resources (CPU, memory) requires to run the container. | | 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. | | squid.affinity | object | `{}` | Affinity rules for the squid pods | | squid.embargo | bool | `false` | This specifies wether the squid service needs to reach embargo or not. | | squid.enabled | bool | `false` | This specifies whether to use squid or not. | diff --git a/applications/rapid-analysis/templates/configmap-repos.yaml b/applications/rapid-analysis/templates/configmap-repos.yaml new file mode 100644 index 0000000000..5074faf632 --- /dev/null +++ b/applications/rapid-analysis/templates/configmap-repos.yaml @@ -0,0 +1,9 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: "config-repos" + labels: + {{- include "rapid-analysis.labels" . | nindent 4 }} +data: + data-repos.yaml: | + embargo: "s3://embargo@rubin-summit-users/butler.yaml" diff --git a/applications/rapid-analysis/templates/deployment.yaml b/applications/rapid-analysis/templates/deployment.yaml index 7387c49128..4890a1f067 100644 --- a/applications/rapid-analysis/templates/deployment.yaml +++ b/applications/rapid-analysis/templates/deployment.yaml @@ -45,7 +45,7 @@ spec: imagePullPolicy: {{ $.Values.image.pullPolicy }} env: - name: RUN_ARG - value: {{ $script.name }} {{ $.Values.siteTag }} + value: {{ $script.name }} {{ $.Values.location }} - name: RAPID_ANALYSIS_LOCATION value: {{ $.Values.location | upper | quote }} {{- if $script.env }} @@ -114,6 +114,15 @@ spec: {{- end }} {{- end }} {{- end }} + {{- if $.Values.configMountpoint }} + {{- range $values := $.Values.configMountpoint }} + {{- if (has $values.name $script.mounts) }} + - name: {{ $values.name }} + mountPath: {{ $values.path }} + readOnly: true + {{- end }} + {{- end }} + {{- end }} {{- if $.Values.pvcMountpointClaim }} {{- range $values := $.Values.pvcMountpointClaim }} {{- if (has $values.name $script.mounts) }} @@ -158,6 +167,16 @@ spec: {{- end }} {{- end }} {{- end }} + {{- if $.Values.configMountpoint }} + {{- range $values := $.Values.configMountpoint }} + {{- if (has $values.name $script.mounts) }} + - name: {{ $values.name }} + configMap: + name: {{ $values.name }} + items: {{ toYaml $values.items | nindent 12 }} + {{- end }} + {{- end }} + {{- end }} {{- if $.Values.pvcMountpointClaim }} {{- range $values := $.Values.pvcMountpointClaim }} {{- if (has $values.name $script.mounts) }} diff --git a/applications/rapid-analysis/templates/lsstcam-backlog-worker-set.yaml b/applications/rapid-analysis/templates/lsstcam-backlog-worker-set.yaml index 1fc29151d3..dcd8d49f17 100644 --- a/applications/rapid-analysis/templates/lsstcam-backlog-worker-set.yaml +++ b/applications/rapid-analysis/templates/lsstcam-backlog-worker-set.yaml @@ -118,6 +118,15 @@ spec: {{- end }} {{- end }} {{- end }} + {{- if $.Values.configMountpoint }} + {{- range $values := $.Values.configMountpoint }} + {{- if (has $values.name $script.mounts) }} + - name: {{ $values.name }} + mountPath: {{ $values.path }} + readOnly: true + {{- end }} + {{- end }} + {{- end }} {{- if $.Values.pvcMountpointClaim }} {{- range $values := $.Values.pvcMountpointClaim }} {{- if (has $values.name $script.mounts) }} @@ -162,6 +171,16 @@ spec: {{- end }} {{- end }} {{- end }} + {{- if $.Values.configMountpoint }} + {{- range $values := $.Values.configMountpoint }} + {{- if (has $values.name $script.mounts) }} + - name: {{ $values.name }} + configMap: + name: {{ $values.name }} + items: {{ toYaml $values.items | nindent 12 }} + {{- end }} + {{- end }} + {{- end }} {{- if $.Values.pvcMountpointClaim }} {{- range $values := $.Values.pvcMountpointClaim }} {{- if (has $values.name $script.mounts) }} diff --git a/applications/rapid-analysis/templates/lsstcam-gather-rollup-set.yaml b/applications/rapid-analysis/templates/lsstcam-gather-rollup-set.yaml index 90c9e2999b..a9ee5a0feb 100644 --- a/applications/rapid-analysis/templates/lsstcam-gather-rollup-set.yaml +++ b/applications/rapid-analysis/templates/lsstcam-gather-rollup-set.yaml @@ -118,6 +118,15 @@ spec: {{- end }} {{- end }} {{- end }} + {{- if $.Values.configMountpoint }} + {{- range $values := $.Values.configMountpoint }} + {{- if (has $values.name $script.mounts) }} + - name: {{ $values.name }} + mountPath: {{ $values.path }} + readOnly: true + {{- end }} + {{- end }} + {{- end }} {{- if $.Values.pvcMountpointClaim }} {{- range $values := $.Values.pvcMountpointClaim }} {{- if (has $values.name $script.mounts) }} @@ -162,6 +171,16 @@ spec: {{- end }} {{- end }} {{- end }} + {{- if $.Values.configMountpoint }} + {{- range $values := $.Values.configMountpoint }} + {{- if (has $values.name $script.mounts) }} + - name: {{ $values.name }} + configMap: + name: {{ $values.name }} + items: {{ toYaml $values.items | nindent 12 }} + {{- end }} + {{- end }} + {{- end }} {{- if $.Values.pvcMountpointClaim }} {{- range $values := $.Values.pvcMountpointClaim }} {{- if (has $values.name $script.mounts) }} diff --git a/applications/rapid-analysis/templates/lsstcam-gather1b-set.yaml b/applications/rapid-analysis/templates/lsstcam-gather1b-set.yaml index ef4781e6be..1cbb7f0d33 100644 --- a/applications/rapid-analysis/templates/lsstcam-gather1b-set.yaml +++ b/applications/rapid-analysis/templates/lsstcam-gather1b-set.yaml @@ -118,6 +118,15 @@ spec: {{- end }} {{- end }} {{- end }} + {{- if $.Values.configMountpoint }} + {{- range $values := $.Values.configMountpoint }} + {{- if (has $values.name $script.mounts) }} + - name: {{ $values.name }} + mountPath: {{ $values.path }} + readOnly: true + {{- end }} + {{- end }} + {{- end }} {{- if $.Values.pvcMountpointClaim }} {{- range $values := $.Values.pvcMountpointClaim }} {{- if (has $values.name $script.mounts) }} @@ -162,6 +171,16 @@ spec: {{- end }} {{- end }} {{- end }} + {{- if $.Values.configMountpoint }} + {{- range $values := $.Values.configMountpoint }} + {{- if (has $values.name $script.mounts) }} + - name: {{ $values.name }} + configMap: + name: {{ $values.name }} + items: {{ toYaml $values.items | nindent 12 }} + {{- end }} + {{- end }} + {{- end }} {{- if $.Values.pvcMountpointClaim }} {{- range $values := $.Values.pvcMountpointClaim }} {{- if (has $values.name $script.mounts) }} diff --git a/applications/rapid-analysis/templates/lsstcam-gather1bAos-set.yaml b/applications/rapid-analysis/templates/lsstcam-gather1bAos-set.yaml index 56a18dc81a..46ab6765c4 100644 --- a/applications/rapid-analysis/templates/lsstcam-gather1bAos-set.yaml +++ b/applications/rapid-analysis/templates/lsstcam-gather1bAos-set.yaml @@ -119,6 +119,15 @@ spec: {{- end }} {{- end }} {{- end }} + {{- if $.Values.configMountpoint }} + {{- range $values := $.Values.configMountpoint }} + {{- if (has $values.name $script.mounts) }} + - name: {{ $values.name }} + mountPath: {{ $values.path }} + readOnly: true + {{- end }} + {{- end }} + {{- end }} {{- if $.Values.pvcMountpointClaim }} {{- range $values := $.Values.pvcMountpointClaim }} {{- if (has $values.name $script.mounts) }} @@ -163,6 +172,16 @@ spec: {{- end }} {{- end }} {{- end }} + {{- if $.Values.configMountpoint }} + {{- range $values := $.Values.configMountpoint }} + {{- if (has $values.name $script.mounts) }} + - name: {{ $values.name }} + configMap: + name: {{ $values.name }} + items: {{ toYaml $values.items | nindent 12 }} + {{- end }} + {{- end }} + {{- end }} {{- if $.Values.pvcMountpointClaim }} {{- range $values := $.Values.pvcMountpointClaim }} {{- if (has $values.name $script.mounts) }} diff --git a/applications/rapid-analysis/templates/lsstcam-worker-set.yaml b/applications/rapid-analysis/templates/lsstcam-worker-set.yaml index ff3ec93176..d09f00f3b0 100644 --- a/applications/rapid-analysis/templates/lsstcam-worker-set.yaml +++ b/applications/rapid-analysis/templates/lsstcam-worker-set.yaml @@ -118,6 +118,15 @@ spec: {{- end }} {{- end }} {{- end }} + {{- if $.Values.configMountpoint }} + {{- range $values := $.Values.configMountpoint }} + {{- if (has $values.name $script.mounts) }} + - name: {{ $values.name }} + mountPath: {{ $values.path }} + readOnly: true + {{- end }} + {{- end }} + {{- end }} {{- if $.Values.pvcMountpointClaim }} {{- range $values := $.Values.pvcMountpointClaim }} {{- if (has $values.name $script.mounts) }} @@ -162,6 +171,16 @@ spec: {{- end }} {{- end }} {{- end }} + {{- if $.Values.configMountpoint }} + {{- range $values := $.Values.configMountpoint }} + {{- if (has $values.name $script.mounts) }} + - name: {{ $values.name }} + configMap: + name: {{ $values.name }} + items: {{ toYaml $values.items | nindent 12 }} + {{- end }} + {{- end }} + {{- end }} {{- if $.Values.pvcMountpointClaim }} {{- range $values := $.Values.pvcMountpointClaim }} {{- if (has $values.name $script.mounts) }} diff --git a/applications/rapid-analysis/templates/lsstcam-workerAos-set.yaml b/applications/rapid-analysis/templates/lsstcam-workerAos-set.yaml index 741c5468b7..453a02b6c3 100644 --- a/applications/rapid-analysis/templates/lsstcam-workerAos-set.yaml +++ b/applications/rapid-analysis/templates/lsstcam-workerAos-set.yaml @@ -118,6 +118,15 @@ spec: {{- end }} {{- end }} {{- end }} + {{- if $.Values.configMountpoint }} + {{- range $values := $.Values.configMountpoint }} + {{- if (has $values.name $script.mounts) }} + - name: {{ $values.name }} + mountPath: {{ $values.path }} + readOnly: true + {{- end }} + {{- end }} + {{- end }} {{- if $.Values.pvcMountpointClaim }} {{- range $values := $.Values.pvcMountpointClaim }} {{- if (has $values.name $script.mounts) }} @@ -162,6 +171,16 @@ spec: {{- end }} {{- end }} {{- end }} + {{- if $.Values.configMountpoint }} + {{- range $values := $.Values.configMountpoint }} + {{- if (has $values.name $script.mounts) }} + - name: {{ $values.name }} + configMap: + name: {{ $values.name }} + items: {{ toYaml $values.items | nindent 12 }} + {{- end }} + {{- end }} + {{- end }} {{- if $.Values.pvcMountpointClaim }} {{- range $values := $.Values.pvcMountpointClaim }} {{- if (has $values.name $script.mounts) }} diff --git a/applications/rapid-analysis/templates/squid-pvc.yaml b/applications/rapid-analysis/templates/squid-pvc.yaml index 06adcc3c1e..e0d1cc53d8 100644 --- a/applications/rapid-analysis/templates/squid-pvc.yaml +++ b/applications/rapid-analysis/templates/squid-pvc.yaml @@ -1,4 +1,4 @@ ---- +{{- if .Values.squid.enabled }} apiVersion: v1 kind: PersistentVolumeClaim metadata: @@ -9,4 +9,5 @@ spec: resources: requests: storage: 1Gi - storageClassName: rook-ceph-block \ No newline at end of file + storageClassName: rook-ceph-block +{{- end }} diff --git a/applications/rapid-analysis/templates/vault-secret.yaml b/applications/rapid-analysis/templates/vault-secret.yaml index a841489c51..6a13bde356 100644 --- a/applications/rapid-analysis/templates/vault-secret.yaml +++ b/applications/rapid-analysis/templates/vault-secret.yaml @@ -1,3 +1,4 @@ +{{- if $.Values.pullSecretsPath }} --- apiVersion: ricoberger.de/v1alpha1 kind: VaultSecret @@ -9,6 +10,7 @@ metadata: spec: path: {{ required "vaultSecretsPath must be set" .Values.global.vaultSecretsPath }}/{{ required "pullSecretsPath must be set" .Values.pullSecretsPath }} type: kubernetes.io/dockerconfigjson +{{- end }} --- apiVersion: ricoberger.de/v1alpha1 kind: VaultSecret diff --git a/applications/rapid-analysis/values-base.yaml b/applications/rapid-analysis/values-base.yaml index a7032d8ec2..1d1c429eeb 100644 --- a/applications/rapid-analysis/values-base.yaml +++ b/applications/rapid-analysis/values-base.yaml @@ -1,9 +1,8 @@ image: - repository: ghcr.io/lsst-sitcom/rubintv_production + repository: ghcr.io/lsst-so/rubintv_production tag: w_2025_48 pullPolicy: Always location: BTS -siteTag: bts env: DAF_BUTLER_REPOSITORY_INDEX: /project/data-repos.yaml DEPLOY_BRANCH: deploy-bts diff --git a/applications/rapid-analysis/values-summit.yaml b/applications/rapid-analysis/values-summit.yaml index f469411747..84c61ecdbf 100644 --- a/applications/rapid-analysis/values-summit.yaml +++ b/applications/rapid-analysis/values-summit.yaml @@ -1,9 +1,8 @@ image: - repository: ghcr.io/lsst-sitcom/rubintv_production + repository: ghcr.io/lsst-so/rubintv_production tag: w_2025_48 pullPolicy: Always location: SUMMIT -siteTag: summit env: DAF_BUTLER_REPOSITORY_INDEX: /project/data-repos.yaml DEPLOY_BRANCH: deploy-summit diff --git a/applications/rapid-analysis/values-tucson-teststand.yaml b/applications/rapid-analysis/values-tucson-teststand.yaml index 3f84217b6f..9bf5034f24 100644 --- a/applications/rapid-analysis/values-tucson-teststand.yaml +++ b/applications/rapid-analysis/values-tucson-teststand.yaml @@ -3,7 +3,6 @@ image: tag: c0039 pullPolicy: Always location: TTS -siteTag: tts env: DAF_BUTLER_REPOSITORY_INDEX: /project/data-repos.yaml DEPLOY_BRANCH: deploy-tts diff --git a/applications/rapid-analysis/values-usdf-rapid-analysis.yaml b/applications/rapid-analysis/values-usdf-rapid-analysis.yaml new file mode 100644 index 0000000000..da86d8e77f --- /dev/null +++ b/applications/rapid-analysis/values-usdf-rapid-analysis.yaml @@ -0,0 +1,228 @@ +image: + repository: ghcr.io/lsst-so/rubintv_production + tag: tickets-DM-50534-w48 + pullPolicy: IfNotPresent +location: USDF +env: + DAF_BUTLER_REPOSITORY_INDEX: /config/data-repos.yaml + DAF_BUTLER_CONFIG_PATH: /repos/drp_pipe/bps/compression/LSSTCam/nightly-validation/config + http_proxy: http://sdfproxy.sdf.slac.stanford.edu:3128 + https_proxy: http://sdfproxy.sdf.slac.stanford.edu:3128 + squid_proxy: http://sdfproxy.sdf.slac.stanford.edu:3128 + no_proxy: .slac.stanford.edu + HTTP_PROXY: http://sdfproxy.sdf.slac.stanford.edu:3128 + HTTPS_PROXY: http://sdfproxy.sdf.slac.stanford.edu:3128 + SQUID_PROXY: http://sdfproxy.sdf.slac.stanford.edu:3128 + NO_PROXY: .slac.stanford.edu + DEPLOY_BRANCH: deploy-usdf + S3_ENDPOINT_URL: https://s3dfrgw.slac.stanford.edu + SASQUATCH_EXTRAS: dataset_tag=LSSTCam/rapid_analysis + LSST_RESOURCES_S3_PROFILE_embargo: https://sdfembs3.sdf.slac.stanford.edu + AWS_REQUEST_CHECKSUM_CALCULATION: WHEN_REQUIRED + AWS_RESPONSE_CHECKSUM_VALIDATION: WHEN_REQUIRED + HOME: /home/saluser + RA_PULL_DIRECTORIES: "drp_pipe" + TARTS_DATA_DIR: /sdf/scratch/rubin/rapid-analysis/aos_data/TARTS +podAnnotations: + edu.stanford.slac.sdf.project/usdf-embargo: "true" +affinity: + nodeAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + nodeSelectorTerms: + - matchExpressions: + - key: node-role.kubernetes.io/rapid-analysis + operator: Exists +securityContext: + uid: 17951 + gid: 4085 +scripts: +### +### LSSTCam pods +### +- name: LSSTCam/runButlerWatcher.py + mounts: + - sdf-scratch + - config-repos +- name: LSSTCam/runHeadNode.py + mounts: + - sdf-scratch + - config-repos +- name: LSSTCam/runMetadataServer.py + mounts: + - sdf-scratch + - config-repos +- name: LSSTCam/runOneOffExpRecord.py + mounts: + - sdf-scratch + - config-repos +- name: LSSTCam/runOneOffPostIsr.py + mounts: + - sdf-scratch + - config-repos +- name: LSSTCam/runOneOffVisitImage.py + mounts: + - sdf-scratch + - config-repos + resources: + requests: + cpu: 1 + memory: 6G + limits: + cpu: 1 + memory: 8G +- name: LSSTCam/runMetadataServerRaPerformance.py + mounts: + - sdf-scratch + - config-repos +- name: LSSTCam/runPerformanceMonitor.py + mounts: + - sdf-scratch + - config-repos + resources: + requests: + cpu: 1 + memory: 6G + limits: + cpu: 1 + memory: 8G +- name: LSSTCam/runFWHMPlotting.py + mounts: + - sdf-scratch + resources: + requests: + cpu: 1 + memory: 4G + limits: + cpu: 1 + memory: 6G +- name: LSSTCam/runPlotter.py + mounts: + - sdf-scratch + - config-repos + resources: + requests: + cpu: 1 + memory: 8G + limits: + cpu: 1 + memory: 12G +- name: LSSTCam/runButlerCanary.py + mounts: + - sdf-scratch + - config-repos + env: + DAF_BUTLER_CACHE_EXPIRATION_MODE: disabled +- name: LSSTCam/runTransferAlarm.py + image: + pullPolicy: IfNotPresent + mounts: + - sdf-scratch + - config-repos +### +### LSSTCam StatefulSets +### +lsstcamWorkerSet: + name: LSSTCam/runSfmRunner.py + replicas: 820 + mounts: + - sdf-scratch + - config-repos + resources: + requests: + cpu: 1.0 + memory: 4G + limits: + cpu: 1.0 + memory: 8G +lsstcamGather1bSet: + name: LSSTCam/runStep1bWorker.py + mounts: + - sdf-scratch + - config-repos + replicas: 5 + resources: + requests: + cpu: 1.0 + memory: "8G" + limits: + cpu: 1.0 + memory: "12G" +lsstcamAosWorkerSet: + name: LSSTCam/runAosWorker.py + mounts: + - sdf-scratch + - config-repos + replicas: 36 + env: + LIMITS_CPU: 2 + resources: + requests: + cpu: 1.0 + memory: 4G + limits: + cpu: 2.0 + memory: 8G +lsstcamGather1bAosSet: + name: LSSTCam/runStep1bAosWorker.py + mounts: + - sdf-scratch + - config-repos + replicas: 4 + resources: + requests: + cpu: 1.0 + memory: "4G" + limits: + cpu: 1.0 + memory: "8G" +vaultPrefixPath: secret/rubin/usdf-rapid-analysis +butlerSecret: + key: butler-secret + containerPath: /secrets + dbUser: rapid_analysis +pvcMountpointClaim: +- name: sdf-group-rubin + containerPath: /sdf/group/rubin + claimSize: 1Gi + accessMode: ReadWriteMany +- name: sdf-data-rubin + containerPath: /sdf/data/rubin + claimSize: 1Gi + accessMode: ReadWriteMany +- name: sdf-scratch + containerPath: /sdf/scratch + claimSize: 1Gi + accessMode: ReadWriteMany +configMountpoint: +- name: config-repos + path: "/config" + items: + - key: "data-repos.yaml" + path: "data-repos.yaml" +resources: + requests: + cpu: 0.5 + memory: 1G + limits: + cpu: 1.0 + memory: 2.5G +redis: + enabled: true + port: 6379 + env: + MASTER: true + serviceAnnotations: + metallb.universe.tf/address-pool: sdf-services + envSecrets: + - name: REDIS_PASSWORD + secretName: rapid-analysis-secrets + secretKey: redis-password + storage: + request: 10Gi + resources: + requests: + cpu: 100m + memory: 1Gi + limits: + cpu: 1 + memory: 50Gi diff --git a/applications/rapid-analysis/values.yaml b/applications/rapid-analysis/values.yaml index cf2fcbd874..24fb90b651 100644 --- a/applications/rapid-analysis/values.yaml +++ b/applications/rapid-analysis/values.yaml @@ -1,14 +1,12 @@ image: # -- The Docker registry name for the container image. - repository: ghcr.io/lsst-sitcom/rubintv_production + repository: ghcr.io/lsst-so/rubintv_production # -- The tag of the container image to use. tag: develop # -- The policy to apply when pulling an image for deployment. pullPolicy: IfNotPresent # -- This is the namespace where the applications will be deployed. namespace: rapid-analysis -# -- A special tag for letting the scripts know where they are running. -siteTag: "" # -- Provide the location where the system is running. location: "" # -- List of script objects to run for the broadcaster. @@ -66,6 +64,11 @@ pvcMountpoint: [] # _containerPath_ (The path inside the container to mount), # _subPath_ (persistent volume subpath, optional) pvcMountpointClaim: [] +# -- This section holds the information necessary to mount configmaps. +# If the section is used, each object listed can have the following attributes defined: +# _name_ (The name of the persistent volume and the configMap), +# _items_ (Files in the configmap to mount), +configMountpoint: [] # -- Adds an extra string to the release name. nameOverride: "" # -- Specify the deployed application name specifically. Overrides all other names. diff --git a/environments/values-usdf-rapid-analysis.yaml b/environments/values-usdf-rapid-analysis.yaml index 30f0f0c1bf..f60204e2b7 100644 --- a/environments/values-usdf-rapid-analysis.yaml +++ b/environments/values-usdf-rapid-analysis.yaml @@ -8,7 +8,6 @@ applications: # This environment uses an ingress managed in a separate Kubernetes cluster, # despite that configuration not being officially supported by Phalanx. cert-manager: false + gafaelfawr: false ingress-nginx: false - gafaelfawr: true - - postgres: true + rapid-analysis: true