Skip to content

Commit b98fdd3

Browse files
committed
DEVOPS-2787 - Added support for keycloak Custom Resource based on the CRDs and managed by the keycloak operator
1 parent 861addd commit b98fdd3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+8427
-11
lines changed

chart/Chart.yaml

Lines changed: 0 additions & 5 deletions
This file was deleted.

charts/lightrun-helm-chart/Chart.lock

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
dependencies:
2+
- name: lightrun-keycloak-operator
3+
repository: file://../lightrun-keycloak-operator
4+
version: 0.1.0
5+
digest: sha256:7549732d1dcdf3d2ce2cd43e5e2a1adc2722b408f9e5226981fa31ad181be457
6+
generated: "2025-06-20T23:00:11.691147+03:00"

charts/lightrun-helm-chart/Chart.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
apiVersion: v2
2+
name: lightrun-helm-chart
3+
description: Unlock real-time code-level observability with Lightrun
4+
version: 3.18.0
5+
appVersion: main
6+
7+
dependencies:
8+
- name: lightrun-keycloak-operator
9+
version: "0.1.0"
10+
repository: "file://../lightrun-keycloak-operator"
11+
condition: deployments.keycloakOperator.enabled
File renamed without changes.

chart/templates/backend-deployment.yaml renamed to charts/lightrun-helm-chart/templates/backend-deployment.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -248,9 +248,9 @@ spec:
248248
- name: SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER-URI
249249
value: "https://{{ .Values.general.lightrun_endpoint }}/auth/realms/lightrun"
250250
- name: SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK-SET-URI
251-
value: "{{ include "http.scheme" . }}://{{ include "lightrun-keycloak.name" . }}:8080/auth/realms/lightrun/protocol/openid-connect/certs"
251+
value: "{{ include "http.scheme" . }}://{{ include "lightrun-keycloak.serviceName" . }}:8080/auth/realms/lightrun/protocol/openid-connect/certs"
252252
- name: SPRING_SECURITY_KEYCLOAK_URL
253-
value: "{{ include "http.scheme" . }}://{{ include "lightrun-keycloak.name" . }}:8080/auth"
253+
value: "{{ include "http.scheme" . }}://{{ include "lightrun-keycloak.serviceName" . }}:8080/auth"
254254
{{ if or .Values.general.internal_tls.enabled .Values.deployments.redis.encryption.enabled }}
255255
- name: SPRING_REDIS_SSL
256256
value: "true"
@@ -373,7 +373,7 @@ spec:
373373
cpu: "100m"
374374
env:
375375
- name: URL
376-
value: {{ include "http.scheme" . }}://{{ include "lightrun-keycloak.name" . }}:9000/auth/health/started {{ if .Values.general.internal_tls.enabled }}--no-check-certificate{{ end }}
376+
value: {{ include "http.scheme" . }}://{{ include "lightrun-keycloak.serviceName" . }}:9000/auth/health/started {{ if .Values.general.internal_tls.enabled }}--no-check-certificate{{ end }}
377377

378378
{{ if .Values.general.mq.enabled }}
379379
{{- include "lightrun-mq.initContainer.wait-for-rabbitmq" (merge (dict "imageConfig" .Values.deployments.backend.initContainers.wait_for_rabbitmq "securityContext" "lightrun-be.containerSecurityContext") .) | nindent 6 }}

chart/templates/frontend-deployment.yaml renamed to charts/lightrun-helm-chart/templates/frontend-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ spec:
9595
- name: BACKEND_URI
9696
value: {{ include "lightrun-be.name" . }}
9797
- name: KEYCLOAK_URI
98-
value: {{ include "lightrun-keycloak.name" . }}
98+
value: {{ include "lightrun-keycloak.serviceName" . }}
9999
{{- if .Values.deployments.frontend.extraEnvs }}
100100

101101
{{- toYaml .Values.deployments.frontend.extraEnvs | nindent 12 }}

chart/templates/helpers/_helpers.tpl renamed to charts/lightrun-helm-chart/templates/helpers/_helpers.tpl

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,14 @@ Container SecurityContext of lightrun frontend
113113
{{ include "lightrun.fullname" . }}-keycloak
114114
{{- end -}}
115115

116+
{{- define "lightrun-keycloak.serviceName" -}}
117+
{{- if .Values.deployments.keycloak.useKeycloakOperator -}}
118+
{{ include "lightrun-keycloak.name" . }}-service
119+
{{- else -}}
120+
{{ include "lightrun-keycloak.name" . }}
121+
{{- end -}}
122+
{{- end -}}
123+
116124
{{/*
117125
Create the name of the lightrun keycloak service account to use
118126
*/}}

0 commit comments

Comments
 (0)