Skip to content

Commit 0d1af3d

Browse files
kabicinkabicin
committed
Rebase to 23.0.0.5
1 parent 1cc6c10 commit 0d1af3d

File tree

9 files changed

+24
-6
lines changed

9 files changed

+24
-6
lines changed

Diff for: ‎releases/22.0.0.12/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml

+1
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"/>

Diff for: ‎releases/22.0.0.12/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<server>
22
<httpSessionCache libraryRef="InfinispanLib">
3-
<properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT}"/>
3+
<properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT};${INFINISPAN_SERVICE_NAME_ORIGINAL}:${INFINISPAN_PORT}"/>
44
<properties infinispan.client.hotrod.marshaller="org.infinispan.commons.marshall.JavaSerializationMarshaller"/>
55
<properties infinispan.client.hotrod.java_serial_whitelist=".*"/>
66
<properties infinispan.client.hotrod.auth_username="${INFINISPAN_USER}"/>
77
<properties infinispan.client.hotrod.auth_password="${INFINISPAN_PASS}"/>
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>
12-
<httpSessionCache enableBetaSupportForInfinispan="true"/> <!-- TODO remove once no longer gated -->
1313
<library id="InfinispanLib">
1414
<fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>
1515
</library>

Diff for: ‎releases/23.0.0.5/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
<feature>sessionCache-1.0</feature>
44
</featureManager>
55
<httpSessionCache libraryRef="InfinispanLib">
6-
<properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT}"/>
6+
<properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT};${INFINISPAN_SERVICE_NAME_ORIGINAL}:${INFINISPAN_PORT}"/>
77
<properties infinispan.client.hotrod.marshaller="org.infinispan.commons.marshall.JavaSerializationMarshaller"/>
88
<properties infinispan.client.hotrod.java_serial_whitelist=".*"/>
99
<properties infinispan.client.hotrod.auth_username="${INFINISPAN_USER}"/>
1010
<properties infinispan.client.hotrod.auth_password="${INFINISPAN_PASS}"/>
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>
15-
<httpSessionCache enableBetaSupportForInfinispan="true"/> <!-- TODO remove once no longer gated -->
1616
<library id="InfinispanLib">
1717
<fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>
1818
</library>

Diff for: ‎releases/23.0.0.5/full/helpers/build/infinispan-client-setup.sh

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ fi
55

66
set -Eeox pipefail
77

8+
yum module enable -y maven:3.6
89
yum update -y
910
yum install -y maven
1011
mkdir -p /opt/ol/wlp/usr/shared/resources/infinispan

Diff for: ‎releases/23.0.0.5/full/helpers/runtime/docker-server.sh

+7
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@ importKeyCert
100100
# Infinispan Session Caching
101101
if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
102102
echo "INFINISPAN_SERVICE_NAME(original): ${INFINISPAN_SERVICE_NAME}"
103+
INFINISPAN_SERVICE_NAME_ORIGINAL=${INFINISPAN_SERVICE_NAME}
104+
export INFINISPAN_SERVICE_NAME_ORIGINAL
103105
INFINISPAN_SERVICE_NAME=$(echo ${INFINISPAN_SERVICE_NAME} | sed 's/-/_/g' | sed 's/./\U&/g')
104106
echo "INFINISPAN_SERVICE_NAME(normalized): ${INFINISPAN_SERVICE_NAME}"
105107

@@ -124,6 +126,11 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
124126
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')
125127
fi
126128
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}"
127134
fi
128135

129136

Diff for: ‎releases/23.0.0.5/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<server>
22
<httpSessionCache libraryRef="InfinispanLib">
3-
<properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT}"/>
3+
<properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT};${INFINISPAN_SERVICE_NAME_ORIGINAL}:${INFINISPAN_PORT}"/>
44
<properties infinispan.client.hotrod.marshaller="org.infinispan.commons.marshall.JavaSerializationMarshaller"/>
55
<properties infinispan.client.hotrod.java_serial_whitelist=".*"/>
66
<properties infinispan.client.hotrod.auth_username="${INFINISPAN_USER}"/>
77
<properties infinispan.client.hotrod.auth_password="${INFINISPAN_PASS}"/>
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>
12-
<httpSessionCache enableBetaSupportForInfinispan="true"/> <!-- TODO remove once no longer gated -->
1313
<library id="InfinispanLib">
1414
<fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>
1515
</library>

Diff for: ‎releases/23.0.0.5/kernel-slim/helpers/build/infinispan-client-setup.sh

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ fi
55

66
set -Eeox pipefail
77

8+
yum module enable -y maven:3.6
89
yum update -y
910
yum install -y maven
1011
mkdir -p /opt/ol/wlp/usr/shared/resources/infinispan

Diff for: ‎releases/23.0.0.5/kernel-slim/helpers/runtime/docker-server.sh

+7
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@ importKeyCert
100100
# Infinispan Session Caching
101101
if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
102102
echo "INFINISPAN_SERVICE_NAME(original): ${INFINISPAN_SERVICE_NAME}"
103+
INFINISPAN_SERVICE_NAME_ORIGINAL=${INFINISPAN_SERVICE_NAME}
104+
export INFINISPAN_SERVICE_NAME_ORIGINAL
103105
INFINISPAN_SERVICE_NAME=$(echo ${INFINISPAN_SERVICE_NAME} | sed 's/-/_/g' | sed 's/./\U&/g')
104106
echo "INFINISPAN_SERVICE_NAME(normalized): ${INFINISPAN_SERVICE_NAME}"
105107

@@ -124,6 +126,11 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
124126
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')
125127
fi
126128
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}"
127134
fi
128135

129136

Diff for: ‎releases/latest/beta/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml

+1
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"/>

0 commit comments

Comments
 (0)