From 6d43dc616ec9df24d5e2f0bf097913c7e833314a Mon Sep 17 00:00:00 2001
From: "Zickermann, Jan" <jan.zickermann@dataport.de>
Date: Fri, 28 Jun 2024 13:02:37 +0200
Subject: [PATCH] OZG-6054 helm: Use comma-seperated list for xta.identifiers
---
.../src/main/helm/templates/xta_adapter_cronjob.yaml | 6 +++---
xta-adapter/src/test/helm/xta_adapter_cronjob_env_test.yaml | 5 +++--
2 files changed, 6 insertions(+), 5 deletions(-)
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 b8d0d2b98..b7027bf49 100644
--- a/xta-adapter/src/main/helm/templates/xta_adapter_cronjob.yaml
+++ b/xta-adapter/src/main/helm/templates/xta_adapter_cronjob.yaml
@@ -63,8 +63,8 @@ spec:
value: {{ (.Values.xta).server.address }}
- name: ozgcloud_xta_server_protocol
value: {{ (.Values.xta).server.protocol }}
- - name: ozgcloud_xta_identifier
- value: {{ quote (.Values.xta).identifier }}
+ - name: ozgcloud_xta_identifiers
+ value: {{ (.Values.xta).identifiers | join "," }}
- name: ozgcloud_xta_keystore_file
value: "keystore/xta-keystore.p12"
- name: ozgcloud_xta_keystore_password
@@ -170,4 +170,4 @@ spec:
{{- with .Values.podSecurityContext }}
securityContext:
{{ toYaml . | indent 12 }}
- {{- end }}
\ No newline at end of file
+ {{- end }}
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 24eb71d71..77547800e 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
@@ -38,6 +38,7 @@ tests:
xta:
identifiers:
- gae:test@ozg-sh.de
+ - afmsh:test@ozg-sh.de
server:
name: test
address: 1.2.3.4
@@ -71,8 +72,8 @@ tests:
- contains:
path: spec.jobTemplate.spec.template.spec.containers[0].env
content:
- name: ozgcloud_xta_identifier
- value: "gae:test@ozg-sh.de"
+ name: ozgcloud_xta_identifiers
+ value: "gae:test@ozg-sh.de,afmsh:test@ozg-sh.de"
- contains:
path: spec.jobTemplate.spec.template.spec.containers[0].env
content:
--
GitLab