Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(#61) Haproxy database ispn upgrade 22.0.5 #62

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(#61) Haproxy database ispn upgrade 22.0.5 #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7aa410
keycloak: update keycloakx version to 22.0.5
daviddelannoy Nov 17, 2023
73297fe
fix(#61): upgrade ISPN to 14.0.17.Final for KC 22.0.5
daviddelannoy Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 49 additions & 47 deletions deployments/local/clusterx/haproxy-database-ispn/cache-ispn-database.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,101 +17,103 @@
-->

<infinispan
xmlns="urn:infinispan:config:13.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:infinispan:config:13.0 https://www.infinispan.org/schemas/infinispan-config-13.0.xsd">
xmlns="urn:infinispan:config:14.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:infinispan:config:14.0 https://www.infinispan.org/schemas/infinispan-config-14.0.xsd">

<cache-container name="keycloak">
<transport lock-timeout="60000"/>
<transport lock-timeout="60000" />
<local-cache name="realms">
<encoding>
<key media-type="application/x-java-object"/>
<value media-type="application/x-java-object"/>
<key media-type="application/x-java-object" />
<value media-type="application/x-java-object" />
</encoding>
<memory max-count="10000"/>
<memory max-count="10000" />
</local-cache>
<local-cache name="users">
<encoding>
<key media-type="application/x-java-object"/>
<value media-type="application/x-java-object"/>
<key media-type="application/x-java-object" />
<value media-type="application/x-java-object" />
</encoding>
<memory max-count="10000"/>
<memory max-count="10000" />
</local-cache>
<distributed-cache name="sessions" owners="2">
<expiration/>
<expiration />
<persistence>
<string-keyed-jdbc-store xmlns="urn:infinispan:config:store:jdbc:13.0" dialect="POSTGRES">
<string-keyed-jdbc-store xmlns="urn:infinispan:config:store:jdbc:14.0"
dialect="POSTGRES">
<connection-pool
connection-url="jdbc:postgresql://acme-keycloak-db:5432/keycloak?ApplicationName=keycloak-ispn"
username="keycloak"
password="keycloak"
driver="org.postgresql.Driver"/>
connection-url="jdbc:postgresql://acme-keycloak-db:5432/keycloak?ApplicationName=keycloak-ispn"
username="keycloak"
password="keycloak"
driver="org.postgresql.Driver" />
<string-keyed-table create-on-start="true" prefix="ispn">
<id-column name="id" type="VARCHAR(255)"/>
<data-column name="data" type="bytea"/>
<timestamp-column name="ts" type="BIGINT"/>
<segment-column name="seg" type="INT"/>
<id-column name="id" type="VARCHAR(255)" />
<data-column name="data" type="bytea" />
<timestamp-column name="ts" type="BIGINT" />
<segment-column name="seg" type="INT" />
</string-keyed-table>
</string-keyed-jdbc-store>
</persistence>
</distributed-cache>

<distributed-cache name="clientSessions" owners="2">
<expiration/>
<expiration />
<persistence>
<string-keyed-jdbc-store xmlns="urn:infinispan:config:store:jdbc:13.0" dialect="POSTGRES">
<string-keyed-jdbc-store xmlns="urn:infinispan:config:store:jdbc:14.0"
dialect="POSTGRES">
<connection-pool
connection-url="jdbc:postgresql://acme-keycloak-db:5432/keycloak?ApplicationName=keycloak-ispn"
username="keycloak"
password="keycloak"
driver="org.postgresql.Driver"/>
connection-url="jdbc:postgresql://acme-keycloak-db:5432/keycloak?ApplicationName=keycloak-ispn"
username="keycloak"
password="keycloak"
driver="org.postgresql.Driver" />
<string-keyed-table create-on-start="true" prefix="ispn">
<id-column name="id" type="VARCHAR(255)"/>
<data-column name="data" type="bytea"/>
<timestamp-column name="ts" type="BIGINT"/>
<segment-column name="seg" type="INT"/>
<id-column name="id" type="VARCHAR(255)" />
<data-column name="data" type="bytea" />
<timestamp-column name="ts" type="BIGINT" />
<segment-column name="seg" type="INT" />
</string-keyed-table>
</string-keyed-jdbc-store>
</persistence>
</distributed-cache>

<distributed-cache name="authenticationSessions" owners="2">
<expiration/>
<expiration />
</distributed-cache>
<distributed-cache name="offlineSessions" owners="2">
<expiration/>
<expiration />
</distributed-cache>
<distributed-cache name="offlineClientSessions" owners="2">
<expiration lifespan="-1"/>
<expiration lifespan="-1" />
</distributed-cache>
<distributed-cache name="loginFailures" owners="2">
<expiration lifespan="-1"/>
<expiration lifespan="-1" />
</distributed-cache>
<local-cache name="authorization">
<encoding>
<key media-type="application/x-java-object"/>
<value media-type="application/x-java-object"/>
<key media-type="application/x-java-object" />
<value media-type="application/x-java-object" />
</encoding>
<memory max-count="10000"/>
<memory max-count="10000" />
</local-cache>
<replicated-cache name="work">
<expiration lifespan="-1"/>
<expiration lifespan="-1" />
</replicated-cache>
<local-cache name="keys">
<encoding>
<key media-type="application/x-java-object"/>
<value media-type="application/x-java-object"/>
<key media-type="application/x-java-object" />
<value media-type="application/x-java-object" />
</encoding>
<expiration max-idle="3600000"/>
<memory max-count="1000"/>
<expiration max-idle="3600000" />
<memory max-count="1000" />
</local-cache>
<distributed-cache name="actionTokens" owners="2">
<encoding>
<key media-type="application/x-java-object"/>
<value media-type="application/x-java-object"/>
<key media-type="application/x-java-object" />
<value media-type="application/x-java-object" />
</encoding>
<expiration max-idle="-1" lifespan="-1" interval="300000"/>
<memory max-count="-1"/>
<expiration max-idle="-1" lifespan="-1" interval="300000" />
<memory max-count="-1" />
</distributed-cache>
</cache-container>
</infinispan>
</infinispan>
8 changes: 4 additions & 4 deletions deployments/local/clusterx/haproxy-database-ispn/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ services:
volumes:
- ./cache-ispn-database.xml:/opt/keycloak/conf/cache-ispn-database.xml:z
- ./patch/keycloak-model-infinispan-20.0.1.jar:/opt/keycloak/lib/lib/main/org.keycloak.keycloak-model-infinispan-20.0.1.jar:z
- ./lib/infinispan-cachestore-jdbc-common-13.0.10.Final.jar:/opt/keycloak/providers/infinispan-cachestore-jdbc-common.jar:z
- ./lib/infinispan-cachestore-jdbc-13.0.10.Final.jar:/opt/keycloak/providers/infinispan-cachestore-jdbc.jar:z
- ./lib/infinispan-cachestore-jdbc-common-jakarta-14.0.17.Final:/opt/keycloak/providers/infinispan-cachestore-jdbc-common-jakarta.jar:z
- ./lib/infinispan-cachestore-jdbc-14.0.17.Final.jar:/opt/keycloak/providers/infinispan-cachestore-jdbc.jar:z
command:
- "--verbose"
- "start"
Expand Down Expand Up @@ -55,8 +55,8 @@ services:
volumes:
- ./cache-ispn-database.xml:/opt/keycloak/conf/cache-ispn-database.xml:z
- ./patch/keycloak-model-infinispan-20.0.1.jar:/opt/keycloak/lib/lib/main/org.keycloak.keycloak-model-infinispan-20.0.1.jar:z
- ./lib/infinispan-cachestore-jdbc-common-13.0.10.Final.jar:/opt/keycloak/providers/infinispan-cachestore-jdbc-common.jar:z
- ./lib/infinispan-cachestore-jdbc-13.0.10.Final.jar:/opt/keycloak/providers/infinispan-cachestore-jdbc.jar:z
- ./lib/infinispan-cachestore-jdbc-common-jakarta-14.0.17.Final:/opt/keycloak/providers/infinispan-cachestore-jdbc-common-jakarta.jar:z
- ./lib/infinispan-cachestore-jdbc-14.0.17.Final.jar:/opt/keycloak/providers/infinispan-cachestore-jdbc.jar:z
command:
- "--verbose"
- "start"
Expand Down
Binary file removed ...nts/local/clusterx/haproxy-database-ispn/lib/infinispan-cachestore-jdbc-13.0.10.Final.jar
View file
Open in desktop
Binary file not shown.
Binary file added ...nts/local/clusterx/haproxy-database-ispn/lib/infinispan-cachestore-jdbc-14.0.17.Final.jar
View file
Open in desktop
Binary file not shown.
Binary file removed ...al/clusterx/haproxy-database-ispn/lib/infinispan-cachestore-jdbc-common-13.0.10.Final.jar
View file
Open in desktop
Binary file not shown.
Binary file added ...erx/haproxy-database-ispn/lib/infinispan-cachestore-jdbc-common-jakarta-14.0.17.Final.jar
View file
Open in desktop
Binary file not shown.
3 changes: 2 additions & 1 deletion deployments/local/clusterx/keycloakx/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM quay.io/keycloak/keycloak:20.0.3
ARG KEYCLOAK_VERSION=22.0.5
FROM quay.io/keycloak/keycloak:$KEYCLOAK_VERSION

USER 0

Expand Down