Skip to content

Commit 6b96aa6

Browse files
kabicinkabicin
committed
Move infinispan changes to 22.0.0.10
1 parent 9381d3b commit 6b96aa6

File tree

12 files changed

+24
-24
lines changed

12 files changed

+24
-24
lines changed

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

Lines changed: 2 additions & 2 deletions
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>

‎releases/22.0.0.10/full/helpers/build/infinispan-client-setup.sh‎

Lines changed: 1 addition & 0 deletions
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

‎releases/22.0.0.10/full/helpers/runtime/docker-server.sh‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ importKeyCert
7878
# Infinispan Session Caching
7979
if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
8080
echo "INFINISPAN_SERVICE_NAME(original): ${INFINISPAN_SERVICE_NAME}"
81+
INFINISPAN_SERVICE_NAME_ORIGINAL=${INFINISPAN_SERVICE_NAME}
82+
export INFINISPAN_SERVICE_NAME_ORIGINAL
8183
INFINISPAN_SERVICE_NAME=$(echo ${INFINISPAN_SERVICE_NAME} | sed 's/-/_/g' | sed 's/./\U&/g')
8284
echo "INFINISPAN_SERVICE_NAME(normalized): ${INFINISPAN_SERVICE_NAME}"
8385

@@ -102,6 +104,11 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
102104
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')
103105
fi
104106
echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
107+
108+
if [[ -z "$INFINISPAN_TRUST_STORE_PATH" ]]; then
109+
export INFINISPAN_TRUST_STORE_PATH="/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt"
110+
fi
111+
echo "INFINISPAN_TRUST_STORE_PATH: ${INFINISPAN_TRUST_STORE_PATH}"
105112
fi
106113

107114

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

Lines changed: 2 additions & 2 deletions
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>

‎releases/22.0.0.10/kernel-slim/helpers/build/infinispan-client-setup.sh‎

Lines changed: 1 addition & 0 deletions
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

‎releases/22.0.0.10/kernel-slim/helpers/runtime/docker-server.sh‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ importKeyCert
7878
# Infinispan Session Caching
7979
if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
8080
echo "INFINISPAN_SERVICE_NAME(original): ${INFINISPAN_SERVICE_NAME}"
81+
INFINISPAN_SERVICE_NAME_ORIGINAL=${INFINISPAN_SERVICE_NAME}
82+
export INFINISPAN_SERVICE_NAME_ORIGINAL
8183
INFINISPAN_SERVICE_NAME=$(echo ${INFINISPAN_SERVICE_NAME} | sed 's/-/_/g' | sed 's/./\U&/g')
8284
echo "INFINISPAN_SERVICE_NAME(normalized): ${INFINISPAN_SERVICE_NAME}"
8385

@@ -102,6 +104,11 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
102104
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')
103105
fi
104106
echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
107+
108+
if [[ -z "$INFINISPAN_TRUST_STORE_PATH" ]]; then
109+
export INFINISPAN_TRUST_STORE_PATH="/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt"
110+
fi
111+
echo "INFINISPAN_TRUST_STORE_PATH: ${INFINISPAN_TRUST_STORE_PATH}"
105112
fi
106113

107114

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

Lines changed: 2 additions & 2 deletions
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};${INFINISPAN_SERVICE_NAME_ORIGINAL}:${INFINISPAN_PORT}"/>
6+
<properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${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}"/>
1514
</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>

‎releases/22.0.0.9/full/helpers/build/infinispan-client-setup.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ fi
55

66
set -Eeox pipefail
77

8-
yum module enable -y maven:3.6
98
yum update -y
109
yum install -y maven
1110
mkdir -p /opt/ol/wlp/usr/shared/resources/infinispan

‎releases/22.0.0.9/full/helpers/runtime/docker-server.sh‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@ importKeyCert
7878
# Infinispan Session Caching
7979
if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
8080
echo "INFINISPAN_SERVICE_NAME(original): ${INFINISPAN_SERVICE_NAME}"
81-
INFINISPAN_SERVICE_NAME_ORIGINAL=${INFINISPAN_SERVICE_NAME}
82-
export INFINISPAN_SERVICE_NAME_ORIGINAL
8381
INFINISPAN_SERVICE_NAME=$(echo ${INFINISPAN_SERVICE_NAME} | sed 's/-/_/g' | sed 's/./\U&/g')
8482
echo "INFINISPAN_SERVICE_NAME(normalized): ${INFINISPAN_SERVICE_NAME}"
8583

@@ -104,11 +102,6 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
104102
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')
105103
fi
106104
echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
107-
108-
if [[ -z "$INFINISPAN_TRUST_STORE_PATH" ]]; then
109-
export INFINISPAN_TRUST_STORE_PATH="/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt"
110-
fi
111-
echo "INFINISPAN_TRUST_STORE_PATH: ${INFINISPAN_TRUST_STORE_PATH}"
112105
fi
113106

114107

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

Lines changed: 2 additions & 2 deletions
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};${INFINISPAN_SERVICE_NAME_ORIGINAL}:${INFINISPAN_PORT}"/>
3+
<properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${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}"/>
1211
</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>

0 commit comments

Comments
 (0)