diff options
| author |   Radoslaw Chmiel <r.chmiel@partner.samsung.com> | 2022-02-28 21:33:01 +0100 |
|---|---|---|
| committer | Radoslaw Chmiel <r.chmiel@partner.samsung.com> | 2022-03-01 08:48:25 +0100 |
| commit | 88534f1d397684f061797e041f15c68e5d6a509a (patch) | |
| tree | 9a443420479dac3bfbcd7ca53ec10e470fbc1bde /kubernetes/aai/components/aai-modelloader | |
| parent | 053f263ccd8786a4f2cf39a36b504c4bd28ed324 (diff) | |
[AAI] Automatically select valid jetty-util jar
jetty-util jar filename will be automatically generated
from currently present instead of hardcoded value
Change-Id: Iface1530739cc28d9f0823573c98852ae4a3b6d9
Signed-off-by: Radoslaw Chmiel <r.chmiel@partner.samsung.com>
Issue-ID: OOM-2929
Diffstat (limited to 'kubernetes/aai/components/aai-modelloader')
| -rw-r--r-- | kubernetes/aai/components/aai-modelloader/templates/deployment.yaml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kubernetes/aai/components/aai-modelloader/templates/deployment.yaml b/kubernetes/aai/components/aai-modelloader/templates/deployment.yaml index 22f0dbcd05..47c13af86e 100644 --- a/kubernetes/aai/components/aai-modelloader/templates/deployment.yaml +++ b/kubernetes/aai/components/aai-modelloader/templates/deployment.yaml @@ -56,8 +56,9 @@ spec: echo "*** obfuscate them " export KEYSTORE_PLAIN_PASSWORD=${KEYSTORE_PLAIN_PASSWORD} export TRUSTSTORE_PLAIN_PASSWORD=${TRUSTSTORE_PLAIN_PASSWORD} - export KEYSTORE_PASSWORD=`java -cp /usr/local/jetty/lib/jetty-util-9.4.45.v20220203.jar org.eclipse.jetty.util.security.Password ${KEYSTORE_PLAIN_PASSWORD} 2>&1 | grep "OBF:"` - export TRUSTSTORE_PASSWORD=`java -cp /usr/local/jetty/lib/jetty-util-9.4.45.v20220203.jar org.eclipse.jetty.util.security.Password ${TRUSTSTORE_PLAIN_PASSWORD} 2>&1 | grep "OBF:"` + export JETTY_UTIL_JAR=$(find /usr/local/jetty/lib/ -regextype sed -regex ".*jetty-util-[0-9].*.jar") + export KEYSTORE_PASSWORD=`java -cp ${JETTY_UTIL_JAR} org.eclipse.jetty.util.security.Password ${KEYSTORE_PLAIN_PASSWORD} 2>&1 | grep "OBF:"` + export TRUSTSTORE_PASSWORD=`java -cp ${JETTY_UTIL_JAR} org.eclipse.jetty.util.security.Password ${TRUSTSTORE_PLAIN_PASSWORD} 2>&1 | grep "OBF:"` echo "KEYSTORE_PASSWORD=${KEYSTORE_PASSWORD}" >> {{ .Values.certInitializer.appMountPath }}/local/mycreds.prop echo "TRUSTSTORE_PASSWORD=${TRUSTSTORE_PASSWORD}" >> {{ .Values.certInitializer.appMountPath }}/local/mycreds.prop image: {{ include "repositoryGenerator.image.jetty" . }} |