Merge remote-tracking branch 'origin/main' into chore/move-keycloak-c…

…hart On-behalf-of: @SAP angel.kafazov@sap.com Signed-off-by: Angel Kafazov <akafazov@cst-bg.net>
openmfp · Dec 3, 2024 · a31800d · a31800d
2 parents 40ded63 + ed3c9b5
commit a31800d
Show file tree

Hide file tree

Showing 16 changed files with 61 additions and 67 deletions.
diff --git a/charts/account-operator/Chart.yaml b/charts/account-operator/Chart.yaml
@@ -3,7 +3,7 @@ name: account-operator
 description: A Helm chart for Kubernetes
 type: application
 version: 0.4.21
-appVersion: "0.106.0"
+appVersion: "0.108.0"
 dependencies:
   - name: account-operator-crds
     version: 0.1.6

diff --git a/charts/account-operator/README.md b/charts/account-operator/README.md
@@ -1,6 +1,6 @@
 # account-operator
 
-![Version: 0.4.21](https://img.shields.io/badge/Version-0.4.21-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.106.0](https://img.shields.io/badge/AppVersion-0.106.0-informational?style=flat-square)
+![Version: 0.4.21](https://img.shields.io/badge/Version-0.4.21-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.108.0](https://img.shields.io/badge/AppVersion-0.108.0-informational?style=flat-square)
 
 A Helm chart for Kubernetes
 

diff --git a/charts/common/README.md b/charts/common/README.md
@@ -46,12 +46,9 @@ Example
 | defaults.imagePullSecret | string | `"github"` | imagePullSecret is the name of the secret that holds the docker registry credentials |
 | defaults.istio.enabled | bool | `false` | toggle to enable/disable istio |
 | defaults.istio.gateway.name | string | `"gateway"` | name of the gateway |
-| defaults.istio.https.enabled | bool | `true` | toggle to enable/disable https |
-| defaults.istio.quitSidecar | bool | `true` | toggle sidecar injection |
 | defaults.metrics.port | int | `8080` | metrics port |
 | defaults.port | int | `8080` | service port |
 | defaults.securityContext.fsGroup | int | `2000` | fsGroup id to run the container |
 | defaults.securityContext.runAsGroup | int | `3000` | group id to run the container |
 | defaults.securityContext.runAsUser | int | `1000` | user id to run the container |
 
-S
diff --git a/charts/common/templates/_getKeyLookup.tpl b/charts/common/templates/_getKeyLookup.tpl
@@ -2,7 +2,7 @@
   Function: common.getKeyValue
   Description: 
     Retrieves a value from values.yaml by checking keys in this order: 
-    1. Override key, 2. Global key, 3. Default key. Returns an empty string if none exist.
+    1. Override key, 2. Global key, 3. Chart key ,4. Default key. Returns an empty string if none exist.
 
   Parameters:
     - .key: Key path to lookup.

diff --git a/charts/common/values.yaml b/charts/common/values.yaml
@@ -61,11 +61,6 @@ defaults:
     gateway:
       # -- name of the gateway
       name: gateway
-    # -- toggle sidecar injection
-    quitSidecar: true
-    https:
-      # -- toggle to enable/disable https
-      enabled: true
 
   securityContext:
     # -- user id to run the container

diff --git a/charts/example-content/Chart.yaml b/charts/example-content/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "0.124.0"
+appVersion: "0.126.0"
 description: Helm Chart for the openmfp Portal
 name: example-content
-version: 0.110.6
+version: 0.110.8
 dependencies:
   - name: common
     version: 0.1.5

diff --git a/charts/example-content/README.md b/charts/example-content/README.md
@@ -0,0 +1,21 @@
+# example-content
+
+![Version: 0.110.8](https://img.shields.io/badge/Version-0.110.8-informational?style=flat-square) ![AppVersion: 0.126.0](https://img.shields.io/badge/AppVersion-0.126.0-informational?style=flat-square)
+
+Helm Chart for the openmfp Portal
+
+## Requirements
+
+| Repository | Name | Version |
+|------------|------|---------|
+| file://../common | common | 0.1.5 |
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| image.name | string | `"ghcr.io/openmfp/example-content"` | The image name |
+| istio.virtualService.hosts[0] | string | `"your-host.com"` |  |
+| istio.virtualService.matchers[0].match[0].uri.exact | string | `"/ui/example-content"` |  |
+| istio.virtualService.matchers[0].match[1].uri.prefix | string | `"/ui/example-content/"` |  |
+
diff --git a/charts/keycloak/README.md b/charts/keycloak/README.md
@@ -1,47 +1,5 @@
 # keycloak
 
-A Helm chart for Kubernetes
-
-![Version: 0.59.21](https://img.shields.io/badge/Version-0.59.21-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.16.0](https://img.shields.io/badge/AppVersion-1.16.0-informational?style=flat-square)
-
-## Configuration
-
-The chart supports the following configuration parameters in the table below. Additionally, default configuration parameters documented in [common/README.md](../common/README.md) are not explicitely listed in the table but are also supported.
-
-## Values
-
-Default configuration parameters, which can be overriden either globally or on a chart level are documented in [common/README.md](../common/README.md).
-
-| Key | Type | Default | Description |
-|-----|------|---------|-------------|
-| crossplane.clients | object | `{"openmfp":{"name":"OpenMFP","validRedirectUris":["http://localhost:8000/callback*"]}}` | crossplane clients config |
-| crossplane.enabled | bool | `false` | toggle to enable/disable crossplane |
-| crossplane.identityProviders | object | `{"sap":{"authorizationUrl":"https://login.microsoftonline.com/42f7676c-f455-423c-82f6-dc2d99791af7/oauth2/v2.0/authorize","clientId":"82b4c72c-ff99-4df6-ba4f-fb634d1fc491","clientSecretRef":{"key":"client-secret","name":"sap-client-secret","namespace":"openmfp-system"},"clientSecretRemoteRef":"dxp-core-team/manual-secrets/sap-client-secret","issuer":"https://login.microsoftonline.com/42f7676c-f455-423c-82f6-dc2d99791af7/v2.0","tokenUrl":"https://login.microsoftonline.com/42f7676c-f455-423c-82f6-dc2d99791af7/oauth2/v2.0/token"}}` | crossplane identity providers config |
-| crossplane.providerConfig | object | `{"name":"keycloak-provider-config","namespace":"openmfp-system"}` | crossplane provider config |
-| crossplane.realm | object | `{"displayName":"OpenMFP","name":"openmfp","registrationAllowed":false}` | crossplane realm config |
-| debug | bool | `false` | debug mode |
-| domain | object | `{"name":"openmfp.org","pathPrefix":""}` | domain configuration |
-| externalSecrets | object | `{"keycloakAdminRemoteRef":"dxp-core-team/manual-secrets/keycloak-admin","postgres-adminRemoteRef":"dxp-core-team/manual-secrets/postgres-admin-password"}` | external secrets configuration |
-| istio.virtualservice.hosts | list | `["auth.openmfp.org"]` | istio virtual service hosts |
-| job | object | `{"annotations":{"argocd.argoproj.io/hook":"PostSync"},"serviceAccount":"keycloak-client-creation"}` | job configuration |
-| keycloak | object | `{"extraEnvVars":"- name: KEYCLOAK_USER\n  value: keycloak-admin\n- name: KEYCLOAK_PASSWORD\n  valueFrom:\n    secretKeyRef:\n      name: keycloak-admin\n      key: secret\n","postgresql":{"auth":{"existingSecret":"","secretKeys":{"adminPasswordKey":"password","userPasswordKey":"password"}}}}` | configuration passed to the child 'keyclaok' chart https://github.com/bitnami/charts/tree/main/bitnami/keycloak |
-| keycloakConfig.admin | object | `{"password":{"valueFrom":{"secretKeyRef":{"key":"secret","name":"keycloak-admin"}}},"username":{"value":"keycloak-admin"}}` | admin user configuration |
-| keycloakConfig.client | object | `{"name":"openmfp","targetSecret":{"name":"portal-client-secret-openmfp","namespace":"openmfp-system"},"tokenLifespan":3600}` | client configuration |
-| keycloakConfig.realm | object | `{"name":"master"}` | realm configuration |
-| keycloakConfig.redirectUrls | list | `[]` | redirect urls |
-| keycloakConfig.url | string | `"http://keycloak-http.openmfp-system.svc.cluster.local:8080"` | url of the keycloak server |
-| keycloakConfig.userRegistration.enabled | bool | `true` | toggle to enable/disable user registration |
-| service | object | `{"name":"keycloak"}` | service configuration |
-
-## Requirements
-
-| Repository | Name | Version |
-|------------|------|---------|
-| file://../common | common | 0.1.5 |
-| oci://registry-1.docker.io/bitnamicharts | keycloak(keycloak) | 24.2.2 |
-
-# keycloak
-
 ![Version: 0.59.21](https://img.shields.io/badge/Version-0.59.21-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.16.0](https://img.shields.io/badge/AppVersion-1.16.0-informational?style=flat-square)
 
 A Helm chart for Kubernetes

diff --git a/charts/openmfp/Chart.lock b/charts/openmfp/Chart.lock
@@ -1,9 +1,9 @@
 dependencies:
 - name: example-content
   repository: oci://ghcr.io/openmfp/helm-charts
-  version: 0.110.5
+  version: 0.110.7
 - name: portal
   repository: oci://ghcr.io/openmfp/helm-charts
-  version: 0.69.126
-digest: sha256:7588756eb8004b1ab314632413c9ffc0c2ca30b31a40a19341dd81af79c220dc
-generated: "2024-11-28T18:10:55.890735059Z"
+  version: 0.69.142
+digest: sha256:30f7de4a3ad76a16f9421c9e941a5488c51cc18435af343d77bd9f5408ea1d11
+generated: "2024-12-03T09:59:52.912501066Z"
diff --git a/charts/openmfp/Chart.yaml b/charts/openmfp/Chart.yaml
@@ -2,15 +2,15 @@ apiVersion: v2
 name: openmfp
 description: The OpenMFP chart for Kubernetes
 type: application
-version: 0.0.21
+version: 0.0.36
 appVersion: "0.0.0"
 
 dependencies:
   - name: example-content
-    version: 0.110.5
+    version: 0.110.7
     repository: oci://ghcr.io/openmfp/helm-charts
     condition: components.example-content.enabled
   - name: portal
-    version: 0.69.126
+    version: 0.69.142
     repository: oci://ghcr.io/openmfp/helm-charts
     condition: components.portal.enabled
diff --git a/charts/openmfp/README.md b/charts/openmfp/README.md
@@ -1,15 +1,15 @@
 # openmfp
 
-![Version: 0.0.18](https://img.shields.io/badge/Version-0.0.18-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.0](https://img.shields.io/badge/AppVersion-0.0.0-informational?style=flat-square)
+![Version: 0.0.36](https://img.shields.io/badge/Version-0.0.36-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.0.0](https://img.shields.io/badge/AppVersion-0.0.0-informational?style=flat-square)
 
 The OpenMFP chart for Kubernetes
 
 ## Requirements
 
 | Repository | Name | Version |
 |------------|------|---------|
-| oci://ghcr.io/openmfp/helm-charts | example-content | 0.110.5 |
-| oci://ghcr.io/openmfp/helm-charts | portal | 0.69.126 |
+| oci://ghcr.io/openmfp/helm-charts | example-content | 0.110.7 |
+| oci://ghcr.io/openmfp/helm-charts | portal | 0.69.142 |
 
 ## Values
 

diff --git a/charts/openmfp/charts/example-content-0.110.5.tgz b/charts/openmfp/charts/example-content-0.110.5.tgz
diff --git a/charts/openmfp/charts/example-content-0.110.7.tgz b/charts/openmfp/charts/example-content-0.110.7.tgz
diff --git a/charts/openmfp/charts/portal-0.69.126.tgz → charts/openmfp/charts/portal-0.69.142.tgz b/charts/openmfp/charts/portal-0.69.126.tgz → charts/openmfp/charts/portal-0.69.142.tgz
diff --git a/charts/portal/Chart.yaml b/charts/portal/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "0.204.0"
+appVersion: "0.220.0"
 description: Helm Chart for the openmfp Portal
 name: portal
-version: 0.69.130
+version: 0.69.143
 dependencies:
   - name: common
     repository: file://../common

diff --git a/charts/portal/README.md b/charts/portal/README.md
@@ -0,0 +1,23 @@
+# portal
+
+![Version: 0.69.143](https://img.shields.io/badge/Version-0.69.143-informational?style=flat-square) ![AppVersion: 0.220.0](https://img.shields.io/badge/AppVersion-0.220.0-informational?style=flat-square)
+
+Helm Chart for the openmfp Portal
+
+## Requirements
+
+| Repository | Name | Version |
+|------------|------|---------|
+| file://../common | common | 0.1.5 |
+
+## Values
+
+| Key | Type | Default | Description |
+|-----|------|---------|-------------|
+| featureToggles | string | `"enableSessionAutoRefresh=true"` |  |
+| http.protocol | string | `"https"` |  |
+| image.name | string | `"ghcr.io/openmfp/portal"` |  |
+| image.pullPolicyOverride | string | `"IfNotPresent"` |  |
+| importContent | bool | `true` |  |
+| validWebcomponentUrls | string | `".?"` |  |
+