chore: Move Keycloak CRs from sonar-operator to sonar (#77)

Change-Id: I9446708b21fffb5db98538fecf41360cffc18199
epam · May 7, 2024 · 481fdcc · 481fdcc
1 parent 0479d07
commit 481fdcc
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 1 deletion.
diff --git a/add-ons/sonar/README.md b/add-ons/sonar/README.md
@@ -14,6 +14,7 @@ A Helm chart for Sonarqube
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
+| oidc | object | `{"enabled":false}` | Integration with keycloak |
 | sonarqube.deploymentType | string | `"Deployment"` |  |
 | sonarqube.env[0].name | string | `"SONAR_TELEMETRY_ENABLE"` |  |
 | sonarqube.env[0].value | string | `"false"` |  |

diff --git a/...templates/oidc/keycloak-client-sonar.yaml → ...templates/oidc/keycloak-client-sonar.yaml b/...templates/oidc/keycloak-client-sonar.yaml → ...templates/oidc/keycloak-client-sonar.yaml
@@ -13,7 +13,7 @@ spec:
   realmRef:
     kind: ClusterKeycloakRealm
     name: main
-  webUrl: {{ .Values.sonarUrl }}
+  webUrl: https://{{ (index .Values.sonarqube.ingress.hosts 0).name }}
   protocolMappers:
     - name: roles
       protocol: openid-connect

diff --git a/...es/oidc/realmrolebatch-administrator.yaml → ...es/oidc/realmrolebatch-administrator.yaml b/...es/oidc/realmrolebatch-administrator.yaml → ...es/oidc/realmrolebatch-administrator.yaml
diff --git a/...plates/oidc/realmrolebatch-developer.yaml → ...plates/oidc/realmrolebatch-developer.yaml b/...plates/oidc/realmrolebatch-developer.yaml → ...plates/oidc/realmrolebatch-developer.yaml
diff --git a/add-ons/sonar/values.yaml b/add-ons/sonar/values.yaml
@@ -54,3 +54,8 @@ sonarqube:
     jdbcUsername: "sonar"
     jdbcSecretName: sonar-pguser-sonar
     jdbcSecretPasswordKey: "password"
+
+# -- Integration with keycloak
+oidc:
+  # If set to true, the OIDC resources will be created.
+  enabled: false