From 663f932e3cd8b45ef942c7ec291a296c137b38fa Mon Sep 17 00:00:00 2001 From: OZGCloud <ozgcloud@mgm-tp.com> Date: Wed, 29 Nov 2023 14:12:13 +0100 Subject: [PATCH] OZG-4194 OZG-4578 Helm charts --- src/main/helm/app-readme.md | 38 +++++++++---------- src/main/helm/questions.yml | 14 +++---- src/main/helm/templates/_helpers.tpl | 24 ++++++------ src/main/helm/templates/deployment.yaml | 22 +++++------ src/main/helm/templates/ingress.yaml | 2 +- src/main/helm/templates/network_policy.yaml | 2 +- src/main/helm/test-values.yaml | 2 +- src/main/helm/values.yaml | 6 +-- .../helm/deployment_defaults_labels_test.yaml | 2 +- src/test/helm/deployment_env_test.yaml | 2 +- .../helm/deployment_routing-strategy.yaml | 4 +- src/test/helm/network_policy_test.yaml | 2 +- src/test/unit-values.yaml | 6 +-- .../src/main/helm/templates/_helpers.tpl | 4 +- .../main/helm/templates/network_policy.yaml | 2 +- .../helm/templates/xta_adapter_cronjob.yaml | 12 +++--- xta-adapter/src/main/helm/test-values.yaml | 2 +- xta-adapter/src/main/helm/values.yaml | 4 +- .../src/test/helm/network_policy_test.yaml | 4 +- .../src/test/helm/values/unit-values.yaml | 2 +- .../helm/xta_adapter_cronjob_basic_test.yaml | 4 +- .../helm/xta_adapter_cronjob_env_test.yaml | 20 +++++----- 22 files changed, 90 insertions(+), 90 deletions(-) diff --git a/src/main/helm/app-readme.md b/src/main/helm/app-readme.md index 29b0f343a..a5eda5123 100644 --- a/src/main/helm/app-readme.md +++ b/src/main/helm/app-readme.md @@ -1,41 +1,41 @@ # Intelliform Adapter -Adapter zum empfangen von Formulardaten von einem IntellForm basierten Formularserveri, zum Beispiel iAFM (integriertes Antrags- und Formularmanagement). +Adapter zum empfangen von Formulardaten von einem IntellForm basierten Formularserver, zum Beispiel iAFM (integriertes Antrags- und Formularmanagement). ## Routingkonfiguration -### Pluto Instanzen +### Vorgang-Manager Instanzen -Für alle Pluto-Instanzen, die von dem Adapter erreichbar sein sollen, muss in das _Environment_ ein Eintrag mit dem GRPC-Service ergänzt werden: +Für alle Vorgang-Manager-Instanzen, die von dem Adapter erreichbar sein sollen, muss in das _Environment_ ein Eintrag mit dem GRPC-Service ergänzt werden: ```yaml -grpc.client.pluto-*pluto-name*.address:*url und port* -grpc.client.pluto-*pluto-name*.negotiationType: PLAINTEXT +grpc.client.vorgang-manager-*organisationseinheit-name*.address:*url und port* +grpc.client.vorgang-manager-*vorgang-manager-name*.negotiationType: PLAINTEXT ``` ### Fallback Strategy -Die Fallback Stratey steuert wie mit Eingängen umgegangen werden soll, für die keine passende Pluto-Instanze gefunden werden konnte. +Die Fallback Stratey steuert wie mit Eingängen umgegangen werden soll, für die keine passende Vorgang-Manager-Instanze gefunden werden konnte. Folgende Optionen stehen zur Verfügung: - **DENY** der Antrag wird mit einer Fehlermeldung abgelehnt. Dies funktioniert nur, solange die Abarbeitung synchron erfolgt. -- **FUNDSTELLE** der Antrag wird an eine zentrale Fundstelle weitergeleitet. Dafür muss der Name der Pluto-Instanze, die als Fundstelle fungiert, eingetragen werden. +- **FUNDSTELLE** der Antrag wird an eine zentrale Fundstelle weitergeleitet. Dafür muss der Name der Vorgang-Manager-Instanze, die als Fundstelle fungiert, eingetragen werden. ### Routing Strategy -Die Routing Strategy steuert wie das Routing konfiguriert wird und wieviele Pluto-Instanzen berücksichtigt werden können. +Die Routing Strategy steuert wie das Routing konfiguriert wird und wieviele Vorgang-Manager-Instanzen berücksichtigt werden können. Folgende Optionen stehen zur Verfügung: -- **MULTI** es kann an beliebig viele Pluto-Instanzen geroutet werden. Dafür muss in der Environment ein Mapping der Organisationseinheit-Id auf den Namen einer Pluto-Instanz konfiguriert werden. +- **MULTI** es kann an beliebig viele Vorgang-Manager-Instanzen geroutet werden. Dafür muss in der Environment ein Mapping der Organisationseinheit-Id auf den Namen einer Vorgang-Manager-Instanz konfiguriert werden. ```yaml -kop.adapter.organisationseinheiten.*id*: *pluto-name* +ozgcloud.adapter.organisationseinheiten.*id*: *vorgang-manager-name* ``` -- **SINGLE** es wird immer nur an eine Pluto-Instanze geroutet, der Name der Instanz ist im Feld 'Pluto Name' anzugeben. +- **SINGLE** es wird immer nur an eine Vorgang-Manager-Instanze geroutet, der Name der Instanz ist im Feld 'Vorgang-Manager Name' anzugeben. ### Beispielkonfiguration @@ -43,11 +43,11 @@ kop.adapter.organisationseinheiten.*id*: *pluto-name* env: springProfiles: "oc, dev" grpc: - - name: grpc_client_pluto-test_address - value: "pluto.test:9090" - - name: grpc_client_pluto-test_negotiationType + - name: grpc_client_vorgang-manager-test_address + value: "vorgang-manager.test:9090" + - name: grpc_client_vorgang-manager-test_negotiationType value: PLAINTEXT - - name: kop.adapter.organisationseinheiten.1357913579 + - name: ozgcloud.adapter.organisationseinheiten.1357913579 value: test image: tag: snapshot-latest @@ -55,9 +55,9 @@ imageCredentials: email: webmaster@ozg-sh.de password: registry: docker.ozg-sh.de - username: kop + username: ozgcloud ingress: - host: kiel-afm.dev.by.kop-cloud.de + host: kiel-afm.dev.by.ozg-cloud.de replicaCount: 2 resources: limits: @@ -74,9 +74,9 @@ global: systemDefaultRegistry: "" routing: fallbackStrategy: FUNDSTELLE - fundstellePlutoName: kiel + fundstelleVorgangManagerName: kiel routingStrategy: MULTI - targetPlutoName: kiel + targetVorgangManagerName: kiel ``` ### Benutzung beliebiger environment Werte diff --git a/src/main/helm/questions.yml b/src/main/helm/questions.yml index 2d5d472d2..b8309442a 100644 --- a/src/main/helm/questions.yml +++ b/src/main/helm/questions.yml @@ -47,13 +47,13 @@ questions: group: "Container" type: string label: "Override Spring boot profile" - - variable: kop.bezeichner - group: "KOP" + - variable: ozgcloud.bezeichner + group: "OZGCLOUD" label: "Bezeichner" type: string required: true - - variable: kop.environment - group: "KOP" + - variable: ozgcloud.environment + group: "OZGCLOUD" label: "Environment" type: string required: true @@ -81,7 +81,7 @@ questions: - DENY show_subquestion_if: FUNDSTELLE subquestions: - - variable: routing.fundstellePlutoName + - variable: routing.fundstelleVorgangManagerName type: string label: Fundstelle required: true @@ -96,9 +96,9 @@ questions: - SINGLE show_subquestion_if: SINGLE subquestions: - - variable: routing.targetPlutoName + - variable: routing.targetVorgangManagerName type: string - label: Pluto Name + label: Vorgang-Manager Name required: true - variable: routing.targetNamespace type: string diff --git a/src/main/helm/templates/_helpers.tpl b/src/main/helm/templates/_helpers.tpl index 142c08058..c7dfcd795 100644 --- a/src/main/helm/templates/_helpers.tpl +++ b/src/main/helm/templates/_helpers.tpl @@ -31,7 +31,7 @@ app.kubernetes.io/instance: afm-adapter app.kubernetes.io/managed-by: {{ include "app.managedBy" . }} app.kubernetes.io/name: {{ include "app.name" . }} -app.kubernetes.io/part-of: kop +app.kubernetes.io/part-of: ozgcloud app.kubernetes.io/version: {{ include "app.version" . }} app.kubernetes.io/namespace: {{ include "app.namespace" . }} helm.sh/chart: {{ include "app.chart" . }} @@ -53,31 +53,31 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }} {{- if (.Values.env).overrideSpringProfiles -}} {{ printf "%s" (.Values.env).overrideSpringProfiles }} {{- else -}} -{{ printf "oc, %s" (include "app.kopEnvironment" . ) }} +{{ printf "oc, %s" (include "app.ozgcloudEnvironment" . ) }} {{- end -}} {{- end -}} -{{- define "app.kopEnvironment" -}} -{{- required "Environment muss angegeben sein" (.Values.kop).environment -}} +{{- define "app.ozgcloudEnvironment" -}} +{{- required "Environment muss angegeben sein" (.Values.ozgcloud).environment -}} {{- end -}} -{{- define "app.kopBezeichner" -}} -{{ $length := len (.Values.kop).bezeichner }} +{{- define "app.ozgcloudBezeichner" -}} +{{ $length := len (.Values.ozgcloud).bezeichner }} {{- if ge 27 $length -}} -{{ (.Values.kop).bezeichner }} +{{ (.Values.ozgcloud).bezeichner }} {{- else -}} -{{ required (printf "Bezichner %s ist zu lang (max. 27 Zeichen)" (.Values.kop).bezeichner) nil }} +{{ required (printf "Bezichner %s ist zu lang (max. 27 Zeichen)" (.Values.ozgcloud).bezeichner) nil }} {{- end -}} {{- end -}} {{- define "app.ingress.host" }} {{- if (.Values.ingress).adapterBezeichner }} -{{- printf "%s-%s.%s" (include "app.kopBezeichner" .) .Values.ingress.adapterBezeichner .Values.baseUrl }} +{{- printf "%s-%s.%s" (include "app.ozgcloudBezeichner" .) .Values.ingress.adapterBezeichner .Values.baseUrl }} {{- else if eq (.Values.image).name "formsolutions-adapter" }} -{{- printf "%s-fs.%s" (include "app.kopBezeichner" .) .Values.baseUrl }} +{{- printf "%s-fs.%s" (include "app.ozgcloudBezeichner" .) .Values.baseUrl }} {{- else if eq (.Values.image).name "formcycle-adapter" }} -{{- printf "%s-formcycle.%s" (include "app.kopBezeichner" .) .Values.baseUrl }} +{{- printf "%s-formcycle.%s" (include "app.ozgcloudBezeichner" .) .Values.baseUrl }} {{- else }} -{{- printf "%s-afm.%s" (include "app.kopBezeichner" .) .Values.baseUrl }} +{{- printf "%s-afm.%s" (include "app.ozgcloudBezeichner" .) .Values.baseUrl }} {{- end }} {{- end -}} \ No newline at end of file diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml index 9b5b7c082..cefff9be9 100644 --- a/src/main/helm/templates/deployment.yaml +++ b/src/main/helm/templates/deployment.yaml @@ -62,20 +62,20 @@ spec: {{- end }} - name: spring_profiles_active value: {{ include "app.envSpringProfiles" . }} - - name: kop_adapter_fallbackStrategy + - name: ozgcloud_adapter_fallbackStrategy value: {{ (.Values.routing).fallbackStrategy | default "DENY"}} - {{- if (.Values.routing).fundstellePlutoName}} - - name: kop_adapter_fundstellePlutoName - value: {{ .Values.routing.fundstellePlutoName }} + {{- if (.Values.routing).fundstelleVorgangManagerName}} + - name: ozgcloud_adapter_fundstelleVorgangManagerName + value: {{ .Values.routing.fundstelleVorgangManagerName }} {{- end }} - - name: kop_adapter_routingStrategy + - name: ozgcloud_adapter_routingStrategy value: {{ (.Values.routing).routingStrategy | default "SINGLE"}} - {{- if (.Values.routing).targetPlutoName }} - - name: kop_adapter_targetPlutoName - value: {{ (.Values.routing).targetPlutoName}} - - name: grpc_client_pluto-{{ (.Values.routing).targetPlutoName}}_address - value: 'pluto.{{ coalesce (.Values.routing).targetNamespace .Release.Namespace }}:9090' - - name: grpc_client_pluto-{{ (.Values.routing).targetPlutoName}}_negotiationType + {{- if (.Values.routing).targetVorgangManagerName }} + - name: ozgcloud_adapter_targetVorgangManagerName + value: {{ (.Values.routing).targetVorgangManagerName}} + - name: grpc_client_vorgang-manager-{{ (.Values.routing).targetVorgangManagerName}}_address + value: 'vorgang-manager.{{ coalesce (.Values.routing).targetNamespace .Release.Namespace }}:9090' + - name: grpc_client_vorgang-manager-{{ (.Values.routing).targetVorgangManagerName}}_negotiationType value: {{ (.Values.routing).negotiationType | default "PLAINTEXT" }} {{- end }} {{- with (.Values.env).customList }} diff --git a/src/main/helm/templates/ingress.yaml b/src/main/helm/templates/ingress.yaml index 05a61520a..e539e8e0d 100644 --- a/src/main/helm/templates/ingress.yaml +++ b/src/main/helm/templates/ingress.yaml @@ -54,6 +54,6 @@ spec: - hosts: - {{ include "app.ingress.host" . }} {{- if ne (.Values).cluster_env "dataport" }} - secretName: {{ .Values.kop.bezeichner }}-{{ include "app.name" . }}-tls + secretName: {{ .Values.ozgcloud.bezeichner }}-{{ include "app.name" . }}-tls {{- end }} {{- end -}} \ No newline at end of file diff --git a/src/main/helm/templates/network_policy.yaml b/src/main/helm/templates/network_policy.yaml index 0aa2458d7..18cf7b2cc 100644 --- a/src/main/helm/templates/network_policy.yaml +++ b/src/main/helm/templates/network_policy.yaml @@ -42,7 +42,7 @@ spec: - to: - podSelector: matchLabels: - component: pluto + component: vorgang-manager ports: - port: 9090 protocol: TCP diff --git a/src/main/helm/test-values.yaml b/src/main/helm/test-values.yaml index 0343b0072..e72f46c87 100644 --- a/src/main/helm/test-values.yaml +++ b/src/main/helm/test-values.yaml @@ -22,7 +22,7 @@ # unter der Lizenz sind dem Lizenztext zu entnehmen. # -kop: +ozgcloud: environment: test bezeichner: helm bundesland: sh \ No newline at end of file diff --git a/src/main/helm/values.yaml b/src/main/helm/values.yaml index ff48ec468..4a2bd83c1 100644 --- a/src/main/helm/values.yaml +++ b/src/main/helm/values.yaml @@ -46,15 +46,15 @@ image: imageCredentials: registry: docker.ozg-sh.de - username: kop + username: ozgcloud password: email: webmaster@ozg-sh.de ingress: enabled: true - # overrideHost: kiel-afm.dev.by.kop-cloud.de + # overrideHost: kiel-afm.dev.by.ozg-cloud.de routing: - targetPlutoName: pluto + targetVorgangManagerName: vorgang-manager # fallbackStrategy: DENY # routingStrategy: SINGLE diff --git a/src/test/helm/deployment_defaults_labels_test.yaml b/src/test/helm/deployment_defaults_labels_test.yaml index 70290fea5..0b91b2423 100644 --- a/src/test/helm/deployment_defaults_labels_test.yaml +++ b/src/test/helm/deployment_defaults_labels_test.yaml @@ -41,7 +41,7 @@ tests: value: intelliform-adapter - equal: path: metadata.labels.[app.kubernetes.io/part-of] - value: kop + value: ozgcloud - equal: path: metadata.labels.[app.kubernetes.io/namespace] value: sh-helm-test diff --git a/src/test/helm/deployment_env_test.yaml b/src/test/helm/deployment_env_test.yaml index 51fc54a9d..c76bf80b8 100644 --- a/src/test/helm/deployment_env_test.yaml +++ b/src/test/helm/deployment_env_test.yaml @@ -40,7 +40,7 @@ tests: value: "A test value" - it: check customList test value is not set by default set: - kop.environment: test + ozgcloud.environment: test template: deployment.yaml asserts: - notContains: diff --git a/src/test/helm/deployment_routing-strategy.yaml b/src/test/helm/deployment_routing-strategy.yaml index 50eb484e2..6ed8d3515 100644 --- a/src/test/helm/deployment_routing-strategy.yaml +++ b/src/test/helm/deployment_routing-strategy.yaml @@ -46,7 +46,7 @@ tests: - contains: path: spec.template.spec.containers[0].env content: - name: grpc_client_pluto-pluto_negotiationType + name: grpc_client_vorgang-manager-vorgang-manager_negotiationType value: PLAINTEXT - it: validate routing infos set: @@ -68,5 +68,5 @@ tests: - contains: path: spec.template.spec.containers[0].env content: - name: grpc_client_pluto-pluto_negotiationType + name: grpc_client_vorgang-manager-vorgang-manager_negotiationType value: TLS \ No newline at end of file diff --git a/src/test/helm/network_policy_test.yaml b/src/test/helm/network_policy_test.yaml index c4a917336..96c857eb6 100644 --- a/src/test/helm/network_policy_test.yaml +++ b/src/test/helm/network_policy_test.yaml @@ -62,7 +62,7 @@ tests: - to: - podSelector: matchLabels: - component: pluto + component: vorgang-manager ports: - port: 9090 protocol: TCP diff --git a/src/test/unit-values.yaml b/src/test/unit-values.yaml index 5a2a0cc18..fcf2eaf10 100644 --- a/src/test/unit-values.yaml +++ b/src/test/unit-values.yaml @@ -24,13 +24,13 @@ baseUrl: test.sh.ozg-cloud.de -kop: +ozgcloud: bundesland: sh environment: test bezeichner: helm routing: - targetPlutoName: pluto + targetVorgangManagerName: vorgang-manager image: repo: docker.ozg-sh.de @@ -39,6 +39,6 @@ image: imageCredentials: registry: docker.ozg-sh.de - username: kop + username: ozgcloud password: email: webmaster@ozg-sh.de \ No newline at end of file diff --git a/xta-adapter/src/main/helm/templates/_helpers.tpl b/xta-adapter/src/main/helm/templates/_helpers.tpl index 859c91d77..62e0d2958 100644 --- a/xta-adapter/src/main/helm/templates/_helpers.tpl +++ b/xta-adapter/src/main/helm/templates/_helpers.tpl @@ -31,7 +31,7 @@ app.kubernetes.io/instance: {{ include "app.name" . }} app.kubernetes.io/managed-by: {{ include "app.managedBy" . }} app.kubernetes.io/name: {{ include "app.name" . }} -app.kubernetes.io/part-of: kop +app.kubernetes.io/part-of: ozgcloud app.kubernetes.io/version: {{ include "app.version" . }} app.kubernetes.io/namespace: {{ include "app.namespace" . }} helm.sh/chart: {{ include "app.chart" . }} @@ -52,7 +52,7 @@ helm.sh/chart: {{ include "app.chart" . }} {{- end -}} {{- define "app.kopEnvironment" -}} -{{- required "Environment muss angegeben sein" (.Values.kop).environment -}} +{{- required "Environment muss angegeben sein" (.Values.ozgcloud).environment -}} {{- end -}} {{- define "app.xtaSchedule" -}} diff --git a/xta-adapter/src/main/helm/templates/network_policy.yaml b/xta-adapter/src/main/helm/templates/network_policy.yaml index 6c806c791..7f4528b85 100644 --- a/xta-adapter/src/main/helm/templates/network_policy.yaml +++ b/xta-adapter/src/main/helm/templates/network_policy.yaml @@ -38,7 +38,7 @@ spec: - to: - podSelector: matchLabels: - component: pluto + component: vorgang-manager ports: - port: 9090 protocol: TCP diff --git a/xta-adapter/src/main/helm/templates/xta_adapter_cronjob.yaml b/xta-adapter/src/main/helm/templates/xta_adapter_cronjob.yaml index 371dda541..344d5f788 100644 --- a/xta-adapter/src/main/helm/templates/xta_adapter_cronjob.yaml +++ b/xta-adapter/src/main/helm/templates/xta_adapter_cronjob.yaml @@ -74,12 +74,12 @@ spec: value: {{ (.Values.routing).fallbackStrategy | default "DENY"}} - name: kop_adapter_routingStrategy value: {{ (.Values.routing).routingStrategy | default "SINGLE"}} - {{- if (.Values.routing).targetPlutoName }} - - name: kop_adapter_targetPlutoName - value: {{ (.Values.routing).targetPlutoName}} - - name: grpc_client_pluto-{{ (.Values.routing).targetPlutoName }}_address - value: 'pluto.{{ coalesce (.Values.routing).targetNamespace .Release.Namespace }}:9090' - - name: grpc_client_pluto-{{ (.Values.routing).targetPlutoName }}_negotiationType + {{- if (.Values.routing).targetVorgangManagerName }} + - name: kop_adapter_targetVorgangManagerName + value: {{ (.Values.routing).targetVorgangManagerName}} + - name: grpc_client_vorgang-manager-{{ (.Values.routing).targetVorgangManagerName }}_address + value: 'vorgang-manager.{{ coalesce (.Values.routing).targetNamespace .Release.Namespace }}:9090' + - name: grpc_client_vorgang-manager-{{ (.Values.routing).targetVorgangManagerName }}_negotiationType value: {{ (.Values.routing).negotiationType | default "PLAINTEXT" }} {{- end }} volumeMounts: diff --git a/xta-adapter/src/main/helm/test-values.yaml b/xta-adapter/src/main/helm/test-values.yaml index c16404271..7b0b2d9b7 100644 --- a/xta-adapter/src/main/helm/test-values.yaml +++ b/xta-adapter/src/main/helm/test-values.yaml @@ -22,7 +22,7 @@ # unter der Lizenz sind dem Lizenztext zu entnehmen. # -kop: +ozgcloud: environment: test bezeichner: helm bundesland: by diff --git a/xta-adapter/src/main/helm/values.yaml b/xta-adapter/src/main/helm/values.yaml index c889a8f60..2b3d383c6 100644 --- a/xta-adapter/src/main/helm/values.yaml +++ b/xta-adapter/src/main/helm/values.yaml @@ -32,11 +32,11 @@ image: imageCredentials: registry: docker.ozg-sh.de - username: kop + username: ozgcloud password: email: webmaster@ozg-sh.de routing: - targetPlutoName: pluto + targetVorgangManagerName: vorgang-manager fallbackStrategy: DENY routingStrategy: SINGLE \ No newline at end of file diff --git a/xta-adapter/src/test/helm/network_policy_test.yaml b/xta-adapter/src/test/helm/network_policy_test.yaml index 79daaa6a8..92a40e9ea 100644 --- a/xta-adapter/src/test/helm/network_policy_test.yaml +++ b/xta-adapter/src/test/helm/network_policy_test.yaml @@ -57,7 +57,7 @@ tests: - to: - podSelector: matchLabels: - component: pluto + component: vorgang-manager ports: - port: 9090 protocol: TCP @@ -95,7 +95,7 @@ tests: - to: - podSelector: matchLabels: - component: pluto + component: vorgang-manager ports: - port: 9090 protocol: TCP diff --git a/xta-adapter/src/test/helm/values/unit-values.yaml b/xta-adapter/src/test/helm/values/unit-values.yaml index 51ff4aeab..fe20e41e9 100644 --- a/xta-adapter/src/test/helm/values/unit-values.yaml +++ b/xta-adapter/src/test/helm/values/unit-values.yaml @@ -22,7 +22,7 @@ # unter der Lizenz sind dem Lizenztext zu entnehmen. # -kop: +ozgcloud: bundesland: sh environment: test bezeichner: helm \ No newline at end of file diff --git a/xta-adapter/src/test/helm/xta_adapter_cronjob_basic_test.yaml b/xta-adapter/src/test/helm/xta_adapter_cronjob_basic_test.yaml index ba879bf70..677ce10dc 100644 --- a/xta-adapter/src/test/helm/xta_adapter_cronjob_basic_test.yaml +++ b/xta-adapter/src/test/helm/xta_adapter_cronjob_basic_test.yaml @@ -70,7 +70,7 @@ tests: template: xta_adapter_cronjob.yaml set: image.name: xta-adapter - kop.environment: dev + ozgcloud.environment: dev asserts: - equal: path: spec.schedule @@ -79,7 +79,7 @@ tests: template: xta_adapter_cronjob.yaml set: image.name: xta-adapter - kop.environment: dev + ozgcloud.environment: dev asserts: - equal: path: spec.jobTemplate.spec.template.spec.containers[0].image diff --git a/xta-adapter/src/test/helm/xta_adapter_cronjob_env_test.yaml b/xta-adapter/src/test/helm/xta_adapter_cronjob_env_test.yaml index c0f8176b6..2b465eec2 100644 --- a/xta-adapter/src/test/helm/xta_adapter_cronjob_env_test.yaml +++ b/xta-adapter/src/test/helm/xta_adapter_cronjob_env_test.yaml @@ -97,17 +97,17 @@ tests: - contains: path: spec.jobTemplate.spec.template.spec.containers[0].env content: - name: kop_adapter_targetPlutoName - value: "pluto" + name: kop_adapter_targetVorgangManagerName + value: "vorgang-manager" - contains: path: spec.jobTemplate.spec.template.spec.containers[0].env content: - name: grpc_client_pluto-pluto_address - value: 'pluto.helm-test:9090' + name: grpc_client_vorgang-manager-vorgang-manager_address + value: 'vorgang-manager.helm-test:9090' - contains: path: spec.jobTemplate.spec.template.spec.containers[0].env content: - name: grpc_client_pluto-pluto_negotiationType + name: grpc_client_vorgang-manager-vorgang-manager_negotiationType value: "PLAINTEXT" - it: check set env values template: xta_adapter_cronjob.yaml @@ -142,15 +142,15 @@ tests: - contains: path: spec.jobTemplate.spec.template.spec.containers[0].env content: - name: kop_adapter_targetPlutoName - value: "pluto" + name: kop_adapter_targetVorgangManagerName + value: "vorgang-manager" - contains: path: spec.jobTemplate.spec.template.spec.containers[0].env content: - name: grpc_client_pluto-pluto_address - value: 'pluto.helm-test:9090' + name: grpc_client_vorgang-manager-vorgang-manager_address + value: 'vorgang-manager.helm-test:9090' - contains: path: spec.jobTemplate.spec.template.spec.containers[0].env content: - name: grpc_client_pluto-pluto_negotiationType + name: grpc_client_vorgang-manager-vorgang-manager_negotiationType value: "TLS" \ No newline at end of file -- GitLab