Skip to content

Commit 7f1da65

Browse files
committed
Set Infinispan truststore to use OpenShift Service CA by default
1 parent 46833d4 commit 7f1da65

8 files changed

Lines changed: 24 additions & 0 deletions

File tree

releases/24.0.0.12/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<properties infinispan.client.hotrod.auth_realm="default"/>
1212
<properties infinispan.client.hotrod.sasl_mechanism="DIGEST-MD5"/>
1313
<properties infinispan.client.hotrod.auth_server_name="infinispan"/>
14+
<properties infinispan.client.hotrod.trust_store_path="${INFINISPAN_TRUST_STORE_PATH}"/>
1415
</httpSessionCache>
1516
<library id="InfinispanLib">
1617
<fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>

releases/24.0.0.12/full/helpers/runtime/docker-server.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,11 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
126126
export INFINISPAN_PASS=$(cat ${LIBERTY_INFINISPAN_SECRET_DIR:=/platform/bindings/infinispan/secret}/identities.yaml | grep -m 1 password | sed 's/password://' | sed 's/[[:space:]]*//g')
127127
fi
128128
echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
129+
130+
if [[ -z "$INFINISPAN_TRUST_STORE_PATH" ]]; then
131+
export INFINISPAN_TRUST_STORE_PATH="/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt"
132+
fi
133+
echo "INFINISPAN_TRUST_STORE_PATH: ${INFINISPAN_TRUST_STORE_PATH}"
129134
fi
130135

131136

releases/24.0.0.12/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<properties infinispan.client.hotrod.auth_realm="default"/>
99
<properties infinispan.client.hotrod.sasl_mechanism="DIGEST-MD5"/>
1010
<properties infinispan.client.hotrod.auth_server_name="infinispan"/>
11+
<properties infinispan.client.hotrod.trust_store_path="${INFINISPAN_TRUST_STORE_PATH}"/>
1112
</httpSessionCache>
1213
<library id="InfinispanLib">
1314
<fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>

releases/24.0.0.12/kernel-slim/helpers/runtime/docker-server.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,11 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
126126
export INFINISPAN_PASS=$(cat ${LIBERTY_INFINISPAN_SECRET_DIR:=/platform/bindings/infinispan/secret}/identities.yaml | grep -m 1 password | sed 's/password://' | sed 's/[[:space:]]*//g')
127127
fi
128128
echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
129+
130+
if [[ -z "$INFINISPAN_TRUST_STORE_PATH" ]]; then
131+
export INFINISPAN_TRUST_STORE_PATH="/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt"
132+
fi
133+
echo "INFINISPAN_TRUST_STORE_PATH: ${INFINISPAN_TRUST_STORE_PATH}"
129134
fi
130135

131136

releases/latest/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<properties infinispan.client.hotrod.auth_realm="default"/>
1212
<properties infinispan.client.hotrod.sasl_mechanism="DIGEST-MD5"/>
1313
<properties infinispan.client.hotrod.auth_server_name="infinispan"/>
14+
<properties infinispan.client.hotrod.trust_store_path="${INFINISPAN_TRUST_STORE_PATH}"/>
1415
</httpSessionCache>
1516
<library id="InfinispanLib">
1617
<fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>

releases/latest/full/helpers/runtime/docker-server.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,11 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
126126
export INFINISPAN_PASS=$(cat ${LIBERTY_INFINISPAN_SECRET_DIR:=/platform/bindings/infinispan/secret}/identities.yaml | grep -m 1 password | sed 's/password://' | sed 's/[[:space:]]*//g')
127127
fi
128128
echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
129+
130+
if [[ -z "$INFINISPAN_TRUST_STORE_PATH" ]]; then
131+
export INFINISPAN_TRUST_STORE_PATH="/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt"
132+
fi
133+
echo "INFINISPAN_TRUST_STORE_PATH: ${INFINISPAN_TRUST_STORE_PATH}"
129134
fi
130135

131136

releases/latest/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<properties infinispan.client.hotrod.auth_realm="default"/>
1212
<properties infinispan.client.hotrod.sasl_mechanism="DIGEST-MD5"/>
1313
<properties infinispan.client.hotrod.auth_server_name="infinispan"/>
14+
<properties infinispan.client.hotrod.trust_store_path="${INFINISPAN_TRUST_STORE_PATH}"/>
1415
</httpSessionCache>
1516
<library id="InfinispanLib">
1617
<fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>

releases/latest/kernel-slim/helpers/runtime/docker-server.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,11 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
126126
export INFINISPAN_PASS=$(cat ${LIBERTY_INFINISPAN_SECRET_DIR:=/platform/bindings/infinispan/secret}/identities.yaml | grep -m 1 password | sed 's/password://' | sed 's/[[:space:]]*//g')
127127
fi
128128
echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
129+
130+
if [[ -z "$INFINISPAN_TRUST_STORE_PATH" ]]; then
131+
export INFINISPAN_TRUST_STORE_PATH="/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt"
132+
fi
133+
echo "INFINISPAN_TRUST_STORE_PATH: ${INFINISPAN_TRUST_STORE_PATH}"
129134
fi
130135

131136

0 commit comments

Comments
 (0)