From f007d658ae5c51a29f00fb684ae7416d7592cd72 Mon Sep 17 00:00:00 2001 From: Sven Ketelsen Date: Thu, 2 Jun 2022 11:08:45 +0200 Subject: [PATCH] bugfix: worker --- .../templates/sepa-exporter/deployment.yml | 52 +++++++ smardigo/templates/sepa-exporter/secret.yml | 7 + smardigo/templates/sepa-exporter/service.yml | 17 +++ smardigo/templates/uba-export/deployment.yml | 53 +++++++ smardigo/templates/uba-export/secret.yml | 7 + smardigo/templates/uba-export/service.yml | 17 +++ smardigo/values.yaml | 129 ++++++++++-------- 7 files changed, 227 insertions(+), 55 deletions(-) create mode 100644 smardigo/templates/sepa-exporter/deployment.yml create mode 100644 smardigo/templates/sepa-exporter/secret.yml create mode 100644 smardigo/templates/sepa-exporter/service.yml create mode 100644 smardigo/templates/uba-export/deployment.yml create mode 100644 smardigo/templates/uba-export/secret.yml create mode 100644 smardigo/templates/uba-export/service.yml diff --git a/smardigo/templates/sepa-exporter/deployment.yml b/smardigo/templates/sepa-exporter/deployment.yml new file mode 100644 index 0000000..406ff8e --- /dev/null +++ b/smardigo/templates/sepa-exporter/deployment.yml @@ -0,0 +1,52 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "sepa-exporter" +spec: + replicas: 1 + selector: + matchLabels: + app: "sepa-exporter" + template: + metadata: + labels: + app: "sepa-exporter" + spec: + spec: + containers: + - name: "sepa-exporter" + image: "{{ .Values.harbor.host.name }}/{{ .Values.sepaExporter.image.name }}:{{ .Values.sepaExporter.image.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: "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: "sepa-exporter-secrets" + key: SMA_DOCUMENT_AUTH_TOKEN + ports: + - containerPort: 8080 + imagePullSecrets: + - name: "{{ .Values.pull_secret }}" diff --git a/smardigo/templates/sepa-exporter/secret.yml b/smardigo/templates/sepa-exporter/secret.yml new file mode 100644 index 0000000..9b638d8 --- /dev/null +++ b/smardigo/templates/sepa-exporter/secret.yml @@ -0,0 +1,7 @@ +apiVersion: v1 +kind: Secret +metadata: + name: "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/smardigo/templates/sepa-exporter/service.yml b/smardigo/templates/sepa-exporter/service.yml new file mode 100644 index 0000000..b914c87 --- /dev/null +++ b/smardigo/templates/sepa-exporter/service.yml @@ -0,0 +1,17 @@ +apiVersion: v1 +kind: Service +metadata: + name: "sepa-exporter" +spec: + selector: + app: "sepa-exporter" + type: NodePort + ports: + - port: 8080 + targetPort: 8080 + protocol: TCP + name: http + - port: 8081 + targetPort: 8081 + protocol: TCP + name: metrics diff --git a/smardigo/templates/uba-export/deployment.yml b/smardigo/templates/uba-export/deployment.yml new file mode 100644 index 0000000..d7d07d5 --- /dev/null +++ b/smardigo/templates/uba-export/deployment.yml @@ -0,0 +1,53 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: "uba-export" +spec: + replicas: 1 + selector: + matchLabels: + app: "uba-export" + template: + metadata: + labels: + app: "uba-export" + spec: + spec: + containers: + - name: "uba-export" + image: "{{ .Values.harbor.host.name }}/{{ .Values.ubaExporter.image.name }}:{{ .Values.ubaExporter.image.version }}" + imagePullPolicy: Always + env: + - name: SPRING_PROFILES_INCLUDE + value: "prod,swagger" + + - name: EXTERNAL_TASK_UBA_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: "uba-export-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: "uba-export-secrets" + key: SMA_DOCUMENT_AUTH_TOKEN + ports: + - containerPort: 8080 + imagePullSecrets: + - name: "{{ .Values.harbor.pull_secret }}" diff --git a/smardigo/templates/uba-export/secret.yml b/smardigo/templates/uba-export/secret.yml new file mode 100644 index 0000000..a7d0436 --- /dev/null +++ b/smardigo/templates/uba-export/secret.yml @@ -0,0 +1,7 @@ +apiVersion: v1 +kind: Secret +metadata: + name: "uba-export-secrets" +data: + SMA_WORKFLOW_AUTH_TOKEN: "{{ .Values.smardigo.workflow.api_token }}" + SMA_DOCUMENT_AUTH_TOKEN: "{{ .Values.smardigo.document.api_token }}" diff --git a/smardigo/templates/uba-export/service.yml b/smardigo/templates/uba-export/service.yml new file mode 100644 index 0000000..1159a59 --- /dev/null +++ b/smardigo/templates/uba-export/service.yml @@ -0,0 +1,17 @@ +apiVersion: v1 +kind: Service +metadata: + name: "uba-export" +spec: + selector: + app: "uba-export" + type: NodePort + ports: + - port: 8080 + targetPort: 8080 + protocol: TCP + name: http + - port: 8081 + targetPort: 8081 + protocol: TCP + name: metrics diff --git a/smardigo/values.yaml b/smardigo/values.yaml index 2664e0a..6a98b73 100644 --- a/smardigo/values.yaml +++ b/smardigo/values.yaml @@ -1,64 +1,40 @@ -sharedService: - keycloak: - host: - ip: 10.0.0.11 - name: dev-keycloak-01.smardigo.digital - postgres: - host: - ip: 10.0.0.19 - name: dev-postgres-01 - maria: - host: - ip: 10.0.0.16 - name: dev-maria-01 - elastic: - host01: - ip: 10.0.0.5 - name: dev-elastic-stack-elastic-01 - host02: - ip: 10.0.0.6 - name: dev-elastic-stack-elastic-02 - host03: - ip: 10.0.0.7 - name: dev-elastic-stack-elastic-03 - -iam: - image: - version: latest - name: smardigo/iam-app - keycloak: - username: keycloak-admin - password: keycloak-admin +smardigo: + document: + host: "connect" + api_token: "" + workflow: + host: "connect" + api_token: "" connect: image: - version: latest - name: smardigo/connect-whitelabel-app + version: "latest" + name: "smardigo/connect-whitelabel-app" admin: - username: connect-admin - password: connect-admin + username: "connect-admin" + password: "connect-admin" database: - host: dev-postgres-01 - port: 5432 - name: dev_mobene_nsodev_connect - username: dev_mobene_nsodev_connect - password: connect-postgres-admin + host: "dev-postgres-01" + port: "5432" + name: "dev_mobene_nsodev_connect" + username: "dev_mobene_nsodev_connect" + password: "connect-postgres-admin" elastic: - host: dev-elastic-stack-elastic-01 - port: 9200 - username: elastic - password: elastic + host: "dev-elastic-stack-elastic-01" + port: "9200" + username: "elastic" + password: "elastic" oidc: - realm: mobene - client_id: nsodev - client_secret: nsodev - registration_id: nsodev - issuer_host: dev-keycloak-01.smardigo.digital + realm: "mobene" + client_id: "nsodev" + client_secret: "nsodev" + registration_id: "nsodev" + issuer_host: "dev-keycloak-01.smardigo.digital" mail: - host: dev-mail-01.smardigo.digital - post: 25 - username: - password: + host: "dev-mail-01.smardigo.digital" + post: "25" + username: "" + password: "" properties: simulation: true base_url: "https://dev-mobene-nsodev-connect.smardigo.digital" @@ -67,6 +43,14 @@ connect: sender_alias: "noreply-connect" domain: "dev-mobene-nsodev-connect.smardigo.digital" +iam: + image: + version: "latest" + name: "smardigo/iam-app" + keycloak: + username: "keycloak-admin" + password: "keycloak-admin" + wordpress: image: version: "1.3.1" @@ -87,8 +71,43 @@ wordpress: password: "Buerger?P0rtal." domain: "dev-mobene-nsodev-wordpress.smardigo.digital" +ubaExporter: + image: + version: "latest" + name: "smardigo/mobene-uba-export-app" + +sepaExporter: + image: + version: "latest" + name: "smardigo/sepa-exporter-app" + +# services which aren't part of the kubernetes cluster +sharedService: + keycloak: + host: + ip: "10.0.0.11" + name: "dev-keycloak-01.smardigo.digital" + postgres: + host: + ip: "10.0.0.19" + name: "dev-postgres-01" + maria: + host: + ip: "10.0.0.16" + name: "dev-maria-01" + elastic: + host01: + ip: "10.0.0.5" + name: "dev-elastic-stack-elastic-01" + host02: + ip: "10.0.0.6" + name: "dev-elastic-stack-elastic-02" + host03: + ip: "10.0.0.7" + name: "dev-elastic-stack-elastic-03" + harbor: host: - name: dev-harbor-01.smardigo.digital + name: "dev-harbor-01.smardigo.digital" # The name of the secret containing the credentials to access the docker registry to download the smardigo image. - pull_secret: harbor-pull-secret-key + pull_secret: "harbor-pull-secret-key" \ No newline at end of file