From ae756b1f7a67f43a1873c54bd1d73bd2b56e7f65 Mon Sep 17 00:00:00 2001
From: Jan Zickermann <jan.zickermann@dataport.de>
Date: Wed, 29 Jan 2025 15:00:17 +0100
Subject: [PATCH] Revert "OZG-7491 helm: Use absolute keystore path"
This reverts commit c2b46ef7ac05f62069678f19a3ce6b252f468f6b.
---
src/main/helm/templates/xta_adapter_cronjob.yaml | 4 ++--
src/test/helm/xta_adapter_cronjob_env_test.yaml | 2 +-
src/test/helm/xta_adapter_cronjob_volumes_test.yaml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/helm/templates/xta_adapter_cronjob.yaml b/src/main/helm/templates/xta_adapter_cronjob.yaml
index 4f1f34e1..76195913 100644
--- a/src/main/helm/templates/xta_adapter_cronjob.yaml
+++ b/src/main/helm/templates/xta_adapter_cronjob.yaml
@@ -66,7 +66,7 @@ spec:
- name: ozgcloud_xta_identifiers
value: {{ (.Values.xta).identifiers | join "," | quote }}
- name: ozgcloud_xta_keystore_file
- value: "/keystore/xta-keystore.p12"
+ value: "keystore/xta-keystore.p12"
- name: ozgcloud_xta_keystore_password
valueFrom:
secretKeyRef:
@@ -104,7 +104,7 @@ spec:
subPath: ca.crt
readOnly: true
- name: xta-keystore
- mountPath: "/keystore/xta-keystore.p12"
+ mountPath: "/workspace/keystore/xta-keystore.p12"
subPath: file
readOnly: true
- name: temp-dir
diff --git a/src/test/helm/xta_adapter_cronjob_env_test.yaml b/src/test/helm/xta_adapter_cronjob_env_test.yaml
index c500c396..e247e20d 100644
--- a/src/test/helm/xta_adapter_cronjob_env_test.yaml
+++ b/src/test/helm/xta_adapter_cronjob_env_test.yaml
@@ -78,7 +78,7 @@ tests:
path: spec.jobTemplate.spec.template.spec.containers[0].env
content:
name: ozgcloud_xta_keystore_file
- value: "/keystore/xta-keystore.p12"
+ value: "keystore/xta-keystore.p12"
- contains:
path: spec.jobTemplate.spec.template.spec.containers[0].env
content:
diff --git a/src/test/helm/xta_adapter_cronjob_volumes_test.yaml b/src/test/helm/xta_adapter_cronjob_volumes_test.yaml
index c5d74f85..352f196b 100644
--- a/src/test/helm/xta_adapter_cronjob_volumes_test.yaml
+++ b/src/test/helm/xta_adapter_cronjob_volumes_test.yaml
@@ -60,7 +60,7 @@ tests:
path: spec.jobTemplate.spec.template.spec.containers[0].volumeMounts
content:
name: xta-keystore
- mountPath: "/keystore/xta-keystore.p12"
+ mountPath: "/workspace/keystore/xta-keystore.p12"
subPath: file
readOnly: true
- it: check volumes
--
GitLab