Revert "Upgrade to Infinispan 15.0.3.Final"

This reverts commit a43b0d8. This is reverted because we need to wait for community-operators to be released first, otherwise our clusters won't install correct version of Infinispan operator
keycloak · May 10, 2024 · 1be39e9 · 1be39e9
1 parent 139a08d
commit 1be39e9
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 16 deletions.
diff --git a/provision/infinispan/ispn-helm/Chart.yaml b/provision/infinispan/ispn-helm/Chart.yaml
@@ -21,4 +21,4 @@ version: 0.1.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "15.0"
+appVersion: "14.0"
diff --git a/provision/infinispan/ispn-helm/templates/infinispan.yaml b/provision/infinispan/ispn-helm/templates/infinispan.yaml
@@ -22,6 +22,8 @@ data:
       cacheContainer:
         metrics:
           namesAsTags: true
+          gauges: true
+          histograms: {{ .Values.metrics.histograms }}
       server:
         endpoints:
           - securityRealm: default
@@ -55,7 +57,7 @@ spec:
     type: Route
   configMapName: "cluster-config"
   image: {{ .Values.image | default .Values.defaultImage }}
-  version: 15.0.3
+  version: 14.0.27
   configListener:
     enabled: false
   container:

diff --git a/provision/infinispan/ispn-helm/values.yaml b/provision/infinispan/ispn-helm/values.yaml
@@ -3,7 +3,7 @@
 # Declare variables to be passed into your templates.
 
 replicas: 3
-defaultImage: quay.io/infinispan/server:15.0.3.Final
+defaultImage: quay.io/infinispan/server:14.0.27.Final
 cacheDefaults:
   owners: 2
   # SYNC or ASYNC

diff --git a/provision/minikube/keycloak/config/kcb-infinispan-cache-config.xml b/provision/minikube/keycloak/config/kcb-infinispan-cache-config.xml
@@ -18,8 +18,8 @@
 
 <infinispan
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="urn:infinispan:config:15.0 https://www.infinispan.org/schemas/infinispan-config-15.0.xsd"
-        xmlns="urn:infinispan:config:15.0">
+        xsi:schemaLocation="urn:infinispan:config:14.0 https://www.infinispan.org/schemas/infinispan-config-14.0.xsd"
+        xmlns="urn:infinispan:config:14.0">
 
     <cache-container name="keycloak">
         <transport lock-timeout="60000"/>

diff --git a/provision/minikube/keycloak/config/kcb-infinispan-cache-remote-store-config.xml b/provision/minikube/keycloak/config/kcb-infinispan-cache-remote-store-config.xml
@@ -18,9 +18,9 @@
 
 <infinispan
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="urn:infinispan:config:15.0 https://www.infinispan.org/schemas/infinispan-config-15.0.xsd
-            urn:infinispan:config:store:remote:15.0 https://www.infinispan.org/schemas/infinispan-cachestore-remote-config-15.0.xsd"
-        xmlns="urn:infinispan:config:15.0">
+        xsi:schemaLocation="urn:infinispan:config:14.0 https://www.infinispan.org/schemas/infinispan-config-14.0.xsd
+            urn:infinispan:config:store:remote:14.0 https://www.infinispan.org/schemas/infinispan-cachestore-remote-config-14.0.xsd"
+        xmlns="urn:infinispan:config:14.0">
 
     <cache-container name="keycloak">
         <transport lock-timeout="60000"/>
@@ -42,7 +42,7 @@
         <distributed-cache name="sessions" owners="2">
             <expiration lifespan="-1"/>
             <persistence passivation="false"> <!--1-->
-                <remote-store xmlns="urn:infinispan:config:store:remote:15.0"
+                <remote-store xmlns="urn:infinispan:config:store:remote:14.0"
                               cache="sessions"
                               raw-values="true"
                               shared="true"
@@ -70,7 +70,7 @@
         <distributed-cache name="authenticationSessions" owners="2">
             <expiration lifespan="-1"/>
             <persistence passivation="false">
-                <remote-store xmlns="urn:infinispan:config:store:remote:15.0"
+                <remote-store xmlns="urn:infinispan:config:store:remote:14.0"
                               cache="authenticationSessions"
                               raw-values="true"
                               shared="true"
@@ -97,7 +97,7 @@
         <distributed-cache name="offlineSessions" owners="2">
             <expiration lifespan="-1"/>
             <persistence passivation="false">
-                <remote-store xmlns="urn:infinispan:config:store:remote:15.0"
+                <remote-store xmlns="urn:infinispan:config:store:remote:14.0"
                               cache="offlineSessions"
                               raw-values="true"
                               shared="true"
@@ -124,7 +124,7 @@
         <distributed-cache name="clientSessions" owners="2">
             <expiration lifespan="-1"/>
             <persistence passivation="false">
-                <remote-store xmlns="urn:infinispan:config:store:remote:15.0"
+                <remote-store xmlns="urn:infinispan:config:store:remote:14.0"
                               cache="clientSessions"
                               raw-values="true"
                               shared="true"
@@ -150,7 +150,7 @@
         <distributed-cache name="offlineClientSessions" owners="2">
             <expiration lifespan="-1"/>
             <persistence passivation="false">
-                <remote-store xmlns="urn:infinispan:config:store:remote:15.0"
+                <remote-store xmlns="urn:infinispan:config:store:remote:14.0"
                               cache="offlineClientSessions"
                               raw-values="true"
                               shared="true"
@@ -176,7 +176,7 @@
         <distributed-cache name="loginFailures" owners="2">
             <expiration lifespan="-1"/>
             <persistence passivation="false">
-                <remote-store xmlns="urn:infinispan:config:store:remote:15.0"
+                <remote-store xmlns="urn:infinispan:config:store:remote:14.0"
                               cache="loginFailures"
                               raw-values="true"
                               shared="true"
@@ -210,7 +210,7 @@
         <replicated-cache name="work">
             <expiration lifespan="-1"/>
             <persistence passivation="false">
-                <remote-store xmlns="urn:infinispan:config:store:remote:15.0"
+                <remote-store xmlns="urn:infinispan:config:store:remote:14.0"
                               cache="work"
                               raw-values="true"
                               shared="true"
@@ -250,7 +250,7 @@
             <expiration max-idle="-1" lifespan="-1" interval="300000"/>
             <memory max-count="-1"/>
             <persistence passivation="false">
-                <remote-store xmlns="urn:infinispan:config:store:remote:15.0"
+                <remote-store xmlns="urn:infinispan:config:store:remote:14.0"
                               cache="actionTokens"
                               raw-values="true"
                               shared="true"