Skip to content
This repository has been archived by the owner on Oct 24, 2024. It is now read-only.

Commit

Permalink
auxiliary is hard to spell
Browse files Browse the repository at this point in the history
  • Loading branch information
bkiahstroud committed Feb 22, 2024
1 parent c3e3028 commit 0d23406
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
1 change: 0 additions & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ FITS_SERVLET_URL=http://fits:8080/fits
GOOD_JOB_CLEANUP_DISCARDED_JOBS=false
GOOD_JOB_CLEANUP_PRESERVED_JOBS_BEFORE_SECONDS_AGO=604800
GOOD_JOB_CLEANUP_INTERVAL_SECONDS=86400
GOOD_JOB_QUEUES=-auxiliary
INITIAL_ADMIN_EMAIL=[email protected]
INITIAL_ADMIN_PASSWORD=testing123
IN_DOCKER=true
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ services:
condition: service_started
worker:
condition: service_started
worker_auxiliary:
worker_aux:
condition: service_started
initialize_app:
condition: service_completed_successfully
Expand All @@ -236,10 +236,10 @@ services:
## breakpoints.
# command: sh -l -c "bundle && tail -f /dev/null"

worker_auxiliary:
worker_aux:
<<: *app-worker
environment:
- GOOD_JOB_QUEUES=*
- AUX_WORKER="true"

# Do not recurse through all of tmp. derivitives will make booting
# very slow and eventually just time out as data grows
Expand Down
8 changes: 4 additions & 4 deletions ops/dev-deploy.tmpl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ worker:

# When adding/removing key-value pairs to this block, ensure the
# corresponding changes are made in the `extraDeploy` block below.
workerAuxiliary:
workerAux:
extraEnvVars:
# GOOD_JOB_QUEUES gets set in bin/worker
- name: AUX_WORKER
Expand All @@ -242,7 +242,7 @@ extraDeploy:
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "hyrax.fullname" . }}-auxiliary-worker
name: {{ include "hyrax.fullname" . }}-worker-aux
labels:
{{- include "hyrax.labels" . | nindent 4 }}
spec:
Expand Down Expand Up @@ -270,7 +270,7 @@ extraDeploy:
name: {{ template "hyrax.fullname" . }}
env:
{{- toYaml .Values.worker.extraEnvVars | nindent 12 }}
{{- toYaml .Values.workerAuxiliary.extraEnvVars | nindent 12 }}
{{- toYaml .Values.workerAux.extraEnvVars | nindent 12 }}
command:
- sh
- -c
Expand Down Expand Up @@ -305,7 +305,7 @@ extraDeploy:
{{- end }}
env:
{{- toYaml .Values.worker.extraEnvVars | nindent 12 }}
{{- toYaml .Values.workerAuxiliary.extraEnvVars | nindent 12 }}
{{- toYaml .Values.workerAux.extraEnvVars | nindent 12 }}
{{- if .Values.worker.readinessProbe.enabled }}
readinessProbe:
exec:
Expand Down

0 comments on commit 0d23406

Please sign in to comment.