From 03c1daaab036b4d1f6fb4c9df2b7356324415a37 Mon Sep 17 00:00:00 2001 From: Dejan Bosanac Date: Fri, 18 Aug 2023 16:29:50 +0200 Subject: [PATCH] fix: use proper nats address and improve configuration --- chart/dev.yaml | 12 +++++++++++- chart/prod.yaml | 10 ++++++++++ chart/staging.yaml | 10 ++++++++++ .../templates/bombastic/exporter/030-Deployment.yaml | 9 ++++++++- 4 files changed, 39 insertions(+), 2 deletions(-) diff --git a/chart/dev.yaml b/chart/dev.yaml index e1b341d..86017f1 100644 --- a/chart/dev.yaml +++ b/chart/dev.yaml @@ -1,9 +1,10 @@ -release: 0.1.0-nightly.d12c5d72 +release: 0.1.0-nightly.95a7d95f domain: dev.trustification.dev replicas: 1 imagePullPolicy: IfNotPresent region: eu-west-1 enableWalkers: false +enableExporters: true spog: uiConfig: config/dev/spog-ui.yaml bombastic: @@ -77,3 +78,12 @@ oidcClients: secretKeyRef: name: oidc-client-walker key: client-secret +guac: + nats: + nats: + jetstream: + enabled: true + limits: + # change max payload from default 1MB to 640MB + maxPayload: 640MB + maxPending: 640MB \ No newline at end of file diff --git a/chart/prod.yaml b/chart/prod.yaml index 8380678..8d059f6 100644 --- a/chart/prod.yaml +++ b/chart/prod.yaml @@ -4,6 +4,7 @@ replicas: 2 imagePullPolicy: IfNotPresent region: eu-west-1 enableWalkers: false +enableExporters: false spog: uiConfig: config/prod/spog-ui.yaml bombastic: @@ -81,3 +82,12 @@ oidcClients: secretKeyRef: name: oidc-client-walker key: client-secret +guac: + nats: + nats: + jetstream: + enabled: true + limits: + # change max payload from default 1MB to 640MB + maxPayload: 640MB + maxPending: 640MB \ No newline at end of file diff --git a/chart/staging.yaml b/chart/staging.yaml index 93ec61c..c02c447 100644 --- a/chart/staging.yaml +++ b/chart/staging.yaml @@ -4,6 +4,7 @@ replicas: 1 imagePullPolicy: IfNotPresent region: eu-west-1 enableWalkers: false +enableExporters: false spog: uiConfig: config/staging/spog-ui.yaml bombastic: @@ -83,3 +84,12 @@ oidcClients: secretKeyRef: name: oidc-client-walker key: client-secret +guac: + nats: + nats: + jetstream: + enabled: true + limits: + # change max payload from default 1MB to 640MB + maxPayload: 640MB + maxPending: 640MB \ No newline at end of file diff --git a/chart/templates/bombastic/exporter/030-Deployment.yaml b/chart/templates/bombastic/exporter/030-Deployment.yaml index acbcffe..f0df5ce 100644 --- a/chart/templates/bombastic/exporter/030-Deployment.yaml +++ b/chart/templates/bombastic/exporter/030-Deployment.yaml @@ -1,3 +1,4 @@ +{{ if .Values.enableExporters }} apiVersion: apps/v1 kind: Deployment metadata: @@ -37,7 +38,7 @@ spec: - "--storage-bucket" - "{{ .Values.bombastic.bucket }}" - "--guac-url" - - "trustification-nats:4222" + - "{{ .Release.Name }}-nats:4222" - "--document-type" - "sbom" env: @@ -62,6 +63,11 @@ spec: volumeMounts: - name: data mountPath: /data + resources: + requests: + memory: "2Gi" + limits: + memory: "2Gi" livenessProbe: httpGet: path: /health/live @@ -76,3 +82,4 @@ spec: httpGet: path: /health/startup port: 9010 +{{ end }} \ No newline at end of file