Make otel work with Openshift and add Grafana dashboard for Client cr…

…edentials scenario (#384) Relates to #372
keycloak · Jun 27, 2023 · d71e094 · d71e094
1 parent 32339f9
commit d71e094
Show file tree

Hide file tree

Showing 7 changed files with 463 additions and 22 deletions.
diff --git a/.github/actions/keycloak-create-deployment/action.yml b/.github/actions/keycloak-create-deployment/action.yml
@@ -24,6 +24,9 @@ inputs:
     description: 'Keycloak pod CPU limit'
   heapMaxSizeMB:
     description: 'Keycloak server maximum Java heap size (in MB)'
+  otel:
+    description: 'Enable OpenTelemetry'
+    default: 'true'
 
 runs:
   using: "composite"
@@ -45,3 +48,4 @@ runs:
         KC_CPU_REQUESTS: ${{ inputs.podCpuRequests }}
         KC_CPU_LIMITS: ${{ inputs.podCpuLimit }}
         KC_HEAP_MAX_MB: ${{ inputs.heapMaxSizeMB }}
+        KC_OTEL: ${{ inputs.otel }}
diff --git a/provision/common/Taskfile.yaml b/provision/common/Taskfile.yaml
@@ -88,6 +88,7 @@ tasks:
       - test "{{.KC_METASPACE_INIT_MB}}" == "$(cat .task/var-KC_METASPACE_INIT_MB)"
       - test "{{.KC_METASPACE_MAX_MB}}" == "$(cat .task/var-KC_METASPACE_MAX_MB)"
       - test "{{.KC_CUSTOM_INFINISPAN_CONFIG}}" == "$(cat .task/var-KC_CUSTOM_INFINISPAN_CONFIG)"
+      - test "{{.KC_DISABLE_STICKY_SESSION}}" == "$(cat .task/var-KC_DISABLE_STICKY_SESSION)"
 
   mvnw:
     dir: ../..

diff --git a/provision/minikube/keycloak/templates/keycloak.yaml b/provision/minikube/keycloak/templates/keycloak.yaml
@@ -136,6 +136,7 @@ spec:
               # https://github.com/open-telemetry/opentelemetry-java/blob/main/sdk-extensions/autoconfigure/README.md
               - name: OTEL_RESOURCE_ATTRIBUTES
                 value: service.name=keycloak
+              {{ if ne .Values.environment "openshift" }}
               - name: OTEL_TRACES_EXPORTER
                 # with otel+tempo 1.4.1 forwarding of traces works, but searching is not returning all values for now, for example delete users was missing
                 value: jaeger
@@ -145,6 +146,7 @@ spec:
                 value: parentbased_traceidratio # always_on, parentbased_traceidratio, ...
               - name: OTEL_TRACES_SAMPLER_ARG
                 value: {{ .Values.otelSamplingPercentage | quote }}
+              {{ end }}
               - name: OTEL_METRICS_EXPORTER
                 value: prometheus
 {{ end }}

diff --git a/provision/minikube/keycloak/templates/otel-pvc.yaml b/provision/minikube/keycloak/templates/otel-pvc.yaml
@@ -12,6 +12,10 @@ spec:
   resources:
     requests:
       storage: 100Mi
+  {{ if eq .Values.environment "openshift" }}
+  storageClassName: efs-sc
+  {{ else }}
   storageClassName: standard
+  {{ end }}
   volumeMode: Filesystem
 {{end}}