From d5e649e909aa61d92dcfc0b531c3df197d1ce616 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=BChl?= Date: Thu, 12 May 2022 08:49:49 +0200 Subject: [PATCH 1/5] MOB-76 added smardigo-sepaexporter app --- config/default/cusqa/values.yaml | 5 ++ config/default/nsodev/values.yaml | 5 ++ .../smardigo-sepa-exporter/deployment.yml | 52 +++++++++++++++++++ .../smardigo-sepa-exporter/secret.yml | 7 +++ .../smardigo-sepa-exporter/service.yml | 17 ++++++ config/default/values.yaml | 5 ++ 6 files changed, 91 insertions(+) create mode 100644 config/default/templates/smardigo-sepa-exporter/deployment.yml create mode 100644 config/default/templates/smardigo-sepa-exporter/secret.yml create mode 100644 config/default/templates/smardigo-sepa-exporter/service.yml diff --git a/config/default/cusqa/values.yaml b/config/default/cusqa/values.yaml index 9b6b355..369000c 100644 --- a/config/default/cusqa/values.yaml +++ b/config/default/cusqa/values.yaml @@ -10,3 +10,8 @@ mobene: uba: image: prodnso-harbor-01.smardigo.digital/smardigo/mobene-uba-export-app version: 1.0.1 + +smardigo: + sepa_exporter: + image: dev-harbor-01.smardigo.digital/smardigo/smardigo-sepa-exporter-app + version: latest \ No newline at end of file diff --git a/config/default/nsodev/values.yaml b/config/default/nsodev/values.yaml index f49ac7f..9b967b8 100644 --- a/config/default/nsodev/values.yaml +++ b/config/default/nsodev/values.yaml @@ -10,3 +10,8 @@ mobene: uba: image: prodnso-harbor-01.smardigo.digital/smardigo/mobene-uba-export-app version: 1.0.1 + +smardigo: + sepa_exporter: + image: dev-harbor-01.smardigo.digital/smardigo/smardigo-sepa-exporter-app + version: latest diff --git a/config/default/templates/smardigo-sepa-exporter/deployment.yml b/config/default/templates/smardigo-sepa-exporter/deployment.yml new file mode 100644 index 0000000..083fb8e --- /dev/null +++ b/config/default/templates/smardigo-sepa-exporter/deployment.yml @@ -0,0 +1,52 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "{{ .Release.Name }}-smardigo-sepa-exporter" +spec: + replicas: 1 + selector: + matchLabels: + app: "{{ .Release.Name }}-smardigo-sepa-exporter" + template: + metadata: + labels: + app: "{{ .Release.Name }}-smardigo-sepa-exporter" + spec: + spec: + containers: + - name: "{{ .Release.Name }}-smardigo-sepa-exporter" + image: "{{ .Values.smardigo.sepa_exporter.image }}:{{ .Values.smardigo.sepa_exporter.version }}" + imagePullPolicy: Always + env: + - name: SPRING_PROFILES_INCLUDE + value: "prod,swagger" + - name: EXTERNAL_TASK_SEPA_EXPORT_MAX_RETRIES + value: "5" + - name: SMA_EXTERNAL_TASK_SCHEDULE_INTERVAL + value: "30000" + - name: SMA_WORKFLOW_REST_BASE_PATH + value: "{{ .Values.smardigo.workflow.host }}" + - name: SMA_WORKFLOW_REST_CONNECT_TIMEOUT + value: "3000" + - name: SMA_WORKFLOW_REST_READ_TIMEOUT + value: "10000" + - name: SMA_WORKFLOW_REST_AUTH_TOKEN + valueFrom: + secretKeyRef: + name: "{{ .Release.Name }}-smardigo-sepa-exporter-secrets" + key: SMA_WORKFLOW_AUTH_TOKEN + - name: SMA_DOCUMENT_REST_BASE_PATH + value: "{{ .Values.smardigo.document.host }}" + - name: SMA_DOCUMENT_REST_CONNECT_TIMEOUT + value: "3000" + - name: SMA_DOCUMENT_REST_READ_TIMEOUT + value: "10000" + - name: SMA_DOCUMENT_REST_AUTH_TOKEN + valueFrom: + secretKeyRef: + name: "{{ .Release.Name }}-smardigo-sepa-exporter-secrets" + key: SMA_DOCUMENT_AUTH_TOKEN + ports: + - containerPort: 8080 + imagePullSecrets: + - name: "{{ .Values.mobene.pull_secret }}" diff --git a/config/default/templates/smardigo-sepa-exporter/secret.yml b/config/default/templates/smardigo-sepa-exporter/secret.yml new file mode 100644 index 0000000..875f588 --- /dev/null +++ b/config/default/templates/smardigo-sepa-exporter/secret.yml @@ -0,0 +1,7 @@ +apiVersion: v1 +kind: Secret +metadata: + name: "{{ .Release.Name }}-smardigo-sepa-exporter-secrets" +data: + SMA_WORKFLOW_AUTH_TOKEN: "{{ .Values.smardigo.workflow.api_token }}" + SMA_DOCUMENT_AUTH_TOKEN: "{{ .Values.smardigo.document.api_token }}" diff --git a/config/default/templates/smardigo-sepa-exporter/service.yml b/config/default/templates/smardigo-sepa-exporter/service.yml new file mode 100644 index 0000000..1ecadb0 --- /dev/null +++ b/config/default/templates/smardigo-sepa-exporter/service.yml @@ -0,0 +1,17 @@ +apiVersion: v1 +kind: Service +metadata: + name: "{{ .Release.Name }}-backend" +spec: + selector: + app: "{{ .Release.Name }}-backend" + type: NodePort + ports: + - port: 8080 + targetPort: 8080 + protocol: TCP + name: http + - port: 8081 + targetPort: 8081 + protocol: TCP + name: metrics diff --git a/config/default/values.yaml b/config/default/values.yaml index 967ca3b..32f664f 100644 --- a/config/default/values.yaml +++ b/config/default/values.yaml @@ -10,6 +10,11 @@ mobene: uba: image: dev-harbor-01.smardigo.digital/smardigo/mobene-uba-export-app version: latest + +smardigo: + sepa_exporter: + image: dev-harbor-01.smardigo.digital/smardigo/smardigo-sepa-exporter-app + version: latest pull_secret: harbor-pull-secret-key From e4c3ffed428aa079192fbaea4cbff63e2058759f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=BChl?= Date: Thu, 12 May 2022 08:58:48 +0200 Subject: [PATCH 2/5] fixed config --- config/default/cusqa/values.yaml | 10 ++++------ config/default/nsodev/values.yaml | 10 ++++------ .../templates/mobene-uba-export/deployment.yml | 2 +- .../smardigo-sepa-exporter/deployment.yml | 2 +- config/default/values.yaml | 14 ++++++-------- 5 files changed, 16 insertions(+), 22 deletions(-) diff --git a/config/default/cusqa/values.yaml b/config/default/cusqa/values.yaml index 369000c..36711aa 100644 --- a/config/default/cusqa/values.yaml +++ b/config/default/cusqa/values.yaml @@ -5,13 +5,11 @@ smardigo: document: host: https://prodnso-mobene-cusqa-01-connect.smardigo.digital api_token: ZXlKbGJtTWlPaUpCTVRJNFEwSkRMVWhUTWpVMklpd2lZV3huSWpvaVpHbHlJbjAuLlJvTTBqN1BVeDZsaW1KNzdCdzZtYlEuRnBKY3lMeHFiMkt6VnJiR3B3ak9VRmMxX1JlSG52dTQ2VWJHQ2FHS1B1cy5TQUhfcnZIOG5EbGpVZDlVczNUSjF3 + sepa_exporter: + image: dev-harbor-01.smardigo.digital/smardigo/smardigo-sepa-exporter-app + version: latest mobene: uba: image: prodnso-harbor-01.smardigo.digital/smardigo/mobene-uba-export-app - version: 1.0.1 - -smardigo: - sepa_exporter: - image: dev-harbor-01.smardigo.digital/smardigo/smardigo-sepa-exporter-app - version: latest \ No newline at end of file + version: 1.0.1 \ No newline at end of file diff --git a/config/default/nsodev/values.yaml b/config/default/nsodev/values.yaml index 9b967b8..89a08a7 100644 --- a/config/default/nsodev/values.yaml +++ b/config/default/nsodev/values.yaml @@ -5,13 +5,11 @@ smardigo: document: host: https://prodnso-mobene-nsodev-01-connect.smardigo.digital api_token: ZXlKbGJtTWlPaUpCTVRJNFEwSkRMVWhUTWpVMklpd2lZV3huSWpvaVpHbHlJbjAuLlJvTTBqN1BVeDZsaW1KNzdCdzZtYlEuRnBKY3lMeHFiMkt6VnJiR3B3ak9VRmMxX1JlSG52dTQ2VWJHQ2FHS1B1cy5TQUhfcnZIOG5EbGpVZDlVczNUSjF3 + sepa_exporter: + image: dev-harbor-01.smardigo.digital/smardigo/smardigo-sepa-exporter-app + version: latest mobene: uba: image: prodnso-harbor-01.smardigo.digital/smardigo/mobene-uba-export-app - version: 1.0.1 - -smardigo: - sepa_exporter: - image: dev-harbor-01.smardigo.digital/smardigo/smardigo-sepa-exporter-app - version: latest + version: 1.0.1 \ 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 999a5d4..bbb7c30 100644 --- a/config/default/templates/mobene-uba-export/deployment.yml +++ b/config/default/templates/mobene-uba-export/deployment.yml @@ -50,4 +50,4 @@ spec: ports: - containerPort: 8080 imagePullSecrets: - - name: "{{ .Values.mobene.pull_secret }}" + - name: "{{ .Values.pull_secret }}" diff --git a/config/default/templates/smardigo-sepa-exporter/deployment.yml b/config/default/templates/smardigo-sepa-exporter/deployment.yml index 083fb8e..001e72f 100644 --- a/config/default/templates/smardigo-sepa-exporter/deployment.yml +++ b/config/default/templates/smardigo-sepa-exporter/deployment.yml @@ -49,4 +49,4 @@ spec: ports: - containerPort: 8080 imagePullSecrets: - - name: "{{ .Values.mobene.pull_secret }}" + - name: "{{ .Values.pull_secret }}" diff --git a/config/default/values.yaml b/config/default/values.yaml index 32f664f..d26f73c 100644 --- a/config/default/values.yaml +++ b/config/default/values.yaml @@ -5,17 +5,15 @@ smardigo: document: host: https://localhost api_token: "" + sepa_exporter: + image: dev-harbor-01.smardigo.digital/smardigo/smardigo-sepa-exporter-app + version: latest mobene: uba: image: dev-harbor-01.smardigo.digital/smardigo/mobene-uba-export-app - version: latest - -smardigo: - sepa_exporter: - image: dev-harbor-01.smardigo.digital/smardigo/smardigo-sepa-exporter-app - version: latest + version: latest - pull_secret: harbor-pull-secret-key +pull_secret: harbor-pull-secret-key - nodePort: "" +nodePort: "" \ No newline at end of file From 020c52f2bbfa0b71f5c8ecc302b508279d9dac46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=BChl?= Date: Thu, 12 May 2022 09:01:20 +0200 Subject: [PATCH 3/5] fixed url --- config/default/templates/mobene-uba-export/service.yml | 4 ++-- config/default/templates/smardigo-sepa-exporter/service.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/default/templates/mobene-uba-export/service.yml b/config/default/templates/mobene-uba-export/service.yml index 1ecadb0..20036a2 100644 --- a/config/default/templates/mobene-uba-export/service.yml +++ b/config/default/templates/mobene-uba-export/service.yml @@ -1,10 +1,10 @@ apiVersion: v1 kind: Service metadata: - name: "{{ .Release.Name }}-backend" + name: "{{ .Release.Name }}-mobene-uba-backend" spec: selector: - app: "{{ .Release.Name }}-backend" + app: "{{ .Release.Name }}-mobene-uba-backend" type: NodePort ports: - port: 8080 diff --git a/config/default/templates/smardigo-sepa-exporter/service.yml b/config/default/templates/smardigo-sepa-exporter/service.yml index 1ecadb0..dc1f14d 100644 --- a/config/default/templates/smardigo-sepa-exporter/service.yml +++ b/config/default/templates/smardigo-sepa-exporter/service.yml @@ -1,10 +1,10 @@ apiVersion: v1 kind: Service metadata: - name: "{{ .Release.Name }}-backend" + name: "{{ .Release.Name }}-smardigo-sepa-exporter-backend" spec: selector: - app: "{{ .Release.Name }}-backend" + app: "{{ .Release.Name }}-smardigo-sepa-exporter-backend" type: NodePort ports: - port: 8080 From 942bef41bace0bc2533152654f2aff6f288e6b03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=BChl?= Date: Thu, 12 May 2022 09:08:18 +0200 Subject: [PATCH 4/5] changed pull secret key --- config/default/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/default/values.yaml b/config/default/values.yaml index d26f73c..2c6034b 100644 --- a/config/default/values.yaml +++ b/config/default/values.yaml @@ -14,6 +14,6 @@ mobene: image: dev-harbor-01.smardigo.digital/smardigo/mobene-uba-export-app version: latest -pull_secret: harbor-pull-secret-key +pull_secret: dev-harbor-key nodePort: "" \ No newline at end of file From 2e5d165a9996faa0b30401d71d36b60d723287c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=BChl?= Date: Thu, 12 May 2022 09:14:25 +0200 Subject: [PATCH 5/5] fixed image name --- config/default/cusqa/values.yaml | 2 +- config/default/nsodev/values.yaml | 2 +- config/default/values.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/default/cusqa/values.yaml b/config/default/cusqa/values.yaml index 36711aa..c1fd043 100644 --- a/config/default/cusqa/values.yaml +++ b/config/default/cusqa/values.yaml @@ -6,7 +6,7 @@ smardigo: host: https://prodnso-mobene-cusqa-01-connect.smardigo.digital api_token: ZXlKbGJtTWlPaUpCTVRJNFEwSkRMVWhUTWpVMklpd2lZV3huSWpvaVpHbHlJbjAuLlJvTTBqN1BVeDZsaW1KNzdCdzZtYlEuRnBKY3lMeHFiMkt6VnJiR3B3ak9VRmMxX1JlSG52dTQ2VWJHQ2FHS1B1cy5TQUhfcnZIOG5EbGpVZDlVczNUSjF3 sepa_exporter: - image: dev-harbor-01.smardigo.digital/smardigo/smardigo-sepa-exporter-app + image: dev-harbor-01.smardigo.digital/smardigo/sepa-exporter-app version: latest mobene: diff --git a/config/default/nsodev/values.yaml b/config/default/nsodev/values.yaml index 89a08a7..983d5d1 100644 --- a/config/default/nsodev/values.yaml +++ b/config/default/nsodev/values.yaml @@ -6,7 +6,7 @@ smardigo: host: https://prodnso-mobene-nsodev-01-connect.smardigo.digital api_token: ZXlKbGJtTWlPaUpCTVRJNFEwSkRMVWhUTWpVMklpd2lZV3huSWpvaVpHbHlJbjAuLlJvTTBqN1BVeDZsaW1KNzdCdzZtYlEuRnBKY3lMeHFiMkt6VnJiR3B3ak9VRmMxX1JlSG52dTQ2VWJHQ2FHS1B1cy5TQUhfcnZIOG5EbGpVZDlVczNUSjF3 sepa_exporter: - image: dev-harbor-01.smardigo.digital/smardigo/smardigo-sepa-exporter-app + image: dev-harbor-01.smardigo.digital/smardigo/sepa-exporter-app version: latest mobene: diff --git a/config/default/values.yaml b/config/default/values.yaml index 2c6034b..313eeb5 100644 --- a/config/default/values.yaml +++ b/config/default/values.yaml @@ -6,7 +6,7 @@ smardigo: host: https://localhost api_token: "" sepa_exporter: - image: dev-harbor-01.smardigo.digital/smardigo/smardigo-sepa-exporter-app + image: dev-harbor-01.smardigo.digital/smardigo/sepa-exporter-app version: latest mobene: