Use new Infinispan config options (#706)

* Use new KC operator config option for specifying ISPN config file

Closes #704

Signed-off-by: Michal Hajas <mhajas@redhat.com>

* Reapply "Replace jboss.site.name env variable with spi option"

Closes #704
This reverts commit 3d0a7ed.

Signed-off-by: Michal Hajas <mhajas@redhat.com>

---------

Signed-off-by: Michal Hajas <mhajas@redhat.com>

provision/minikube/keycloak/templates/keycloak.yaml

@@ -46,13 +46,14 @@ spec:
   features:
     enabled:
       - multi-site # <2>
-  # tag::keycloak-ispn[]
-  additionalOptions:
 {{- if .Values.infinispan.customConfig }}
-    - name: cache-config-file # <1>
-      value: {{ base .Values.infinispan.configFile }}
-  # end::keycloak-ispn[]
+  cache:
+    configMapFile:
+        name: kcb-infinispan-cache-config
+        key: {{ base .Values.infinispan.configFile }}
 {{- end }}
+  # tag::keycloak-ispn[]
+  additionalOptions:
 {{ if or (eq .Values.database "infinispan") (eq .Values.database "postgres+infinispan") }}
     - name: storage-hotrod-host
       value: infinispan
@@ -95,6 +96,10 @@ spec:
       secret:
         name: remote-store-secret
         key: password
+{{- if .Values.infinispan.site }}
+    - name: spi-connections-infinispan-quarkus-site-name
+      value: {{ .Values.infinispan.site }}
+{{- end }}
     # end::keycloak-ispn[]
 {{- end }}
 {{- if .Values.infinispan.jgroupsTls }}
@@ -218,9 +223,6 @@ spec:
 {{- if .Values.cryostat }}
                   -Dcom.sun.management.jmxremote.port=9091 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false
 {{- end }}
-{{- if .Values.infinispan.site }}
-                  -Djboss.site.name={{.Values.infinispan.site}}
-{{- end }}
 # end::keycloak[]
 # end::keycloak-ispn[]
             ports:
@@ -258,13 +260,6 @@ spec:
             #       - 'true'
             # tag::keycloak-ispn[]
             volumeMounts:
-{{ if .Values.infinispan.customConfig }}
-              - name: kcb-infinispan-cache-config # <4>
-                mountPath: /opt/keycloak/conf/{{ base .Values.infinispan.configFile }}
-                subPath: {{ base .Values.infinispan.configFile }}
-                readOnly: true
-                # end::keycloak-ispn[]
-{{ end }}
               - name: keycloak-providers
                 mountPath: /opt/keycloak/providers
                 readOnly: true
@@ -280,15 +275,6 @@ spec:
 {{ end }}
         # tag::keycloak-ispn[]
         volumes:
-{{ if .Values.infinispan.customConfig }}
-          - name: kcb-infinispan-cache-config # <6>
-            configMap:
-              name: kcb-infinispan-cache-config
-              items:
-                - key: {{base .Values.infinispan.configFile}}
-                  path: {{base .Values.infinispan.configFile}}
-            # end::keycloak-ispn[]
-{{ end }}
           - name: keycloak-providers
             configMap:
               name: keycloak-providers