Rebase to 23.0.0.5

OpenLiberty · Jun 2, 2023 · 0d1af3d · 0d1af3d
1 parent 1cc6c10
commit 0d1af3d
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 6 deletions.
diff --git a/...es/22.0.0.12/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/...es/22.0.0.12/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
@@ -11,6 +11,7 @@
     <properties infinispan.client.hotrod.auth_realm="default"/>
     <properties infinispan.client.hotrod.sasl_mechanism="DIGEST-MD5"/>
     <properties infinispan.client.hotrod.auth_server_name="infinispan"/>
+    <properties infinispan.client.hotrod.trust_store_path="${INFINISPAN_TRUST_STORE_PATH}"/>
   </httpSessionCache>
   <library id="InfinispanLib">
     <fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>

diff --git a/....0.12/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/....0.12/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
@@ -1,15 +1,15 @@
 <server>
   <httpSessionCache libraryRef="InfinispanLib">
-    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT}"/>
+    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT};${INFINISPAN_SERVICE_NAME_ORIGINAL}:${INFINISPAN_PORT}"/>
     <properties infinispan.client.hotrod.marshaller="org.infinispan.commons.marshall.JavaSerializationMarshaller"/>
     <properties infinispan.client.hotrod.java_serial_whitelist=".*"/>
     <properties infinispan.client.hotrod.auth_username="${INFINISPAN_USER}"/>
     <properties infinispan.client.hotrod.auth_password="${INFINISPAN_PASS}"/>
     <properties infinispan.client.hotrod.auth_realm="default"/>
     <properties infinispan.client.hotrod.sasl_mechanism="DIGEST-MD5"/>
     <properties infinispan.client.hotrod.auth_server_name="infinispan"/>
+    <properties infinispan.client.hotrod.trust_store_path="${INFINISPAN_TRUST_STORE_PATH}"/>
   </httpSessionCache>
-  <httpSessionCache enableBetaSupportForInfinispan="true"/> <!-- TODO remove once no longer gated -->
   <library id="InfinispanLib">
     <fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>
   </library>

diff --git a/...ses/23.0.0.5/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/...ses/23.0.0.5/full/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
@@ -3,16 +3,16 @@
     <feature>sessionCache-1.0</feature>
   </featureManager>
   <httpSessionCache libraryRef="InfinispanLib">
-    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT}"/>
+    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT};${INFINISPAN_SERVICE_NAME_ORIGINAL}:${INFINISPAN_PORT}"/>
     <properties infinispan.client.hotrod.marshaller="org.infinispan.commons.marshall.JavaSerializationMarshaller"/>
     <properties infinispan.client.hotrod.java_serial_whitelist=".*"/>
     <properties infinispan.client.hotrod.auth_username="${INFINISPAN_USER}"/>
     <properties infinispan.client.hotrod.auth_password="${INFINISPAN_PASS}"/>
     <properties infinispan.client.hotrod.auth_realm="default"/>
     <properties infinispan.client.hotrod.sasl_mechanism="DIGEST-MD5"/>
     <properties infinispan.client.hotrod.auth_server_name="infinispan"/>
+    <properties infinispan.client.hotrod.trust_store_path="${INFINISPAN_TRUST_STORE_PATH}"/>
   </httpSessionCache>
-  <httpSessionCache enableBetaSupportForInfinispan="true"/> <!-- TODO remove once no longer gated -->
   <library id="InfinispanLib">
     <fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>
   </library>

diff --git a/releases/23.0.0.5/full/helpers/build/infinispan-client-setup.sh b/releases/23.0.0.5/full/helpers/build/infinispan-client-setup.sh
@@ -5,6 +5,7 @@ fi
 
 set -Eeox pipefail
 
+yum module enable -y maven:3.6
 yum update -y
 yum install -y maven
 mkdir -p /opt/ol/wlp/usr/shared/resources/infinispan

diff --git a/releases/23.0.0.5/full/helpers/runtime/docker-server.sh b/releases/23.0.0.5/full/helpers/runtime/docker-server.sh
@@ -100,6 +100,8 @@ importKeyCert
 # Infinispan Session Caching
 if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_SERVICE_NAME(original): ${INFINISPAN_SERVICE_NAME}"
+ INFINISPAN_SERVICE_NAME_ORIGINAL=${INFINISPAN_SERVICE_NAME}
+ export INFINISPAN_SERVICE_NAME_ORIGINAL
  INFINISPAN_SERVICE_NAME=$(echo ${INFINISPAN_SERVICE_NAME} | sed 's/-/_/g' | sed 's/./\U&/g')
  echo "INFINISPAN_SERVICE_NAME(normalized): ${INFINISPAN_SERVICE_NAME}"
 
