-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: Bump keycloak-operator version(#38)
* moved mainRealm creation from keycloak values to CR * KeycloakRealmIdentityProvider clientSecret the secret is removed from the value parameters, and taken directly from the secret Jira: EPMDEDP-13111 Related: #38 Change-Id: Idb52bbc00dfb51d0d816335aa3e866354777826b
- Loading branch information
oleksandr_taruraiev
committed
Feb 5, 2024
1 parent
45de974
commit 7e0a462
Showing
17 changed files
with
152 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,21 +1,40 @@ | ||
# extensions-oidc | ||
|
||
![Version: 1.18.1](https://img.shields.io/badge/Version-1.18.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.18.1](https://img.shields.io/badge/AppVersion-1.18.1-informational?style=flat-square) | ||
![Version: 1.20.0](https://img.shields.io/badge/Version-1.20.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.20.0](https://img.shields.io/badge/AppVersion-1.20.0-informational?style=flat-square) | ||
|
||
A Helm chart for extensions-oidc | ||
|
||
``` | ||
+-------------------------+ +-----------------+ | ||
| sharedService | | broker | | ||
| Realm | | Realm | | ||
| +------------------+ | | +-------------+ | | ||
| | idpBroker | | | |sharedService| | | ||
| | identityProvider +---+---+-> Client | | | ||
| +------------------+ | | +-------------+ | | ||
| +----------+ +--------+ | +-----------------+ | ||
| | sonarqube| | nexus | | | ||
| | Client | | Client | | | ||
| +----------+ +--------+ | | ||
+-------------------------+ | ||
``` | ||
|
||
broker - contains a list of users and basic settings, you can install or use a pre-created Realm, for that set the 'create' parameter to 'false' and ununcomment 'existingBroker' provide the name of the existing realm. | ||
|
||
sharedService - contains clients, application integrations, and identity providers for connect to `broker` realm. | ||
|
||
## Requirements | ||
|
||
| Repository | Name | Version | | ||
|------------|------|---------| | ||
| https://epam.github.io/edp-helm-charts/stable | keycloak-operator | 1.18.1 | | ||
| https://epam.github.io/edp-helm-charts/stable | keycloak-operator | 1.20.0 | | ||
|
||
## Values | ||
|
||
| Key | Type | Default | Description | | ||
|-----|------|---------|-------------| | ||
| extensionsOIDC.broker.create | bool | `true` | | | ||
| extensionsOIDC.broker.name | string | `"broker"` | | | ||
| extensionsOIDC.keycloakUrl | string | `"https://keycloak.example.com"` | | | ||
| extensionsOIDC.mainRealm | string | `"openshift"` | | | ||
| extensionsOIDC.mainRealmSecret | string | `""` | | | ||
| extensionsOIDC.sharedService | string | `"shared"` | | | ||
| keycloak-operator.clusterReconciliationEnabled | bool | `true` | | | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
{{ template "chart.header" . }} | ||
{{ template "chart.deprecationWarning" . }} | ||
|
||
{{ template "chart.badgesSection" . }} | ||
|
||
{{ template "chart.description" . }} | ||
|
||
{{ template "chart.homepageLine" . }} | ||
|
||
``` | ||
+-------------------------+ +-----------------+ | ||
| sharedService | | broker | | ||
| Realm | | Realm | | ||
| +------------------+ | | +-------------+ | | ||
| | idpBroker | | | |sharedService| | | ||
| | identityProvider +---+---+-> Client | | | ||
| +------------------+ | | +-------------+ | | ||
| +----------+ +--------+ | +-----------------+ | ||
| | sonarqube| | nexus | | | ||
| | Client | | Client | | | ||
| +----------+ +--------+ | | ||
+-------------------------+ | ||
``` | ||
|
||
broker - contains a list of users and basic settings, you can install or use a pre-created Realm, for that set the 'create' parameter to 'false' and ununcomment 'existingBroker' provide the name of the existing realm. | ||
|
||
sharedService - contains clients, application integrations, and identity providers for connect to `broker` realm. | ||
|
||
{{ template "chart.maintainersSection" . }} | ||
|
||
{{ template "chart.sourcesSection" . }} | ||
|
||
{{ template "chart.requirementsSection" . }} | ||
|
||
{{ template "chart.valuesSection" . }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
{{- define "broker.name" -}} | ||
{{- if .Values.extensionsOIDC.broker.create -}} | ||
{{- .Values.extensionsOIDC.broker.name -}} | ||
{{- else -}} | ||
{{- .Values.extensionsOIDC.existingBroker -}} | ||
{{- end -}} | ||
{{- end -}} |
17 changes: 17 additions & 0 deletions
17
add-ons/extensions-oidc/templates/broker/keycloak-client-shared.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
{{- if .Values.extensionsOIDC.broker.create -}} | ||
apiVersion: v1.edp.epam.com/v1 | ||
kind: KeycloakClient | ||
metadata: | ||
name: {{ .Values.extensionsOIDC.sharedService }} | ||
spec: | ||
attributes: | ||
post.logout.redirect.uris: + | ||
clientId: {{ .Values.extensionsOIDC.sharedService }} | ||
clientRoles: | ||
- administrator | ||
- developer | ||
realmRef: | ||
kind: KeycloakRealm | ||
name: {{ .Values.extensionsOIDC.broker.name }} | ||
secret: keycloak-client-broker-secret | ||
{{- end -}} |
11 changes: 11 additions & 0 deletions
11
add-ons/extensions-oidc/templates/broker/keycloak-realm.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
{{- if .Values.extensionsOIDC.broker.create -}} | ||
apiVersion: v1.edp.epam.com/v1 | ||
kind: KeycloakRealm | ||
metadata: | ||
name: {{ .Values.extensionsOIDC.broker.name }} | ||
spec: | ||
keycloakRef: | ||
kind: ClusterKeycloak | ||
name: keycloak | ||
realmName: {{ .Values.extensionsOIDC.broker.name }} | ||
{{- end -}} |
16 changes: 16 additions & 0 deletions
16
add-ons/extensions-oidc/templates/external-secrets/keycloak-client-broker-secret.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
{{- if .Values.extensionsOIDC.broker.create -}} | ||
apiVersion: external-secrets.io/v1beta1 | ||
kind: ExternalSecret | ||
metadata: | ||
name: keycloak-client-broker-secret | ||
spec: | ||
refreshInterval: 1h | ||
secretStoreRef: | ||
kind: SecretStore | ||
name: aws-parameterstore-oidc | ||
data: | ||
- secretKey: clientSecret | ||
remoteRef: | ||
key: /edp/keycloak-operator | ||
property: keycloak-client-broker-secret.clientSecret | ||
{{- end -}} |
8 changes: 4 additions & 4 deletions
8
...cloak-client-shared-openshift-secret.yaml → ...ecrets/keycloak-client-shared-secret.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,14 @@ | ||
apiVersion: external-secrets.io/v1beta1 | ||
kind: ExternalSecret | ||
metadata: | ||
name: keycloak-client-shared-openshift-secret | ||
name: keycloak-client-shared-secret | ||
spec: | ||
refreshInterval: 1h | ||
secretStoreRef: | ||
kind: SecretStore | ||
name: aws-parameterstore | ||
name: aws-parameterstore-oidc | ||
data: | ||
- secretKey: clientSecret | ||
remoteRef: | ||
key: /edp/system | ||
property: keycloak-client-shared-openshift-secret.clientSecret | ||
key: /edp/keycloak-operator | ||
property: keycloak-client-shared-secret.clientSecret |
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions
6
...idc/templates/keycloak-client-shared.yaml → ...plates/shared/keycloak-client-shared.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,15 @@ | ||
apiVersion: v1.edp.epam.com/v1 | ||
kind: KeycloakClient | ||
metadata: | ||
name: shared-openshift | ||
name: {{ .Values.extensionsOIDC.sharedService }}-{{ include "broker.name" . }} | ||
spec: | ||
attributes: | ||
post.logout.redirect.uris: + | ||
clientId: shared | ||
clientId: {{ .Values.extensionsOIDC.sharedService }} | ||
clientRoles: | ||
- administrator | ||
- developer | ||
realmRef: | ||
kind: ClusterKeycloakRealm | ||
name: main | ||
secret: keycloak-client-shared-openshift-secret | ||
secret: keycloak-client-shared-secret |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,23 @@ | ||
extensionsOIDC: | ||
keycloakUrl: "https://keycloak.example.com" | ||
mainRealm: "openshift" | ||
mainRealmSecret: "" | ||
# Recommended to utilize this realm primarily for enabling unique integrations and | ||
# inheriting these capabilities into other realms. | ||
broker: | ||
# Create the broker realm with corresponding resources. | ||
create: true | ||
# If broker create parameter set to false operator create only a client for connection as Identity Provider, | ||
# in this case be sure you define correct Realm name. | ||
name: "broker" | ||
|
||
# If you already have pre-configured realm and don't need to create a new one, set the broker create | ||
# parameter to false and uncomment existingBroker parameter and provide the name of the existing realm: | ||
|
||
# existingBroker: "" | ||
|
||
# Realm creating for connecting and managing shared services clients, such as Nexus, Sonar, DefectDojo, etc. | ||
sharedService: "shared" | ||
|
||
# ClusterReconciliationEnabled is enabled (set to true), the operator will reconcile all. | ||
# keycloak-operator objects throughout the cluster. | ||
keycloak-operator: | ||
clusterReconciliationEnabled: true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,12 @@ | ||
# tekton-cache | ||
|
||
![Version: 0.3.1](https://img.shields.io/badge/Version-0.3.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.1](https://img.shields.io/badge/AppVersion-0.3.1-informational?style=flat-square) | ||
![Version: 0.3.2](https://img.shields.io/badge/Version-0.3.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.3.2](https://img.shields.io/badge/AppVersion-0.3.2-informational?style=flat-square) | ||
|
||
A Helm chart for EDP Tekton Cache | ||
|
||
## Requirements | ||
|
||
| Repository | Name | Version | | ||
|------------|------|---------| | ||
| https://epam.github.io/edp-helm-charts/stable | tekton-cache | 0.3.1 | | ||
| https://epam.github.io/edp-helm-charts/stable | tekton-cache | 0.3.2 | | ||
|