Use the new remote-store options (#711)

Signed-off-by: Pedro Ruivo <pruivo@redhat.com>
keycloak · Mar 14, 2024 · 36d4f86 · 36d4f86
1 parent 985a618
commit 36d4f86
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/doc/kubernetes/collector/build.sh b/doc/kubernetes/collector/build.sh
@@ -43,8 +43,7 @@ helm template --debug ${STARTDIR}/../../../provision/minikube/keycloak \
   --set cryostat=false \
   --set heapInitMB=64 \
   --set heapMaxMB=512 \
-  --set infinispan.customConfig=true \
-  --set infinispan.configFile=config/kcb-infinispan-cache-remote-store-config.xml \
+  --set infinispan.customConfig=false \
   --set infinispan.remoteStore.enabled=true \
   --set infinispan.remoteStore.host=infinispan.keycloak.svc \
   --set infinispan.remoteStore.password=secure_password \

diff --git a/provision/minikube/keycloak/templates/keycloak.yaml b/provision/minikube/keycloak/templates/keycloak.yaml
@@ -104,20 +104,20 @@ spec:
       value: {{ div 200 .Values.instances | quote }}
 {{- if .Values.infinispan.remoteStore.enabled }}
     # tag::keycloak-ispn[]
-    - name: remote-store-host # <2>
+    - name: cache-remote-host # <1>
       value: {{ quote .Values.infinispan.remoteStore.host }}
-    - name: remote-store-port # <2>
+    - name: cache-remote-port # <2>
       value: {{ quote .Values.infinispan.remoteStore.port }}
-    - name: remote-store-username # <3>
+    - name: cache-remote-username # <3>
       secret:
         name: remote-store-secret
         key: username
-    - name: remote-store-password # <3>
+    - name: cache-remote-password # <4>
       secret:
         name: remote-store-secret
         key: password
     {{- if .Values.infinispan.site }}
-    - name: spi-connections-infinispan-quarkus-site-name # <4>
+    - name: spi-connections-infinispan-quarkus-site-name # <5>
       value: {{ .Values.infinispan.site }}
     {{ end }}
     # end::keycloak-ispn[]

diff --git a/provision/rosa-cross-dc/Taskfile.yaml b/provision/rosa-cross-dc/Taskfile.yaml
@@ -279,8 +279,7 @@ tasks:
           KC_ADMIN_PASSWORD:
             sh: "aws secretsmanager get-secret-value --region eu-central-1 --secret-id keycloak-master-password --query SecretString --output text --no-cli-pager || echo admin"
           KC_DATABASE: "aurora-postgres"
-          KC_CUSTOM_INFINISPAN_CONFIG: "true"
-          KC_CUSTOM_INFINISPAN_CONFIG_FILE: "config/kcb-infinispan-cache-remote-store-config.xml"
+          KC_CUSTOM_INFINISPAN_CONFIG: "false"
           KC_ISPN_CLUSTER: "infinispan"
           ROSA_CLUSTER_NAME: "{{.ROSA_CLUSTER_NAME}}"