diff --git a/charts/app/templates/backend/templates/deployment.yaml b/charts/app/templates/backend/templates/deployment.yaml index 85b291419..0ba5618f8 100644 --- a/charts/app/templates/backend/templates/deployment.yaml +++ b/charts/app/templates/backend/templates/deployment.yaml @@ -46,9 +46,6 @@ spec: - name: FLYWAY_LOCATIONS value: "{{- if eq .Release.Namespace "c1c7ed-dev" -}}{{ .Values.global.secrets.flywayLocations.dev }}{{- else if eq .Release.Namespace "c1c7ed-test" -}}{{ .Values.global.secrets.flywayLocations.test }}{{- else if eq .Release.Namespace "c1c7ed-prod" -}}{{ .Values.global.secrets.flywayLocations.prod }}{{- else -}}filesystem:./flyway/sql{{- end }}" resources: - limits: - cpu: 200m - memory: 200Mi requests: cpu: 50m memory: 100Mi @@ -93,9 +90,6 @@ spec: periodSeconds: 30 timeoutSeconds: 5 resources: # this is optional - limits: - cpu: 450m - memory: 150Mi requests: cpu: 50m memory: 75Mi diff --git a/charts/app/templates/frontend/templates/deployment.yaml b/charts/app/templates/frontend/templates/deployment.yaml index 54b59be7a..ca0ca0b87 100644 --- a/charts/app/templates/frontend/templates/deployment.yaml +++ b/charts/app/templates/frontend/templates/deployment.yaml @@ -91,9 +91,6 @@ spec: periodSeconds: 30 timeoutSeconds: 5 resources: - limits: - cpu: 100m - memory: 150Mi requests: cpu: 30m memory: 50Mi diff --git a/charts/app/templates/webeoc/templates/deployment.yaml b/charts/app/templates/webeoc/templates/deployment.yaml index 28208045c..93a27d994 100644 --- a/charts/app/templates/webeoc/templates/deployment.yaml +++ b/charts/app/templates/webeoc/templates/deployment.yaml @@ -75,10 +75,6 @@ spec: periodSeconds: 30 timeoutSeconds: 5 resources: # this is optional - limits: - ephemeral-storage: "25Mi" - cpu: 80m - memory: 150Mi requests: ephemeral-storage: "15Mi" cpu: 40m diff --git a/charts/app/values.yaml b/charts/app/values.yaml index 073461f97..07f82aadd 100644 --- a/charts/app/values.yaml +++ b/charts/app/values.yaml @@ -101,9 +101,6 @@ backend: - prod/api-2 #-- resources specific to vault initContainer. it is optional and is an object. resources: - limits: - cpu: 50m - memory: 50Mi requests: cpu: 50m memory: 25Mi @@ -180,16 +177,10 @@ crunchy: # enable it for TEST and PROD, for PR based pipelines simply use single requests: cpu: 25m memory: 256Mi - limits: - cpu: 100m - memory: 512Mi replicaCertCopy: requests: cpu: 1m memory: 32Mi - limits: - cpu: 50m - memory: 64Mi pgBackRest: enabled: false @@ -210,16 +201,10 @@ crunchy: # enable it for TEST and PROD, for PR based pipelines simply use single requests: cpu: 1m memory: 64Mi - limits: - cpu: 50m - memory: 128Mi sidecars: requests: cpu: 1m memory: 64Mi - limits: - cpu: 50m - memory: 128Mi patroni: postgresql: @@ -238,9 +223,6 @@ crunchy: # enable it for TEST and PROD, for PR based pipelines simply use single requests: cpu: 1m memory: 64Mi - limits: - cpu: 50m - memory: 128Mi # Postgres Cluster resource values: pgmonitor: @@ -250,9 +232,6 @@ crunchy: # enable it for TEST and PROD, for PR based pipelines simply use single requests: cpu: 1m memory: 64Mi - limits: - cpu: 50m - memory: 128Mi bitnami-pg: enabled: true @@ -294,9 +273,6 @@ bitnami-pg: requests: cpu: 100m memory: 250Mi - limits: - cpu: 200m - memory: 500Mi backup: enabled: false # save quota in dev environment, see gha for override @@ -324,9 +300,6 @@ backup: failedHistoryLimit: 2 # "The number of failed jobs that will be retained" backoffLimit: 0 # "The number of attempts to try for a successful job outcome" resources: - limits: - cpu: 150m - memory: 256Mi requests: cpu: 10m memory: 128Mi @@ -339,9 +312,6 @@ nats: requests: cpu: 100m memory: 100Mi - limits: - cpu: 200m - memory: 400Mi jetstream: enabled: true fileStore: @@ -366,9 +336,6 @@ nats: requests: cpu: 100m memory: 100Mi - limits: - cpu: 200m - memory: 400Mi #-- WebEOC Container webeoc: @@ -416,9 +383,6 @@ metabase: port: 80 targetPort: 3000 resources: - limits: - cpu: 750m - memory: 1250Mi requests: cpu: 150m memory: 500Mi @@ -472,7 +436,4 @@ metabase-pg: requests: cpu: 100m memory: 250Mi - limits: - cpu: 200m - memory: 500Mi #-- End Metabase Values diff --git a/database/openshift.deploy.yml b/database/openshift.deploy.yml index 3c9497fae..718e0eea1 100644 --- a/database/openshift.deploy.yml +++ b/database/openshift.deploy.yml @@ -103,8 +103,6 @@ objects: requests: storage: ${DB_PVC_SIZE} cpu: "50m" - limits: - cpu: "100m" storageClassName: netapp-file-standard - kind: ImageStream apiVersion: v1 @@ -168,9 +166,6 @@ objects: requests: cpu: ${CPU_REQUEST} memory: ${MEMORY_REQUEST} - limits: - cpu: ${CPU_LIMIT} - memory: ${MEMORY_LIMIT} readinessProbe: exec: command: diff --git a/webeoc/src/publishers/actions-taken-publisher.service.ts b/webeoc/src/publishers/actions-taken-publisher.service.ts index 863bf9b82..cfdb751da 100644 --- a/webeoc/src/publishers/actions-taken-publisher.service.ts +++ b/webeoc/src/publishers/actions-taken-publisher.service.ts @@ -17,6 +17,7 @@ export class ActionsTakenPublisherService { private async initializeNATS() { const nc = await connect({ servers: [process.env.NATS_HOST], + waitOnFirstConnect: true, }); this.jsClient = nc.jetstream(); } diff --git a/webeoc/src/publishers/complaints-publisher.service.ts b/webeoc/src/publishers/complaints-publisher.service.ts index 028c103bb..ec81d08bc 100644 --- a/webeoc/src/publishers/complaints-publisher.service.ts +++ b/webeoc/src/publishers/complaints-publisher.service.ts @@ -16,6 +16,7 @@ export class ComplaintsPublisherService { private async initializeNATS() { const nc = await connect({ servers: [process.env.NATS_HOST], + waitOnFirstConnect: true, }); this.jsClient = nc.jetstream(); } diff --git a/webeoc/src/subscribers/actions-taken-subscriber.service.ts b/webeoc/src/subscribers/actions-taken-subscriber.service.ts index 6d990b872..d80215384 100644 --- a/webeoc/src/subscribers/actions-taken-subscriber.service.ts +++ b/webeoc/src/subscribers/actions-taken-subscriber.service.ts @@ -19,7 +19,7 @@ export class ActionsTakenSubscriberService implements OnModuleInit { async onModuleInit() { try { - this.natsConnection = await connect({ servers: process.env.NATS_HOST }); + this.natsConnection = await connect({ servers: process.env.NATS_HOST, waitOnFirstConnect: true }); this.jsm = await this.natsConnection.jetstreamManager(); await this.setupStream(); await this.subscribeToTopics(); diff --git a/webeoc/src/subscribers/complaints-subscriber.service.ts b/webeoc/src/subscribers/complaints-subscriber.service.ts index c5ddf38de..218616e3a 100644 --- a/webeoc/src/subscribers/complaints-subscriber.service.ts +++ b/webeoc/src/subscribers/complaints-subscriber.service.ts @@ -19,7 +19,7 @@ export class ComplaintsSubscriberService implements OnModuleInit { async onModuleInit() { try { - this.natsConnection = await connect({ servers: process.env.NATS_HOST }); + this.natsConnection = await connect({ servers: process.env.NATS_HOST, waitOnFirstConnect: true }); this.jsm = await this.natsConnection.jetstreamManager(); await this.setupStream(); await this.subscribeToTopics();