@@ -124,6 +126,11 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
   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')
  fi
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
+
+ if [[ -z "$INFINISPAN_TRUST_STORE_PATH" ]]; then
+  export INFINISPAN_TRUST_STORE_PATH="/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt"
+ fi
+ echo "INFINISPAN_TRUST_STORE_PATH: ${INFINISPAN_TRUST_STORE_PATH}"
 fi
 
 

diff --git a/...0.0.5/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/...0.0.5/kernel-slim/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
@@ -1,15 +1,15 @@
 <server>
   <httpSessionCache libraryRef="InfinispanLib">
-    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT}"/>
+    <properties infinispan.client.hotrod.server_list="${INFINISPAN_HOST}:${INFINISPAN_PORT};${INFINISPAN_SERVICE_NAME_ORIGINAL}:${INFINISPAN_PORT}"/>
     <properties infinispan.client.hotrod.marshaller="org.infinispan.commons.marshall.JavaSerializationMarshaller"/>
     <properties infinispan.client.hotrod.java_serial_whitelist=".*"/>
     <properties infinispan.client.hotrod.auth_username="${INFINISPAN_USER}"/>
     <properties infinispan.client.hotrod.auth_password="${INFINISPAN_PASS}"/>
     <properties infinispan.client.hotrod.auth_realm="default"/>
     <properties infinispan.client.hotrod.sasl_mechanism="DIGEST-MD5"/>
     <properties infinispan.client.hotrod.auth_server_name="infinispan"/>
+    <properties infinispan.client.hotrod.trust_store_path="${INFINISPAN_TRUST_STORE_PATH}"/>
   </httpSessionCache>
-  <httpSessionCache enableBetaSupportForInfinispan="true"/> <!-- TODO remove once no longer gated -->
   <library id="InfinispanLib">
     <fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>
   </library>

diff --git a/releases/23.0.0.5/kernel-slim/helpers/build/infinispan-client-setup.sh b/releases/23.0.0.5/kernel-slim/helpers/build/infinispan-client-setup.sh
@@ -5,6 +5,7 @@ fi
 
 set -Eeox pipefail
 
+yum module enable -y maven:3.6
 yum update -y
 yum install -y maven
 mkdir -p /opt/ol/wlp/usr/shared/resources/infinispan

diff --git a/releases/23.0.0.5/kernel-slim/helpers/runtime/docker-server.sh b/releases/23.0.0.5/kernel-slim/helpers/runtime/docker-server.sh
@@ -100,6 +100,8 @@ importKeyCert
 # Infinispan Session Caching
 if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
  echo "INFINISPAN_SERVICE_NAME(original): ${INFINISPAN_SERVICE_NAME}"
+ INFINISPAN_SERVICE_NAME_ORIGINAL=${INFINISPAN_SERVICE_NAME}
+ export INFINISPAN_SERVICE_NAME_ORIGINAL
  INFINISPAN_SERVICE_NAME=$(echo ${INFINISPAN_SERVICE_NAME} | sed 's/-/_/g' | sed 's/./\U&/g')
  echo "INFINISPAN_SERVICE_NAME(normalized): ${INFINISPAN_SERVICE_NAME}"
 
@@ -124,6 +126,11 @@ if [[ -n "$INFINISPAN_SERVICE_NAME" ]]; then
   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')
  fi
  echo "INFINISPAN_PASS: ${INFINISPAN_PASS}"
+
+ if [[ -z "$INFINISPAN_TRUST_STORE_PATH" ]]; then
+  export INFINISPAN_TRUST_STORE_PATH="/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt"
+ fi
+ echo "INFINISPAN_TRUST_STORE_PATH: ${INFINISPAN_TRUST_STORE_PATH}"
 fi
 
 

diff --git a/releases/latest/beta/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml b/releases/latest/beta/helpers/build/configuration_snippets/infinispan-client-sessioncache.xml
@@ -11,6 +11,7 @@
     <properties infinispan.client.hotrod.auth_realm="default"/>
     <properties infinispan.client.hotrod.sasl_mechanism="DIGEST-MD5"/>
     <properties infinispan.client.hotrod.auth_server_name="infinispan"/>
+    <properties infinispan.client.hotrod.trust_store_path="${INFINISPAN_TRUST_STORE_PATH}"/>
   </httpSessionCache>
   <library id="InfinispanLib">
     <fileset dir="${shared.resource.dir}/infinispan" includes="*.jar"/>