chore: Align operator versions and bump KubeRocketCI platform version…

… to 3.9.0 (#99)
epam · Jun 20, 2024 · 4dc05bb · 4dc05bb
1 parent e371c23
commit 4dc05bb
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -148,8 +148,8 @@ make update-readme
 | cert-manager           | 1.14.4    | v1.14.4      | False             | False    |
 | defectdojo             | 1.6.127   | 2.34.1       | False             | False    |
 | dependency-track       | 0.9.2     | v4.11.3      | False             | False    |
-| edp                    | 3.8.1     | 3.8.1        | False             | False    |
-| extensions-oidc        | 1.20.0    | 1.20.0       | False             | False    |
+| edp                    | 3.9.0     | 3.9.0        | False             | False    |
+| extensions-oidc        | 1.21.0    | 1.21.0       | False             | False    |
 | external-secrets       | 0.9.9     | 1.0          | False             | False    |
 | fluent-bit             | 0.46.9    | 3.0.6        | False             | False    |
 | harbor                 | 0.1.0     | 1.12.2       | False             | False    |
@@ -170,7 +170,7 @@ make update-readme
 | prometheus-operator    | 58.2.1    | v0.73.2      | False             | False    |
 | redis-operator         | 0.1.0     | 3.2.8        | False             | False    |
 | sonar                  | 8.0.2     | 9.9.2        | False             | False    |
-| sonar-operator         | 3.1.0     | 3.1.0        | False             | False    |
+| sonar-operator         | 3.1.1     | 3.1.1        | False             | False    |
 | storage-class          | N/A       | N/A          | N/A               | False    |
 | tekton-cache           | 0.3.2     | 0.3.2        | False             | False    |
 | tekton                 | N/A       | N/A          | False             | False    |

diff --git a/add-ons/edp/Chart.yaml b/add-ons/edp/Chart.yaml
@@ -3,10 +3,10 @@ description: A Helm chart for EDP Install
 home: https://epam.github.io/edp-install/
 name: edp-install
 type: application
-version: 3.8.1
-appVersion: 3.8.1
+version: 3.9.0
+appVersion: 3.9.0
 
 dependencies:
 - name: edp-install
-  version: 3.8.1
+  version: 3.9.0
   repository: https://epam.github.io/edp-helm-charts/stable
diff --git a/add-ons/edp/README.md b/add-ons/edp/README.md
@@ -1,6 +1,6 @@
 # edp-install
 
-![Version: 3.8.1](https://img.shields.io/badge/Version-3.8.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.8.1](https://img.shields.io/badge/AppVersion-3.8.1-informational?style=flat-square)
+![Version: 3.9.0](https://img.shields.io/badge/Version-3.9.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.9.0](https://img.shields.io/badge/AppVersion-3.9.0-informational?style=flat-square)
 
 A Helm chart for EDP Install
 
@@ -10,7 +10,7 @@ A Helm chart for EDP Install
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://epam.github.io/edp-helm-charts/stable | edp-install | 3.8.1 |
+| https://epam.github.io/edp-helm-charts/stable | edp-install | 3.9.0 |
 
 ## Values
 
@@ -37,8 +37,8 @@ A Helm chart for EDP Install
 | edp-install.global.dnsWildCard | string | `"example.com"` | a cluster DNS wildcard name |
 | edp-install.global.gitProviders | list | `["github","gitlab","gerrit"]` | Can be gerrit, github or gitlab. By default: github |
 | edp-install.global.platform | string | `"kubernetes"` | platform type that can be "kubernetes" or "openshift" |
-| edp-install.sso | object | `{"admins":["john@example.com","mike@example.com"],"developers":["john@example.com","mike@example.com"],"enabled":false,"keycloakUrl":"https://keycloak.example.com"}` | Enable SSO for EDP oauth2-proxy. Default: false |
+| edp-install.sso | object | `{"admins":["john@example.com","mike@example.com"],"developers":["john@example.com","mike@example.com"],"enabled":false,"keycloakOperatorResources":{"createKeycloakCR":false,"kind":"ClusterKeycloak","name":"keycloak"},"keycloakUrl":"https://keycloak.example.com/auth"}` | Enable SSO for EDP oauth2-proxy. Default: false |
 | edp-install.sso.admins | list | `["john@example.com","mike@example.com"]` | Administrators of EDP tenant |
 | edp-install.sso.developers | list | `["john@example.com","mike@example.com"]` | Developers of EDP tenant |
-| edp-install.sso.keycloakUrl | string | `"https://keycloak.example.com"` | Keycloak URL |
+| edp-install.sso.keycloakUrl | string | `"https://keycloak.example.com/auth"` | Keycloak URL |
 
diff --git a/add-ons/edp/values.yaml b/add-ons/edp/values.yaml
@@ -31,8 +31,19 @@ edp-install:
   # -- Enable SSO for EDP oauth2-proxy. Default: false
   sso:
     enabled: false
+    keycloakOperatorResources:
+      # Set to false if using the add-ons approach (refer to https://github.com/epam/edp-cluster-add-ons)
+      # for EDP installation and if the extension-oidc is already installed.
+      # This prevents the creation of an additional Keycloak resource and secret.
+      # The 'kind' and 'name' must be specified in case of using an existing Keycloak/ClusterKeycloak resource.
+      # Create kind: Keycloak as a part of chart installation
+      createKeycloakCR: false
+      # Can be Keycloak or ClusterKeycloak.
+      kind: ClusterKeycloak
+      # Name of kind: Keycloak/ClusterKeycloak CR.
+      name: keycloak
     # -- Keycloak URL
-    keycloakUrl: https://keycloak.example.com
+    keycloakUrl: https://keycloak.example.com/auth
     # -- Administrators of EDP tenant
     admins:
       - john@example.com
@@ -83,7 +94,7 @@ edp-install:
     dashboard:
       # -- Deploy Tekton Dashboard as a part of pipeline library when true. Default: true
       # -- WARNING: Default deployment of the dashboard does not involve any proxy and may be accessible to the public.
-      # -- To enable proxy protect use openshift_proxy or oauth2_proxy sections.
+      # -- To enable proxy protect use openshift_proxy or sso.enabled sections.
       # -- More details:
       # -- https://epam.github.io/edp-install/operator-guide/oauth2-proxy/
       enabled: true

diff --git a/add-ons/extensions-oidc/Chart.yaml b/add-ons/extensions-oidc/Chart.yaml
@@ -2,10 +2,10 @@ apiVersion: v2
 description: A Helm chart for extensions-oidc
 name: extensions-oidc
 type: application
-version: 1.20.0
-appVersion: 1.20.0
+version: 1.21.0
+appVersion: 1.21.0
 
 dependencies:
 - name: keycloak-operator
-  version: 1.20.0
+  version: 1.21.0
   repository: https://epam.github.io/edp-helm-charts/stable
diff --git a/add-ons/extensions-oidc/README.md b/add-ons/extensions-oidc/README.md
@@ -1,6 +1,6 @@
 # extensions-oidc
 
-![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)
+![Version: 1.21.0](https://img.shields.io/badge/Version-1.21.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.21.0](https://img.shields.io/badge/AppVersion-1.21.0-informational?style=flat-square)
 
 A Helm chart for extensions-oidc
 
@@ -27,7 +27,7 @@ sharedService - contains clients, application integrations, and identity provide
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://epam.github.io/edp-helm-charts/stable | keycloak-operator | 1.20.0 |
+| https://epam.github.io/edp-helm-charts/stable | keycloak-operator | 1.21.0 |
 
 ## Values
 

diff --git a/add-ons/sonar-operator/Chart.yaml b/add-ons/sonar-operator/Chart.yaml
@@ -8,13 +8,13 @@ type: application
 
 # The chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 3.1.0
+version: 3.1.1
 
 # Version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: "3.1.0"
+appVersion: "3.1.1"
 
 dependencies:
 - name: sonar-operator
-  version: 3.1.0
+  version: 3.1.1
   repository: https://epam.github.io/edp-helm-charts/stable
diff --git a/add-ons/sonar-operator/README.md b/add-ons/sonar-operator/README.md
@@ -1,14 +1,14 @@
 # sonar-operator
 
-![Version: 3.1.0](https://img.shields.io/badge/Version-3.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.1.0](https://img.shields.io/badge/AppVersion-3.1.0-informational?style=flat-square)
+![Version: 3.1.1](https://img.shields.io/badge/Version-3.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.1.1](https://img.shields.io/badge/AppVersion-3.1.1-informational?style=flat-square)
 
 A Helm chart for EDP Sonar Operator
 
 ## Requirements
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://epam.github.io/edp-helm-charts/stable | sonar-operator | 3.1.0 |
+| https://epam.github.io/edp-helm-charts/stable | sonar-operator | 3.1.1 |
 
 ## Values
 
@@ -25,7 +25,7 @@ A Helm chart for EDP Sonar Operator
 | sonar-operator.extraVolumeMounts | list | `[]` | Additional volumeMounts to be added to the container |
 | sonar-operator.extraVolumes | list | `[]` | Additional volumes to be added to the pod |
 | sonar-operator.image.repository | string | `"epamedp/sonar-operator"` | EDP sonar-operator Docker image name. The released image can be found on [Dockerhub](https://hub.docker.com/r/epamedp/sonar-operator) |
-| sonar-operator.image.tag | string | `"3.1.0"` | EDP sonar-operator Docker image tag. The released image can be found on [Dockerhub](https://hub.docker.com/r/epamedp/sonar-operator/tags) |
+| sonar-operator.image.tag | string | `"3.1.1"` | EDP sonar-operator Docker image tag. The released image can be found on [Dockerhub](https://hub.docker.com/r/epamedp/sonar-operator/tags) |
 | sonar-operator.imagePullPolicy | string | `"IfNotPresent"` |  |
 | sonar-operator.name | string | `"sonar-operator"` | component name |
 | sonar-operator.nodeSelector | object | `{}` |  |

diff --git a/add-ons/sonar-operator/values.yaml b/add-ons/sonar-operator/values.yaml
@@ -10,7 +10,7 @@ sonar-operator:
     repository: epamedp/sonar-operator
     # if not defined then .Chart.AppVersion is used
     # -- EDP sonar-operator Docker image tag. The released image can be found on [Dockerhub](https://hub.docker.com/r/epamedp/sonar-operator/tags)
-    tag: 3.1.0
+    tag: 3.1.1
   imagePullPolicy: "IfNotPresent"
 
   resources: