From 23bfcb08f8205b708092cef8d8031abb55b4c4bd Mon Sep 17 00:00:00 2001 From: Breno de Souza Date: Mon, 16 Oct 2023 11:23:38 -0300 Subject: [PATCH 1/3] IT-506 Updating MT manifests --- plain-templates/misc/entando-tenant-ingress.yaml | 1 + plain-templates/misc/entando-tenants-secret.yaml | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/plain-templates/misc/entando-tenant-ingress.yaml b/plain-templates/misc/entando-tenant-ingress.yaml index 49dbccf9..649ddbea 100644 --- a/plain-templates/misc/entando-tenant-ingress.yaml +++ b/plain-templates/misc/entando-tenant-ingress.yaml @@ -8,6 +8,7 @@ metadata: generation: 4 labels: EntandoApp: YOUR-APP-NAME + EntandoTenant: YOUR-TENANT-NAME name: YOUR-TENANT-ID-YOUR-APP-NAME-ingress spec: ingressClassName: nginx diff --git a/plain-templates/misc/entando-tenants-secret.yaml b/plain-templates/misc/entando-tenants-secret.yaml index 6e6822c4..1bdac327 100644 --- a/plain-templates/misc/entando-tenants-secret.yaml +++ b/plain-templates/misc/entando-tenants-secret.yaml @@ -8,9 +8,13 @@ stringData: [ { "tenantCode": "YOUR-TENANT-ID", + "entandoAppIngressName": "YOUR-TENANT-ID-mt-ingress", "fqdns": "YOUR-TENANT-ID.YOUR-APP-NAME.YOUR-HOST-NAME", "kcEnabled": true, "kcAuthUrl": "https://YOUR-APP-NAME.YOUR-HOST-NAME/auth", + "kcInternalAuthUrl": "http://default-sso-in-namespace-service.mt.svc.cluster.local:8080/auth", + "kcAdminUsername": "entando_keycloak_admin", + "kcAdminPassword": "YOUR-KEYCLOAK-ADMIN-PASSWORD", "kcRealm": "YOUR-TENANT-ID", "kcClientId": "YOUR-APP-NAME", "kcClientSecret": "YOUR-TENANT-KC-SECRET", @@ -25,6 +29,12 @@ stringData: "cdsPrivateUrl": "http://YOUR-TENANT-ID-cds-service:8080", "cdsPath": "api/v1", "solrAddress": "http://solr-solrcloud-common/solr", - "solrCore": "YOUR-TENANT-ID" + "solrCore": "YOUR-TENANT-ID", + "deDbDriverClassName": "org.postgresql.Driver", + "deDbUrl": "jdbc:postgresql://default-postgresql-dbms-in-namespace-service.mt.svc.cluster.local:5432/default_postgresql_dbms_in_namespace_db?currentSchema=YOUR-CURRENT-SCHEMA", + "deDbUsername": "postgres", + "deDbPassword": "YOUR-POSTGRES-DB-DE-PASSWORD", + "deKcClientId": "YOUR-KEYCLOAK-CLIENT-ID", + "deKcClientSecret": "YOUR-KEYCLOAK-CLIENT-SECRET" } ] \ No newline at end of file From 81b8e2c9396399c7a35d649c893209745d5e2fcc Mon Sep 17 00:00:00 2001 From: Breno de Souza Date: Mon, 16 Oct 2023 12:21:02 -0300 Subject: [PATCH 2/3] IT-506 Updating the current schema placeholder --- plain-templates/misc/entando-tenants-secret.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plain-templates/misc/entando-tenants-secret.yaml b/plain-templates/misc/entando-tenants-secret.yaml index 1bdac327..66263191 100644 --- a/plain-templates/misc/entando-tenants-secret.yaml +++ b/plain-templates/misc/entando-tenants-secret.yaml @@ -22,7 +22,7 @@ stringData: "kcSecureUris": "", "kcDefaultAuthorizations": "", "dbDriverClassName": "org.postgresql.Driver", - "dbUrl": "jdbc:postgresql://default-postgresql-dbms-in-namespace-service.YOUR-NAMESPACE.svc.cluster.local:5432/default_postgresql_dbms_in_namespace_db?currentSchema=YOUR-TENANT-ID", + "dbUrl": "jdbc:postgresql://default-postgresql-dbms-in-namespace-service.YOUR-NAMESPACE.svc.cluster.local:5432/default_postgresql_dbms_in_namespace_db?currentSchema=YOUR-TENANT-ID_cmschema", "dbUsername": "postgres", "dbPassword": "YOUR-POSTGRES-DB-PASSWORD", "cdsPublicUrl": "http://YOUR-APP-NAME-cds.YOUR-HOST-NAME/YOUR-TENANT-ID", @@ -37,4 +37,4 @@ stringData: "deKcClientId": "YOUR-KEYCLOAK-CLIENT-ID", "deKcClientSecret": "YOUR-KEYCLOAK-CLIENT-SECRET" } - ] \ No newline at end of file + ] From 67bcaf7ffd890a2cdbc7dc1bafc7daf76b9ec9e2 Mon Sep 17 00:00:00 2001 From: Breno de Souza Date: Mon, 16 Oct 2023 12:22:56 -0300 Subject: [PATCH 3/3] IT-506 Updating the deDbUrl placeholder --- plain-templates/misc/entando-tenants-secret.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plain-templates/misc/entando-tenants-secret.yaml b/plain-templates/misc/entando-tenants-secret.yaml index 66263191..651b3d0b 100644 --- a/plain-templates/misc/entando-tenants-secret.yaml +++ b/plain-templates/misc/entando-tenants-secret.yaml @@ -22,7 +22,7 @@ stringData: "kcSecureUris": "", "kcDefaultAuthorizations": "", "dbDriverClassName": "org.postgresql.Driver", - "dbUrl": "jdbc:postgresql://default-postgresql-dbms-in-namespace-service.YOUR-NAMESPACE.svc.cluster.local:5432/default_postgresql_dbms_in_namespace_db?currentSchema=YOUR-TENANT-ID_cmschema", + "dbUrl": "jdbc:postgresql://default-postgresql-dbms-in-namespace-service.YOUR-NAMESPACE.svc.cluster.local:5432/default_postgresql_dbms_in_namespace_db?currentSchema=YOUR-TENANT-ID", "dbUsername": "postgres", "dbPassword": "YOUR-POSTGRES-DB-PASSWORD", "cdsPublicUrl": "http://YOUR-APP-NAME-cds.YOUR-HOST-NAME/YOUR-TENANT-ID", @@ -31,7 +31,7 @@ stringData: "solrAddress": "http://solr-solrcloud-common/solr", "solrCore": "YOUR-TENANT-ID", "deDbDriverClassName": "org.postgresql.Driver", - "deDbUrl": "jdbc:postgresql://default-postgresql-dbms-in-namespace-service.mt.svc.cluster.local:5432/default_postgresql_dbms_in_namespace_db?currentSchema=YOUR-CURRENT-SCHEMA", + "deDbUrl": "jdbc:postgresql://default-postgresql-dbms-in-namespace-service.mt.svc.cluster.local:5432/default_postgresql_dbms_in_namespace_db?currentSchema=YOUR-TENANT-ID_cmschema", "deDbUsername": "postgres", "deDbPassword": "YOUR-POSTGRES-DB-DE-PASSWORD", "deKcClientId": "YOUR-KEYCLOAK-CLIENT-ID",