From 24e5561edd7d899d0ece1c1cea38666d91341197 Mon Sep 17 00:00:00 2001 From: Amro Misbah Date: Mon, 27 Jan 2025 22:32:51 +0200 Subject: [PATCH 1/4] feat(cloud-native): add cnSqlDbSchema property Signed-off-by: Amro Misbah --- .../templates/helm/gluu/charts/config/templates/configmaps.yaml | 1 + .../pygluu/kubernetes/templates/helm/gluu/values.yaml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/cloud-native-edition/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/configmaps.yaml b/cloud-native-edition/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/configmaps.yaml index e0713d1a..429be42f 100644 --- a/cloud-native-edition/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/configmaps.yaml +++ b/cloud-native-edition/pygluu/kubernetes/templates/helm/gluu/charts/config/templates/configmaps.yaml @@ -15,6 +15,7 @@ metadata: {{ toYaml .Values.additionalAnnotations | indent 4 }} {{- end }} data: + GLUU_SQL_DB_SCHEMA: {{ .Values.configmap.cnSqlDbSchema | quote }} GLUU_SQL_DB_DIALECT: {{ .Values.configmap.cnSqlDbDialect }} GLUU_SQL_DB_HOST: {{ .Values.configmap.cnSqlDbHost }} GLUU_SQL_DB_PORT: {{ .Values.configmap.cnSqlDbPort | quote }} diff --git a/cloud-native-edition/pygluu/kubernetes/templates/helm/gluu/values.yaml b/cloud-native-edition/pygluu/kubernetes/templates/helm/gluu/values.yaml index 207eb7c8..2685131e 100644 --- a/cloud-native-edition/pygluu/kubernetes/templates/helm/gluu/values.yaml +++ b/cloud-native-edition/pygluu/kubernetes/templates/helm/gluu/values.yaml @@ -395,6 +395,8 @@ config: # -- Salt. Used for encoding/decoding sensitive data. If omitted or set to empty string, the value will be self-generated. Otherwise, a 24 alphanumeric characters are allowed as its value. salt: "" configmap: + # -- Schema name used by SQL database (default to empty-string; if using MySQL, the schema name will be resolved as the database name, whereas in PostgreSQL the schema name will be resolved as `"public"`). + cnSqlDbSchema: "" # -- SQL database dialect. `mysql` or `pgsql` cnSqlDbDialect: mysql # -- SQL database host uri. From 108c6985fab968b1e64d1b45a0f1651f819027a7 Mon Sep 17 00:00:00 2001 From: Amro Misbah Date: Tue, 28 Jan 2025 11:22:00 +0200 Subject: [PATCH 2/4] docs: generate helm-docs Signed-off-by: Amro Misbah --- .../pygluu/kubernetes/templates/helm/gluu/README.md | 3 ++- .../kubernetes/templates/helm/gluu/charts/config/README.md | 1 + .../kubernetes/templates/helm/gluu/charts/config/values.yaml | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cloud-native-edition/pygluu/kubernetes/templates/helm/gluu/README.md b/cloud-native-edition/pygluu/kubernetes/templates/helm/gluu/README.md index d129ab87..fccd71e9 100644 --- a/cloud-native-edition/pygluu/kubernetes/templates/helm/gluu/README.md +++ b/cloud-native-edition/pygluu/kubernetes/templates/helm/gluu/README.md @@ -80,7 +80,7 @@ Kubernetes: `>=v1.22.0-0` | casa.usrEnvs.secret | object | `{}` | Add custom secret envs to the service variable1: value1 | | casa.volumeMounts | list | `[]` | Configure any additional volumesMounts that need to be attached to the containers | | casa.volumes | list | `[]` | Configure any additional volumes that need to be attached to the pod | -| config | object | `{"additionalAnnotations":{},"additionalLabels":{},"adminPass":"P@ssw0rd","affinity":{},"city":"Austin","configmap":{"cnAwsAccessKeyId":"","cnAwsDefaultRegion":"us-west-1","cnAwsProfile":"gluu","cnAwsSecretAccessKey":"","cnAwsSecretsEndpointUrl":"","cnAwsSecretsNamePrefix":"gluu","cnAwsSecretsReplicaRegions":[],"cnGoogleProjectId":"google-project-to-save-config-and-secrets-to","cnGoogleServiceAccount":"SWFtTm90YVNlcnZpY2VBY2NvdW50Q2hhbmdlTWV0b09uZQo=","cnGoogleSpannerDatabaseId":"","cnGoogleSpannerEmulatorHost":"","cnGoogleSpannerInstanceId":"","cnSecretGoogleSecretNamePrefix":"gluu","cnSecretGoogleSecretVersionId":"latest","cnSqlDbDialect":"mysql","cnSqlDbHost":"my-release-mysql.default.svc.cluster.local","cnSqlDbName":"gluu","cnSqlDbPort":3306,"cnSqlDbTimezone":"UTC","cnSqlDbUser":"gluu","cnSqlPasswordFile":"/etc/gluu/conf/sql_password","cnSqldbUserPassword":"Test1234#","containerMetadataName":"kubernetes","gluuCacheType":"NATIVE_PERSISTENCE","gluuCasaEnabled":false,"gluuCouchbaseBucketPrefix":"gluu","gluuCouchbaseCertFile":"/etc/certs/couchbase.crt","gluuCouchbaseCrt":"LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURlakNDQW1LZ0F3SUJBZ0lKQUwyem5UWlREUHFNTUEwR0NTcUdTSWIzRFFFQkN3VUFNQzB4S3pBcEJnTlYKQkFNTUlpb3VZMkpuYkhWMUxtUmxabUYxYkhRdWMzWmpMbU5zZFhOMFpYSXViRzlqWVd3d0hoY05NakF3TWpBMQpNRGt4T1RVeFdoY05NekF3TWpBeU1Ea3hPVFV4V2pBdE1Tc3dLUVlEVlFRRERDSXFMbU5pWjJ4MWRTNWtaV1poCmRXeDBMbk4yWXk1amJIVnpkR1Z5TG14dlkyRnNNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUIKQ2dLQ0FRRUFycmQ5T3lvSnRsVzhnNW5nWlJtL2FKWjJ2eUtubGU3dVFIUEw4Q2RJa1RNdjB0eHZhR1B5UkNQQgo3RE00RTFkLzhMaU5takdZZk41QjZjWjlRUmNCaG1VNmFyUDRKZUZ3c0x0cTFGT3MxaDlmWGo3d3NzcTYrYmlkCjV6Umw3UEE0YmdvOXVkUVRzU1UrWDJUUVRDc0dxVVVPWExrZ3NCMjI0RDNsdkFCbmZOeHcvYnFQa2ZCQTFxVzYKVXpxellMdHN6WE5GY0dQMFhtU3c4WjJuaFhhUGlva2pPT2dyMkMrbVFZK0htQ2xGUWRpd2g2ZjBYR0V0STMrKwoyMStTejdXRkF6RlFBVUp2MHIvZnk4TDRXZzh1YysvalgwTGQrc2NoQTlNQjh3YmJORUp2ZjNMOGZ5QjZ0cTd2CjF4b0FnL0g0S1dJaHdqSEN0dFVnWU1oU0xWV3UrUUlEQVFBQm80R2NNSUdaTUIwR0ExVWREZ1FXQkJTWmQxWU0KVGNIRVZjSENNUmp6ejczZitEVmxxREJkQmdOVkhTTUVWakJVZ0JTWmQxWU1UY0hFVmNIQ01Sanp6NzNmK0RWbApxS0V4cEM4d0xURXJNQ2tHQTFVRUF3d2lLaTVqWW1kc2RYVXVaR1ZtWVhWc2RDNXpkbU11WTJ4MWMzUmxjaTVzCmIyTmhiSUlKQUwyem5UWlREUHFNTUF3R0ExVWRFd1FGTUFNQkFmOHdDd1lEVlIwUEJBUURBZ0VHTUEwR0NTcUcKU0liM0RRRUJDd1VBQTRJQkFRQk9meTVWSHlKZCtWUTBXaUQ1aSs2cmhidGNpSmtFN0YwWVVVZnJ6UFN2YWVFWQp2NElVWStWOC9UNnE4Mk9vVWU1eCtvS2dzbFBsL01nZEg2SW9CRnVtaUFqek14RTdUYUhHcXJ5dk13Qk5IKzB5CnhadG9mSnFXQzhGeUlwTVFHTEs0RVBGd3VHRlJnazZMRGR2ZEN5NVdxWW1MQWdBZVh5VWNaNnlHYkdMTjRPUDUKZTFiaEFiLzRXWXRxRHVydFJrWjNEejlZcis4VWNCVTRLT005OHBZN05aaXFmKzlCZVkvOEhZaVQ2Q0RRWWgyTgoyK0VWRFBHcFE4UkVsRThhN1ZLL29MemlOaXFyRjllNDV1OU1KdjM1ZktmNUJjK2FKdWduTGcwaUZUYmNaT1prCkpuYkUvUENIUDZFWmxLaEFiZUdnendtS1dDbTZTL3g0TklRK2JtMmoKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=","gluuCouchbaseIndexNumReplica":0,"gluuCouchbasePass":"P@ssw0rd","gluuCouchbasePassFile":"/etc/gluu/conf/couchbase_password","gluuCouchbaseSuperUser":"admin","gluuCouchbaseSuperUserPass":"P@ssw0rd","gluuCouchbaseSuperUserPassFile":"/etc/gluu/conf/couchbase_superuser_password","gluuCouchbaseUrl":"cbgluu.default.svc.cluster.local","gluuCouchbaseUser":"gluu","gluuDocumentStoreType":"DB","gluuJackrabbitAdminId":"admin","gluuJackrabbitAdminIdFile":"/etc/gluu/conf/jackrabbit_admin_id","gluuJackrabbitAdminPassFile":"/etc/gluu/conf/jackrabbit_admin_password","gluuJackrabbitPostgresDatabaseName":"jackrabbit","gluuJackrabbitPostgresHost":"postgresql.postgres.svc.cluster.local","gluuJackrabbitPostgresPasswordFile":"/etc/gluu/conf/postgres_password","gluuJackrabbitPostgresPort":5432,"gluuJackrabbitPostgresUser":"jackrabbit","gluuJackrabbitSyncInterval":300,"gluuJackrabbitUrl":"http://jackrabbit:8080","gluuLdapUrl":"opendj:1636","gluuMaxRamPercent":"75.0","gluuOxauthBackend":"oxauth:8080","gluuOxdAdminCertCn":"oxd-server","gluuOxdApplicationCertCn":"oxd-server","gluuOxdBindIpAddresses":"*","gluuOxdServerUrl":"oxd-server:8443","gluuOxtrustApiEnabled":false,"gluuOxtrustApiTestMode":false,"gluuOxtrustBackend":"oxtrust:8080","gluuOxtrustConfigGeneration":true,"gluuPassportEnabled":false,"gluuPassportFailureRedirectUrl":"","gluuPersistenceLdapMapping":"default","gluuRedisSentinelGroup":"","gluuRedisSslTruststore":"","gluuRedisType":"STANDALONE","gluuRedisUrl":"redis:6379","gluuRedisUseSsl":"false","gluuSamlEnabled":false,"gluuScimProtectionMode":"OAUTH","gluuSyncCasaManifests":false,"gluuSyncShibManifests":false,"lbAddr":""},"countryCode":"US","customScripts":[],"dnsConfig":{},"dnsPolicy":"","email":"support@gluu.com","image":{"pullSecrets":[],"repository":"gluufederation/config-init","tag":"4.5.7_dev"},"ldapPass":"P@ssw0rd","lifecycle":{},"migration":{"enabled":false,"migrationDataFormat":"ldif","migrationDir":"/ce-migration"},"nodeSelector":{},"orgName":"Gluu","redisPass":"P@assw0rd","resources":{"limits":{"cpu":"300m","memory":"300Mi"},"requests":{"cpu":"300m","memory":"300Mi"}},"salt":"","state":"TX","tolerations":[],"usrEnvs":{"normal":{},"secret":{}},"volumeMounts":[],"volumes":[]}` | Configuration parameters for setup and initial configuration secret and config layers used by Gluu services. | +| config | object | `{"additionalAnnotations":{},"additionalLabels":{},"adminPass":"P@ssw0rd","affinity":{},"city":"Austin","configmap":{"cnAwsAccessKeyId":"","cnAwsDefaultRegion":"us-west-1","cnAwsProfile":"gluu","cnAwsSecretAccessKey":"","cnAwsSecretsEndpointUrl":"","cnAwsSecretsNamePrefix":"gluu","cnAwsSecretsReplicaRegions":[],"cnGoogleProjectId":"google-project-to-save-config-and-secrets-to","cnGoogleServiceAccount":"SWFtTm90YVNlcnZpY2VBY2NvdW50Q2hhbmdlTWV0b09uZQo=","cnGoogleSpannerDatabaseId":"","cnGoogleSpannerEmulatorHost":"","cnGoogleSpannerInstanceId":"","cnSecretGoogleSecretNamePrefix":"gluu","cnSecretGoogleSecretVersionId":"latest","cnSqlDbDialect":"mysql","cnSqlDbHost":"my-release-mysql.default.svc.cluster.local","cnSqlDbName":"gluu","cnSqlDbPort":3306,"cnSqlDbSchema":"","cnSqlDbTimezone":"UTC","cnSqlDbUser":"gluu","cnSqlPasswordFile":"/etc/gluu/conf/sql_password","cnSqldbUserPassword":"Test1234#","containerMetadataName":"kubernetes","gluuCacheType":"NATIVE_PERSISTENCE","gluuCasaEnabled":false,"gluuCouchbaseBucketPrefix":"gluu","gluuCouchbaseCertFile":"/etc/certs/couchbase.crt","gluuCouchbaseCrt":"LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURlakNDQW1LZ0F3SUJBZ0lKQUwyem5UWlREUHFNTUEwR0NTcUdTSWIzRFFFQkN3VUFNQzB4S3pBcEJnTlYKQkFNTUlpb3VZMkpuYkhWMUxtUmxabUYxYkhRdWMzWmpMbU5zZFhOMFpYSXViRzlqWVd3d0hoY05NakF3TWpBMQpNRGt4T1RVeFdoY05NekF3TWpBeU1Ea3hPVFV4V2pBdE1Tc3dLUVlEVlFRRERDSXFMbU5pWjJ4MWRTNWtaV1poCmRXeDBMbk4yWXk1amJIVnpkR1Z5TG14dlkyRnNNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUIKQ2dLQ0FRRUFycmQ5T3lvSnRsVzhnNW5nWlJtL2FKWjJ2eUtubGU3dVFIUEw4Q2RJa1RNdjB0eHZhR1B5UkNQQgo3RE00RTFkLzhMaU5takdZZk41QjZjWjlRUmNCaG1VNmFyUDRKZUZ3c0x0cTFGT3MxaDlmWGo3d3NzcTYrYmlkCjV6Umw3UEE0YmdvOXVkUVRzU1UrWDJUUVRDc0dxVVVPWExrZ3NCMjI0RDNsdkFCbmZOeHcvYnFQa2ZCQTFxVzYKVXpxellMdHN6WE5GY0dQMFhtU3c4WjJuaFhhUGlva2pPT2dyMkMrbVFZK0htQ2xGUWRpd2g2ZjBYR0V0STMrKwoyMStTejdXRkF6RlFBVUp2MHIvZnk4TDRXZzh1YysvalgwTGQrc2NoQTlNQjh3YmJORUp2ZjNMOGZ5QjZ0cTd2CjF4b0FnL0g0S1dJaHdqSEN0dFVnWU1oU0xWV3UrUUlEQVFBQm80R2NNSUdaTUIwR0ExVWREZ1FXQkJTWmQxWU0KVGNIRVZjSENNUmp6ejczZitEVmxxREJkQmdOVkhTTUVWakJVZ0JTWmQxWU1UY0hFVmNIQ01Sanp6NzNmK0RWbApxS0V4cEM4d0xURXJNQ2tHQTFVRUF3d2lLaTVqWW1kc2RYVXVaR1ZtWVhWc2RDNXpkbU11WTJ4MWMzUmxjaTVzCmIyTmhiSUlKQUwyem5UWlREUHFNTUF3R0ExVWRFd1FGTUFNQkFmOHdDd1lEVlIwUEJBUURBZ0VHTUEwR0NTcUcKU0liM0RRRUJDd1VBQTRJQkFRQk9meTVWSHlKZCtWUTBXaUQ1aSs2cmhidGNpSmtFN0YwWVVVZnJ6UFN2YWVFWQp2NElVWStWOC9UNnE4Mk9vVWU1eCtvS2dzbFBsL01nZEg2SW9CRnVtaUFqek14RTdUYUhHcXJ5dk13Qk5IKzB5CnhadG9mSnFXQzhGeUlwTVFHTEs0RVBGd3VHRlJnazZMRGR2ZEN5NVdxWW1MQWdBZVh5VWNaNnlHYkdMTjRPUDUKZTFiaEFiLzRXWXRxRHVydFJrWjNEejlZcis4VWNCVTRLT005OHBZN05aaXFmKzlCZVkvOEhZaVQ2Q0RRWWgyTgoyK0VWRFBHcFE4UkVsRThhN1ZLL29MemlOaXFyRjllNDV1OU1KdjM1ZktmNUJjK2FKdWduTGcwaUZUYmNaT1prCkpuYkUvUENIUDZFWmxLaEFiZUdnendtS1dDbTZTL3g0TklRK2JtMmoKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=","gluuCouchbaseIndexNumReplica":0,"gluuCouchbasePass":"P@ssw0rd","gluuCouchbasePassFile":"/etc/gluu/conf/couchbase_password","gluuCouchbaseSuperUser":"admin","gluuCouchbaseSuperUserPass":"P@ssw0rd","gluuCouchbaseSuperUserPassFile":"/etc/gluu/conf/couchbase_superuser_password","gluuCouchbaseUrl":"cbgluu.default.svc.cluster.local","gluuCouchbaseUser":"gluu","gluuDocumentStoreType":"DB","gluuJackrabbitAdminId":"admin","gluuJackrabbitAdminIdFile":"/etc/gluu/conf/jackrabbit_admin_id","gluuJackrabbitAdminPassFile":"/etc/gluu/conf/jackrabbit_admin_password","gluuJackrabbitPostgresDatabaseName":"jackrabbit","gluuJackrabbitPostgresHost":"postgresql.postgres.svc.cluster.local","gluuJackrabbitPostgresPasswordFile":"/etc/gluu/conf/postgres_password","gluuJackrabbitPostgresPort":5432,"gluuJackrabbitPostgresUser":"jackrabbit","gluuJackrabbitSyncInterval":300,"gluuJackrabbitUrl":"http://jackrabbit:8080","gluuLdapUrl":"opendj:1636","gluuMaxRamPercent":"75.0","gluuOxauthBackend":"oxauth:8080","gluuOxdAdminCertCn":"oxd-server","gluuOxdApplicationCertCn":"oxd-server","gluuOxdBindIpAddresses":"*","gluuOxdServerUrl":"oxd-server:8443","gluuOxtrustApiEnabled":false,"gluuOxtrustApiTestMode":false,"gluuOxtrustBackend":"oxtrust:8080","gluuOxtrustConfigGeneration":true,"gluuPassportEnabled":false,"gluuPassportFailureRedirectUrl":"","gluuPersistenceLdapMapping":"default","gluuRedisSentinelGroup":"","gluuRedisSslTruststore":"","gluuRedisType":"STANDALONE","gluuRedisUrl":"redis:6379","gluuRedisUseSsl":"false","gluuSamlEnabled":false,"gluuScimProtectionMode":"OAUTH","gluuSyncCasaManifests":false,"gluuSyncShibManifests":false,"lbAddr":""},"countryCode":"US","customScripts":[],"dnsConfig":{},"dnsPolicy":"","email":"support@gluu.com","image":{"pullSecrets":[],"repository":"gluufederation/config-init","tag":"4.5.7_dev"},"ldapPass":"P@ssw0rd","lifecycle":{},"migration":{"enabled":false,"migrationDataFormat":"ldif","migrationDir":"/ce-migration"},"nodeSelector":{},"orgName":"Gluu","redisPass":"P@assw0rd","resources":{"limits":{"cpu":"300m","memory":"300Mi"},"requests":{"cpu":"300m","memory":"300Mi"}},"salt":"","state":"TX","tolerations":[],"usrEnvs":{"normal":{},"secret":{}},"volumeMounts":[],"volumes":[]}` | Configuration parameters for setup and initial configuration secret and config layers used by Gluu services. | | config.additionalAnnotations | object | `{}` | Additional annotations that will be added across all resources in the format of {cert-manager.io/issuer: "letsencrypt-prod"}. key app is taken | | config.additionalLabels | object | `{}` | Additional labels that will be added across all resources definitions in the format of {mylabel: "myapp"} | | config.adminPass | string | `"P@ssw0rd"` | Admin password to log in to the UI. | @@ -97,6 +97,7 @@ Kubernetes: `>=v1.22.0-0` | config.configmap.cnSqlDbHost | string | `"my-release-mysql.default.svc.cluster.local"` | SQL database host uri. | | config.configmap.cnSqlDbName | string | `"gluu"` | SQL database name. | | config.configmap.cnSqlDbPort | int | `3306` | SQL database port. | +| config.configmap.cnSqlDbSchema | string | `""` | Schema name used by SQL database (default to empty-string; if using MySQL, the schema name will be resolved as the database name, whereas in PostgreSQL the schema name will be resolved as `"public"`). | | config.configmap.cnSqlDbTimezone | string | `"UTC"` | SQL database timezone. | | config.configmap.cnSqlDbUser | string | `"gluu"` | SQL database username. | | config.configmap.cnSqlPasswordFile | string | `"/etc/gluu/conf/sql_password"` | SQL password file holding password from config.configmap.cnSqldbUserPassword . | diff --git a/cloud-native-edition/pygluu/kubernetes/templates/helm/gluu/charts/config/README.md b/cloud-native-edition/pygluu/kubernetes/templates/helm/gluu/charts/config/README.md index 2d3326df..261a269c 100644 --- a/cloud-native-edition/pygluu/kubernetes/templates/helm/gluu/charts/config/README.md +++ b/cloud-native-edition/pygluu/kubernetes/templates/helm/gluu/charts/config/README.md @@ -47,6 +47,7 @@ Kubernetes: `>=v1.22.0-0` | configmap.cnSqlDbHost | string | `"my-release-mysql.default.svc.cluster.local"` | SQL database host uri. | | configmap.cnSqlDbName | string | `"gluu"` | SQL database username. | | configmap.cnSqlDbPort | int | `3306` | SQL database port. | +| configmap.cnSqlDbSchema | string | `""` | Schema name used by SQL database (default to empty-string; if using MySQL, the schema name will be resolved as the database name, whereas in PostgreSQL the schema name will be resolved as `"public"`). | | configmap.cnSqlDbTimezone | string | `"UTC"` | SQL database timezone. | | configmap.cnSqlDbUser | string | `"gluu"` | SQL database username. | | configmap.cnSqlPasswordFile | string | `"/etc/gluu/conf/sql_password"` | SQL password file holding password from config.configmap.cnSqldbUserPassword . | diff --git a/cloud-native-edition/pygluu/kubernetes/templates/helm/gluu/charts/config/values.yaml b/cloud-native-edition/pygluu/kubernetes/templates/helm/gluu/charts/config/values.yaml index c7a01a81..0bd662e9 100644 --- a/cloud-native-edition/pygluu/kubernetes/templates/helm/gluu/charts/config/values.yaml +++ b/cloud-native-edition/pygluu/kubernetes/templates/helm/gluu/charts/config/values.yaml @@ -28,6 +28,8 @@ city: Austin # -- Salt. Used for encoding/decoding sensitive data. If omitted or set to empty string, the value will be self-generated. Otherwise, a 24 alphanumeric characters are allowed as its value. salt: "" configmap: + # -- Schema name used by SQL database (default to empty-string; if using MySQL, the schema name will be resolved as the database name, whereas in PostgreSQL the schema name will be resolved as `"public"`). + cnSqlDbSchema: "" # -- SQL database dialect. `mysql` or `pgsql` cnSqlDbDialect: mysql # -- SQL database host uri. From e94321696e6b435d8c35707e2550e32ec24b4092 Mon Sep 17 00:00:00 2001 From: Amro Misbah Date: Fri, 31 Jan 2025 10:02:21 +0200 Subject: [PATCH 3/4] docs(cloud-native): showcase how to override schema Signed-off-by: Amro Misbah --- .../upgrade/4.2-ldap-to-4.5-pgsql-migration.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/docs-gluu-server-prod/docs/source/upgrade/4.2-ldap-to-4.5-pgsql-migration.md b/docs-gluu-server-prod/docs/source/upgrade/4.2-ldap-to-4.5-pgsql-migration.md index eb4e8eac..14eb9637 100644 --- a/docs-gluu-server-prod/docs/source/upgrade/4.2-ldap-to-4.5-pgsql-migration.md +++ b/docs-gluu-server-prod/docs/source/upgrade/4.2-ldap-to-4.5-pgsql-migration.md @@ -429,6 +429,23 @@ This documentation demonstrates how to upgrade a Kubernetes setup of Gluu >=4.2 cnSqldbUserPassword: # adjust according to your setup ``` +1. Postgresql database schema defaults to empty string. + + To override the default schema in a Gluu version `>=4.5.6`, add the following to `values.yaml`: + ```yaml + global: + userEnvs: + normal: + GLUU_SQL_DB_SCHEMA: "public" # Adjust as needed. + ``` + + To override the default schema in a Gluu version `>4.5.6`, add the following to `values.yaml`: + ```yaml + config: + configmap: + cnSqlDbSchema: "public" # Adjust as needed. + ``` + 1. Run `helm upgrade gluu/gluu -n -f values.yaml`. 1. Make sure the cluster is functioning after the migration. From 43a46da8a91b47735931c96e898d972f501ac50c Mon Sep 17 00:00:00 2001 From: Amro Misbah Date: Fri, 31 Jan 2025 12:10:38 +0200 Subject: [PATCH 4/4] docs: fix sign --- .../docs/source/upgrade/4.2-ldap-to-4.5-pgsql-migration.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs-gluu-server-prod/docs/source/upgrade/4.2-ldap-to-4.5-pgsql-migration.md b/docs-gluu-server-prod/docs/source/upgrade/4.2-ldap-to-4.5-pgsql-migration.md index 14eb9637..963a8206 100644 --- a/docs-gluu-server-prod/docs/source/upgrade/4.2-ldap-to-4.5-pgsql-migration.md +++ b/docs-gluu-server-prod/docs/source/upgrade/4.2-ldap-to-4.5-pgsql-migration.md @@ -431,7 +431,7 @@ This documentation demonstrates how to upgrade a Kubernetes setup of Gluu >=4.2 1. Postgresql database schema defaults to empty string. - To override the default schema in a Gluu version `>=4.5.6`, add the following to `values.yaml`: + To override the default schema in a Gluu version `<=4.5.6`, add the following to `values.yaml`: ```yaml global: userEnvs: @@ -445,7 +445,7 @@ This documentation demonstrates how to upgrade a Kubernetes setup of Gluu >=4.2 configmap: cnSqlDbSchema: "public" # Adjust as needed. ``` - + 1. Run `helm upgrade gluu/gluu -n -f values.yaml`. 1. Make sure the cluster is functioning after the migration.