Skip to content

Commit

Permalink
Deploy OpenEM MS-IV changes
Browse files Browse the repository at this point in the history
- backend-next: release-jobs with job support, including rabbitmq (but limited validate)
- frontend: psi-deployment-openem
- basic jobConfig.yaml (from secrets)
  • Loading branch information
sbliven committed Dec 19, 2024
1 parent 9fde49a commit a8bb39c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion frontend
Submodule frontend updated 753 files
8 changes: 4 additions & 4 deletions helm/configs/backend-next/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ secrets:
data:
.env: "{{ .Values.secretsJson.BENEXT_ENV }}"
functionalAccounts.json: "{{ .Values.secretsJson.BENEXT_FUNCTIONAL_ACCOUNTS }}"
jobConfig.json: "{{ .Values.secretsJson.BENEXT_JOBCONFIG }}"
jobConfig.yaml: "{{ .Values.secretsJson.BENEXT_JOBCONFIG }}"

ingress:
enabled: true
Expand All @@ -48,7 +48,7 @@ env:
- name: SITE
value: "PSI"
- name: JOB_CONFIGURATION_FILE
value: /home/node/app/jobConfig.json
value: /home/node/app/jobConfig.yaml

volumeMounts:
- name: secrets-volume
Expand All @@ -58,5 +58,5 @@ volumeMounts:
mountPath: /home/node/app/functionalAccounts.json
subPath: functionalAccounts.json
- name: secrets-volume
mountPath: /home/node/app/jobConfig.json
subPath: jobConfig.json
mountPath: /home/node/app/jobConfig.yaml
subPath: jobConfig.yaml
2 changes: 1 addition & 1 deletion scicat-backend-next
Submodule scicat-backend-next updated 73 files
+1 −0 .env.example
+0 −8 jobConfig.example.yaml
+70 −26 package-lock.json
+1 −1 package.json
+4 −0 src/app.module.ts
+2 −2 src/auth/auth.module.ts
+18 −1 src/casl/casl-ability.factory.spec.ts
+10 −5 src/casl/casl-ability.factory.ts
+2 −1 src/casl/casl.module.ts
+5 −2 src/common/common.module.ts
+10 −0 src/common/handlebars-helpers.ts
+14 −17 src/common/mail.service.ts
+10 −0 src/common/rabbitmq/rabbitmq.module.ts
+116 −0 src/common/rabbitmq/rabbitmq.service.ts
+3 −32 src/config/configuration.ts
+51 −0 src/config/job-config/README.md
+90 −0 src/config/job-config/actions/corejobactioncreators.module.ts
+31 −0 src/config/job-config/actions/emailaction/emailaction.interface.ts
+10 −0 src/config/job-config/actions/emailaction/emailaction.module.ts
+21 −0 src/config/job-config/actions/emailaction/emailaction.service.ts
+68 −0 src/config/job-config/actions/emailaction/emailaction.ts
+28 −0 src/config/job-config/actions/logaction/logaction.interface.ts
+8 −0 src/config/job-config/actions/logaction/logaction.module.ts
+21 −0 src/config/job-config/actions/logaction/logaction.service.ts
+47 −0 src/config/job-config/actions/logaction/logaction.ts
+29 −0 src/config/job-config/actions/rabbitmqaction/rabbitmqaction.interface.ts
+10 −0 src/config/job-config/actions/rabbitmqaction/rabbitmqaction.module.ts
+21 −0 src/config/job-config/actions/rabbitmqaction/rabbitmqaction.service.ts
+43 −0 src/config/job-config/actions/rabbitmqaction/rabbitmqaction.ts
+45 −0 src/config/job-config/actions/urlaction/urlaction.interface.ts
+8 −0 src/config/job-config/actions/urlaction/urlaction.module.ts
+20 −0 src/config/job-config/actions/urlaction/urlaction.service.ts
+83 −0 src/config/job-config/actions/urlaction/urlaction.ts
+21 −0 src/config/job-config/actions/validateaction/validateaction.interface.ts
+8 −0 src/config/job-config/actions/validateaction/validateaction.module.ts
+20 −0 src/config/job-config/actions/validateaction/validateaction.service.ts
+5 −4 src/config/job-config/actions/validateaction/validateaction.spec.ts
+31 −28 src/config/job-config/actions/validateaction/validateaction.ts
+30 −0 src/config/job-config/handlebar-utils.ts
+81 −0 src/config/job-config/jobconfig.interface.ts
+11 −0 src/config/job-config/jobconfig.module.ts
+0 −0 src/config/job-config/jobconfig.schema.ts
+132 −0 src/config/job-config/jobconfig.service.ts
+55 −0 src/config/job-config/jobconfig.spec.ts
+3 −6 src/datasets/datasets.controller.spec.ts
+3 −2 src/datasets/datasets.module.ts
+3 −8 src/elastic-search/elastic-search.module.ts
+2 −1 src/instruments/instruments.controller.spec.ts
+3 −2 src/instruments/instruments.module.ts
+0 −128 src/jobs/actions/emailaction.ts
+0 −31 src/jobs/actions/logaction.ts
+0 −106 src/jobs/actions/rabbitmqaction.ts
+0 −128 src/jobs/actions/urlaction.ts
+0 −26 src/jobs/config/jobconfig.spec.ts
+0 −272 src/jobs/config/jobconfig.ts
+19 −4 src/jobs/jobs.controller.spec.ts
+16 −18 src/jobs/jobs.controller.ts
+10 −3 src/jobs/jobs.module.ts
+3 −3 src/logbooks/logbooks.controller.spec.ts
+3 −2 src/logbooks/logbooks.module.ts
+3 −2 src/origdatablocks/origdatablocks.module.ts
+3 −3 src/policies/policies.controller.spec.ts
+3 −2 src/policies/policies.module.ts
+0 −1 src/proposals/dto/update-proposal.dto.ts
+3 −4 src/proposals/proposals.controller.spec.ts
+3 −2 src/proposals/proposals.module.ts
+3 −6 src/published-data/published-data.controller.spec.ts
+3 −2 src/published-data/published-data.module.ts
+3 −4 src/samples/samples.controller.spec.ts
+3 −2 src/samples/samples.module.ts
+3 −2 src/users/user-identities.controller.spec.ts
+3 −2 src/users/users.controller.spec.ts
+2 −2 src/users/users.module.ts

0 comments on commit a8bb39c

Please sign in to comment.