HA guide changes (#931)

* HA guide changes * Replace stonith with fencing Signed-off-by: Michal Hajas <mhajas@redhat.com>
keycloak · Aug 20, 2024 · 694b199 · 694b199
1 parent bb3653b
commit 694b199
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 28 deletions.
diff --git a/doc/kubernetes/collector/build.sh b/doc/kubernetes/collector/build.sh
@@ -16,6 +16,13 @@ helm template --debug ${STARTDIR}/../../../provision/minikube/keycloak \
   --set dbUrl=\<AWS_AURORA_URL_HERE\> \
   --set keycloakImage=\<KEYCLOAK_IMAGE_HERE\> \
   --set useAWSJDBCWrapper=true \
+  --set multiSite=true \
+  --set keycloakDocumentation=true \
+  --set infinispan.customConfig=false \
+  --set infinispan.remoteStore.enabled=false \
+  --set infinispan.remoteStore.host=infinispan.keycloak.svc \
+  --set infinispan.remoteStore.password=secure_password \
+  --set infinispan.site=keycloak \
   --set jvmDebug=false \
   --set cryostat=false \
   --set instances=3 \
@@ -39,6 +46,7 @@ helm template --debug ${STARTDIR}/../../../provision/minikube/keycloak \
   --set dbUrl=\<AWS_AURORA_URL_HERE\> \
   --set keycloakImage=\<KEYCLOAK_IMAGE_HERE\> \
   --set useAWSJDBCWrapper=true \
+  --set multiSite=true \
   --set jvmDebug=false \
   --set cryostat=false \
   --set heapInitMB=64 \

diff --git a/provision/infinispan/Utils.yaml b/provision/infinispan/Utils.yaml
@@ -111,7 +111,6 @@ tasks:
         --set alertmanager.webhook.url={{ .ACCELERATOR_WEBHOOK_URL }}
         --set alertmanager.webhook.username={{ .ACCELERATOR_WEBHOOK_USERNAME }}
         --set alertmanager.webhook.password={{ .ACCELERATOR_WEBHOOK_PASSWORD }}
-        {{if eq .KC_KC25_MODE "true"}}--values ispn-helm/kc-25-caches.yaml{{end}}
         ./ispn-helm
     preconditions:
       - test -f ".task/kubecfg/{{.ROSA_CLUSTER_NAME}}"

diff --git a/provision/infinispan/ispn-helm/kc-25-caches.yaml b/provision/infinispan/ispn-helm/kc-25-caches.yaml
diff --git a/provision/infinispan/ispn-helm/templates/infinispan-alerts.yaml b/provision/infinispan/ispn-helm/templates/infinispan-alerts.yaml
@@ -1,5 +1,5 @@
 {{ if .Values.acceleratorDNS }}
-# tag::stonith-secret[]
+# tag::fencing-secret[]
 apiVersion: v1
 kind: Secret
 type: kubernetes.io/basic-auth
@@ -8,9 +8,9 @@ metadata:
 stringData:
   username: '{{ .Values.alertmanager.webhook.username }}' # <1>
   password: '{{ .Values.alertmanager.webhook.password }}' # <2>
-# end::stonith-secret[]
+# end::fencing-secret[]
 ---
-# tag::stonith-alert-manager-config[]
+# tag::fencing-alert-manager-config[]
 apiVersion: monitoring.coreos.com/v1beta1
 kind: AlertmanagerConfig
 metadata:
@@ -40,9 +40,9 @@ spec:
                 name: webhook-credentials
             tlsConfig:
               insecureSkipVerify: true
-# end::stonith-alert-manager-config[]
+# end::fencing-alert-manager-config[]
 ---
-# tag::stonith-prometheus-rule[]
+# tag::fencing-prometheus-rule[]
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
@@ -57,5 +57,5 @@ spec:
             severity: critical
             reporter: {{ .Values.crossdc.local.name }} # <5>
             accelerator: {{ .Values.acceleratorDNS }} # <6>
-# end::stonith-prometheus-rule[]
+# end::fencing-prometheus-rule[]
 {{ end }}
diff --git a/provision/minikube/keycloak/templates/keycloak.yaml b/provision/minikube/keycloak/templates/keycloak.yaml
@@ -87,14 +87,12 @@ spec:
     - name: tracing-sampler-type
       value: "parentbased_traceidratio"
     {{- end }}
-    {{- if .Values.persistentSessions }}
-    - name: spi-user-sessions-infinispan-use-caches
-      value: "false"
-    {{- end }}
+    # end::keycloak[]
     - name: http-metrics-histograms-enabled
       value: 'true'
     - name: http-metrics-slos
       value: '5,10,25,50,250,500'
+    # tag::keycloak[]
 {{- if or (eq .Values.database "infinispan") (eq .Values.database "postgres+infinispan") }}
     - name: storage-hotrod-host
       value: infinispan
@@ -145,6 +143,27 @@ spec:
     {{ end }}
     # end::keycloak-ispn[]
 {{- end }}
+{{- if .Values.keycloakDocumentation }}
+    # end::keycloak[]
+    # This block is just for documentation purposes as we need both versions of Infinispan config, with and without numbers to corresponding options
+    # tag::keycloak[]
+    - name: cache-remote-host
+      value: {{ quote .Values.infinispan.remoteStore.host }}
+    - name: cache-remote-port
+      value: {{ quote .Values.infinispan.remoteStore.port }}
+    - name: cache-remote-username
+      secret:
+        name: remote-store-secret
+        key: username
+    - name: cache-remote-password
+      secret:
+        name: remote-store-secret
+        key: password
+    {{- if .Values.infinispan.site }}
+    - name: spi-connections-infinispan-quarkus-site-name
+      value: {{ .Values.infinispan.site }}
+    {{ end }}
+{{- end }}
 {{- if .Values.infinispan.jgroupsTls }}
     - name: cache-embedded-mtls-enabled
       value: "true"

diff --git a/provision/minikube/keycloak/values.yaml b/provision/minikube/keycloak/values.yaml
@@ -41,6 +41,7 @@ predefinedAdmin: true
 persistentSessions: false
 externalInfinispan: false
 multiSite: false
+keycloakDocumentation: false
 infinispan:
   jgroupsTls: false
   customConfig: false