From 947c8190e698fc59baf9a996abeb1e057310394a Mon Sep 17 00:00:00 2001 From: Johannes Wicovsky <> Date: Mon, 28 Nov 2022 12:50:48 +0100 Subject: [PATCH] configure resource-quotas for all stages --- config/default/nsodev/values.yaml | 4 +--- config/default/templates/mobene-uba-export/deployment.yml | 2 -- config/default/templates/smardigo-ocr/deployment.yml | 4 ---- .../default/templates/smardigo-sepa-exporter/deployment.yml | 2 -- config/default/values.yaml | 3 +-- 5 files changed, 2 insertions(+), 13 deletions(-) diff --git a/config/default/nsodev/values.yaml b/config/default/nsodev/values.yaml index 6e76014..cc0cab4 100644 --- a/config/default/nsodev/values.yaml +++ b/config/default/nsodev/values.yaml @@ -7,6 +7,4 @@ smardigo: api_token: ZXlKbGJtTWlPaUpCTVRJNFEwSkRMVWhUTWpVMklpd2lZV3huSWpvaVpHbHlJbjAuLlJvTTBqN1BVeDZsaW1KNzdCdzZtYlEuRnBKY3lMeHFiMkt6VnJiR3B3ak9VRmMxX1JlSG52dTQ2VWJHQ2FHS1B1cy5TQUhfcnZIOG5EbGpVZDlVczNUSjF3 ocr: host: prodnso-mobene-nsodev-01-ocr.smardigo.digital - api_token: ZXlKbGJtTWlPaUpCTVRJNFEwSkRMVWhUTWpVMklpd2lZV3huSWpvaVpHbHlJbjAuLl92ajdtMXRhdlEzSnJmRmRfSmQzc0EuaFRlMmVBLWZZa21JSEFhRi1jV2tiV2xhcEs5dzVZNFJsRkx6MExMbXVnZy5lY1hoWEZfRmF6Z2RXRDZPdG1fME9B - version: 10.3.0 - with_limits: true + api_token: ZXlKbGJtTWlPaUpCTVRJNFEwSkRMVWhUTWpVMklpd2lZV3huSWpvaVpHbHlJbjAuLl92ajdtMXRhdlEzSnJmRmRfSmQzc0EuaFRlMmVBLWZZa21JSEFhRi1jV2tiV2xhcEs5dzVZNFJsRkx6MExMbXVnZy5lY1hoWEZfRmF6Z2RXRDZPdG1fME9B \ No newline at end of file diff --git a/config/default/templates/mobene-uba-export/deployment.yml b/config/default/templates/mobene-uba-export/deployment.yml index b41193c..48ee713 100644 --- a/config/default/templates/mobene-uba-export/deployment.yml +++ b/config/default/templates/mobene-uba-export/deployment.yml @@ -16,7 +16,6 @@ spec: containers: - name: "{{ .Release.Name }}-mobene-uba" image: "{{ .Values.mobene.uba.image }}:{{ .Values.mobene.uba.version }}" - {{ if .Values.smardigo.ocr.with_limits }} resources: requests: memory: "0.5Gi" @@ -24,7 +23,6 @@ spec: limits: memory: "0.5Gi" cpu: "0.25" - {{ end }} imagePullPolicy: Always env: - name: SPRING_PROFILES_INCLUDE diff --git a/config/default/templates/smardigo-ocr/deployment.yml b/config/default/templates/smardigo-ocr/deployment.yml index bdd91a4..d3e0d2e 100644 --- a/config/default/templates/smardigo-ocr/deployment.yml +++ b/config/default/templates/smardigo-ocr/deployment.yml @@ -15,7 +15,6 @@ spec: containers: - name: "{{ .Release.Name }}-smardigo-ocr-postgres" image: postgres:{{ .Values.smardigo.ocr.postgres.version }} - {{ if .Values.smardigo.ocr.with_limits }} resources: requests: memory: "0.5Gi" @@ -23,7 +22,6 @@ spec: limits: memory: "0.5Gi" cpu: "0.25" - {{ end }} imagePullPolicy: Always env: - name: POSTGRES_DB @@ -34,7 +32,6 @@ spec: value: "{{ .Values.smardigo.ocr.postgres.password }}" - name: "{{ .Release.Name }}-smardigo-ocr-backend" image: "{{ .Values.smardigo.ocr.image }}:{{ .Values.smardigo.ocr.version }}" - {{ if .Values.smardigo.ocr.with_limits }} resources: requests: memory: "1.5Gi" @@ -42,7 +39,6 @@ spec: limits: memory: "1.5Gi" cpu: "1" - {{ end }} imagePullPolicy: Always env: - name: SPRING_PROFILES_INCLUDE diff --git a/config/default/templates/smardigo-sepa-exporter/deployment.yml b/config/default/templates/smardigo-sepa-exporter/deployment.yml index 03f11a7..e27c3a4 100644 --- a/config/default/templates/smardigo-sepa-exporter/deployment.yml +++ b/config/default/templates/smardigo-sepa-exporter/deployment.yml @@ -16,7 +16,6 @@ spec: containers: - name: "{{ .Release.Name }}-smardigo-sepa-exporter" image: "{{ .Values.smardigo.sepa_exporter.image }}:{{ .Values.smardigo.sepa_exporter.version }}" - {{ if .Values.smardigo.ocr.with_limits }} resources: requests: memory: "0.5Gi" @@ -24,7 +23,6 @@ spec: limits: memory: "0.5Gi" cpu: "0.25" - {{ end }} imagePullPolicy: Always env: - name: SPRING_PROFILES_INCLUDE diff --git a/config/default/values.yaml b/config/default/values.yaml index 6f94349..c27812f 100644 --- a/config/default/values.yaml +++ b/config/default/values.yaml @@ -10,13 +10,12 @@ smardigo: version: 9.0.1 ocr: image: prodnso-harbor-01.smardigo.digital/smardigo/smardigo-ocr-app - version: 10.2.0 + version: 10.3.0 postgres: version: 14 db: ocr-postgres user: ocr-postgres-admin password: ocr-postgres-admin - with_limits: false mobene: uba: