From 89c3606aceafac1633c5e158fa06fd8e50cf10a8 Mon Sep 17 00:00:00 2001 From: Sergej Hoffmann <97111299+SevenWaysDP@users.noreply.github.com> Date: Mon, 2 Dec 2024 11:04:35 +0100 Subject: [PATCH 1/3] BC-8404 - Move tldraw config to issolate it from server config (#1039) --------- Co-authored-by: mamutmk5 <3045922+mamutmk5@users.noreply.github.com> --- ansible/group_vars/all/instance_config_all.yml | 4 +++- ansible/group_vars/production/resources.yml | 8 ++++++++ ansible/group_vars/reference/resources.yml | 8 ++++++++ .../namespace-activator-scaled-objects/defaults/main.yml | 5 ++--- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/ansible/group_vars/all/instance_config_all.yml b/ansible/group_vars/all/instance_config_all.yml index 1b14e6ab1..89382fa4f 100644 --- a/ansible/group_vars/all/instance_config_all.yml +++ b/ansible/group_vars/all/instance_config_all.yml @@ -1,6 +1,6 @@ # this is the place for all "newer" services that are not based on the api-configmap but which need default values to overwrite them from the values that are supplied from the app # with other words this is a place for default values across all envs and stages that NEED to be overwritten from app defaults - +API_HOST_URI: "http://api-svc:3030" ROCKET_CHAT_URI: "http://rocketchat-svc:5000" CALENDAR_URI: "http://calendar-svc:3000" NEST_LOG_LEVEL: "info" @@ -41,3 +41,5 @@ ERWINIDM_ADMIN_INGRESS_CLASS: management ERWINIDM_ADMIN_CREATE_CERTIFICATE: true ERWINIDM_ADMIN_TLS_AUTH_SECRET: erwinidm-tls-auth +TLDRAW_LOG_LEVEL: "info" +FEATURE_TLDRAW_ENABLED: "true" diff --git a/ansible/group_vars/production/resources.yml b/ansible/group_vars/production/resources.yml index 7f3482ca2..89ce4fca0 100644 --- a/ansible/group_vars/production/resources.yml +++ b/ansible/group_vars/production/resources.yml @@ -123,3 +123,11 @@ COMMON_CARTRIDGE_CPU_LIMITS: "1000m" COMMON_CARTRIDGE_MEMORY_LIMITS: "2Gi" COMMON_CARTRIDGE_CPU_REQUESTS: "100m" COMMON_CARTRIDGE_MEMORY_REQUESTS: "2Gi" +TLDRAW_SERVER_CPU_LIMITS: "2000m" +TLDRAW_SERVER_CPU_REQUESTS: "100m" +TLDRAW_SERVER_MEMORY_LIMITS: "2Gi" +TLDRAW_SERVER_MEMORY_REQUESTS: "2Gi" +TLDRAW_SERVER_WORKER_CPU_LIMITS: "2000m" +TLDRAW_SERVER_WORKER_CPU_REQUESTS: "100m" +TLDRAW_SERVER_WORKER_MEMORY_LIMITS,: "2Gi" +TLDRAW_SERVER_WORKER_MEMORY_REQUESTS,: "2Gi" diff --git a/ansible/group_vars/reference/resources.yml b/ansible/group_vars/reference/resources.yml index 113e1abe6..4466863c6 100644 --- a/ansible/group_vars/reference/resources.yml +++ b/ansible/group_vars/reference/resources.yml @@ -123,3 +123,11 @@ COMMON_CARTRIDGE_CPU_LIMITS: "1000m" COMMON_CARTRIDGE_MEMORY_LIMITS: "2Gi" COMMON_CARTRIDGE_CPU_REQUESTS: "100m" COMMON_CARTRIDGE_MEMORY_REQUESTS: "2Gi" +TLDRAW_SERVER_CPU_LIMITS: "2000m" +TLDRAW_SERVER_CPU_REQUESTS: "100m" +TLDRAW_SERVER_MEMORY_LIMITS: "2Gi" +TLDRAW_SERVER_MEMORY_REQUESTS: "2Gi" +TLDRAW_SERVER_WORKER_CPU_LIMITS: "2000m" +TLDRAW_SERVER_WORKER_CPU_REQUESTS: "100m" +TLDRAW_SERVER_WORKER_MEMORY_LIMITS,: "2Gi" +TLDRAW_SERVER_WORKER_MEMORY_REQUESTS,: "2Gi" diff --git a/ansible/roles/namespace-activator-scaled-objects/defaults/main.yml b/ansible/roles/namespace-activator-scaled-objects/defaults/main.yml index df9070cd4..9e7efb9cd 100644 --- a/ansible/roles/namespace-activator-scaled-objects/defaults/main.yml +++ b/ansible/roles/namespace-activator-scaled-objects/defaults/main.yml @@ -32,9 +32,8 @@ deployments_for_scaled_objects: - name: board-collaboration-deployment - name: common-cartridge-deployment - name: clammit-deployment - # those 2 will be re-added when new tldraw stuff is enabled by default - # - tldraw-deployment - # - tldraw-worker-deployment + - name: tldraw-server-deployment + - name: tldraw-worker-deployment - name: tldraw-client-deployment - name: valkey-node kind: StatefulSet From 32dd56e8f16a5289b7219e3f404c1b49c1628cc8 Mon Sep 17 00:00:00 2001 From: Murat Merdoglu <64781656+muratmerdoglu-dp@users.noreply.github.com> Date: Mon, 2 Dec 2024 13:38:52 +0100 Subject: [PATCH 2/3] delete announcement (#1040) BC-8322 - remove announcement --- ansible/group_vars/all/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/ansible/group_vars/all/config.yml b/ansible/group_vars/all/config.yml index 9a3113029..06d0f1c72 100644 --- a/ansible/group_vars/all/config.yml +++ b/ansible/group_vars/all/config.yml @@ -833,7 +833,6 @@ configuration_all: client: true nuxtclient: true DASHBOARD_ANNOUNCEMENT_TEXT: - value: "dashboard.text.announcement" server: true client: true nuxtclient: false From 4510f3bcb84cf69126119fac454405b7a6831ec0 Mon Sep 17 00:00:00 2001 From: mamutmk5 <3045922+mamutmk5@users.noreply.github.com> Date: Tue, 3 Dec 2024 10:06:32 +0100 Subject: [PATCH 3/3] BC-8485 - adjust erwin IDM ref and dev to prod featuerflags (#1042) --- ansible/group_vars/all/config.yml | 3 --- ansible/group_vars/all/instance_config_all.yml | 2 +- ansible/host_vars/dbc_host/cfg.yml | 1 - ansible/host_vars/prod-brb/cfg.yml | 1 - ansible/host_vars/prod-dbc/cfg.yml | 1 - ansible/host_vars/prod-nbc/cfg.yml | 2 -- ansible/host_vars/prod-thr/cfg.yml | 1 - ansible/host_vars/ref-dbc/cfg.yml | 1 - ansible/host_vars/ref-thr/cfg.yml | 1 - 9 files changed, 1 insertion(+), 12 deletions(-) diff --git a/ansible/group_vars/all/config.yml b/ansible/group_vars/all/config.yml index 06d0f1c72..bc784c744 100644 --- a/ansible/group_vars/all/config.yml +++ b/ansible/group_vars/all/config.yml @@ -212,17 +212,14 @@ configuration_all: nuxtclient: false # Identity Management FEATURE_IDENTITY_MANAGEMENT_ENABLED: - value: "{{ FEATURE_IDENTITY_MANAGEMENT_ENABLED }}" server: true client: false nuxtclient: false FEATURE_IDENTITY_MANAGEMENT_STORE_ENABLED: - value: "{{ FEATURE_IDENTITY_MANAGEMENT_STORE_ENABLED }}" server: true client: false nuxtclient: false FEATURE_IDENTITY_MANAGEMENT_LOGIN_ENABLED: - value: "{{ FEATURE_IDENTITY_MANAGEMENT_LOGIN_ENABLED }}" server: true client: false nuxtclient: false diff --git a/ansible/group_vars/all/instance_config_all.yml b/ansible/group_vars/all/instance_config_all.yml index 89382fa4f..de5b34f11 100644 --- a/ansible/group_vars/all/instance_config_all.yml +++ b/ansible/group_vars/all/instance_config_all.yml @@ -7,7 +7,7 @@ NEST_LOG_LEVEL: "info" # Identity Management FEATURE_IDENTITY_MANAGEMENT_ENABLED: "true" -FEATURE_IDENTITY_MANAGEMENT_STORE_ENABLED: "true" +FEATURE_IDENTITY_MANAGEMENT_STORE_ENABLED: "false" FEATURE_IDENTITY_MANAGEMENT_LOGIN_ENABLED: "false" IDENTITY_MANAGEMENT__INTERNAL_URI: "http://erwinidm-svc:8089" IDENTITY_MANAGEMENT__EXTERNAL_URI: "https://{{ ERWINIDM_PREFIX }}{{ DOMAIN }}" diff --git a/ansible/host_vars/dbc_host/cfg.yml b/ansible/host_vars/dbc_host/cfg.yml index 1fbd53dab..e69de29bb 100644 --- a/ansible/host_vars/dbc_host/cfg.yml +++ b/ansible/host_vars/dbc_host/cfg.yml @@ -1 +0,0 @@ -FEATURE_IDENTITY_MANAGEMENT_LOGIN_ENABLED: "true" diff --git a/ansible/host_vars/prod-brb/cfg.yml b/ansible/host_vars/prod-brb/cfg.yml index 55b69dfbb..97da3be1a 100644 --- a/ansible/host_vars/prod-brb/cfg.yml +++ b/ansible/host_vars/prod-brb/cfg.yml @@ -13,5 +13,4 @@ BETTERMARKS_APPS_URL: "https://apps.bettermarks.brandenburg.cloud" BETTERMARKS_SCHOOL_URL: "https://school.bettermarks.brandenburg.cloud" HYDRA_ISSUER_URL_SUFFIX: "/" -FEATURE_IDENTITY_MANAGEMENT_STORE_ENABLED: "false" JWT_PUBLIC_KEY: '-----BEGIN RSA PUBLIC KEY-----\nMIICCgKCAgEAm08zACg11BAVpe9JYtjG0LTGtFxPfGdTue3qo7WFtbW15mkjoRMA\nvcjpmuidnOJdDjYyJjyFG8nvQb/pMqZ9eUOc187SH987WumGeByGeQZUnf5rzgiM\nq7VAQfybQgP+eUgojhf/eNLRwASuD1crC4YbZKXef33d/H2nYsPhRQnWOqs0GxGS\noX2lyELLAh44N5UiOeCD/hoCkXMCRrXKJh5W0vRifThtea4j+FMSqmXsoa/+0KBc\ntVIifII5flo7IFIePf5NYARDMwm+0EQU9r589TO+2jYOlutPHEsL084Wpha+vpmN\nV3cFptQDxMBEagkMPrPSlmJeTkEYJzrMNNnhZ+49+lz0YYgALotUfYeR7RhEnAq8\nywSTEfLvtG6IzoYe1PCDRR6+PWTrw8C5Ly5mKg73NQYNO5vKmpXF0t9YYnSPr4Oi\n8EHXHGaRqOqQ2hVa8kPgi0Gi8YqsCYPMXOr6dKJOCoNd7eokFXrLWNyO9+idAuZw\nFt46fPAlRJnCQz88+WMmyVaMaTlhEw7dtdIECN95uvjfo8OVOEI3C3ArI4NWq8ze\nDVFP72YV3zTYvVnz8qklONAcVmncnkhrDXONLhPb1wOJ4gjWDKatPPiIffswZ4c+\n3ujccNkOzKdttUjFushaEdfwYYplh31j7HtjNggtdx0eEJllwOF0xcsCAwEAAQ==\n-----END RSA PUBLIC KEY-----\n' diff --git a/ansible/host_vars/prod-dbc/cfg.yml b/ansible/host_vars/prod-dbc/cfg.yml index cca0260ea..147569f40 100644 --- a/ansible/host_vars/prod-dbc/cfg.yml +++ b/ansible/host_vars/prod-dbc/cfg.yml @@ -3,5 +3,4 @@ DOMAIN: dbildungscloud.de ROCKETCHAT_DNS_PREFIX: scchat. ALERT_STATUS_URL: "https://status.dbildungscloud.de" -FEATURE_IDENTITY_MANAGEMENT_STORE_ENABLED: "false" JWT_PUBLIC_KEY: '-----BEGIN RSA PUBLIC KEY-----\nMIICCgKCAgEAuShjUboB+Qq9KPjJxLRKLSqPe+5k/368vMHvMANmtYOG+BTZnfQb\nVu0gy1xAny/KeiyKefj0ALur//4kZIhEg1K6D/kV7gT1DLsinpOnAd55YEg/CzuF\nOdnGn5mt13mXU7ZXXTOaAgqRJsO4ClKGO9LVzPK5CRPMlmMrMB/ODciqDWkJQZ9Z\neZd4Q+ffO6LLJFcyUM0huytsCXZww6WAgota7fADw0ZHqUAoINtUn+WmxbvpMr8M\nj5AtVgTXwt1BqBGSYRFNBCBzSWx3yY04tXgEUozzSG0GBWQ6dR2mlonjvf+750oB\n7wfGeLUM0e1KQ/D4PqjpgisQYptQbp9YHw1hS9YkKDe+mDpGTKk/MaByIyFuC0D6\n71TsSbJjpPsgrDyROBgGGHkO6//6bNjmwHzDbOtdAOUr4o9qB5SLKgS8QdIfSXxX\ncDB8Yp+Nu2BDKb3mHyhna6TH5/vucGRfxIaI4WIiIrpKTm/Opc9UhduRvI24KSYe\nV4rnfJ8q+5SRTfphpRiPBZdAbp1EyIZAhuU7w0yvS1jQXQt9Sbpq7zIxaooLaCmP\ngQ0djOOCLErZbCGFuAFO9CwLWFakV65naOzHxkSoUr/+IbXGwRKl7cN2sbJLlZc0\nsclGTyy9H4ibmwVvnm1Nw377lZPFmd4TP3lL1piR6lgH4ftup/r4xRECAwEAAQ==\n-----END RSA PUBLIC KEY-----\n' diff --git a/ansible/host_vars/prod-nbc/cfg.yml b/ansible/host_vars/prod-nbc/cfg.yml index 04474f7e3..1b1f3b576 100644 --- a/ansible/host_vars/prod-nbc/cfg.yml +++ b/ansible/host_vars/prod-nbc/cfg.yml @@ -6,8 +6,6 @@ ALERT_STATUS_URL: https://status.niedersachsen.cloud/ NEXTCLOUD_REDIRECT_URL: https://nextcloud.niedersachsen.cloud/apps/files/?dir=/ NEXTCLOUD_BASE_URL: https://nextcloud.niedersachsen.cloud -FEATURE_IDENTITY_MANAGEMENT_STORE_ENABLED: "false" - # Migration wizard FEATURE_USER_MIGRATION_SYSTEM_ID: "646df8f63bcc1a27c52af131" diff --git a/ansible/host_vars/prod-thr/cfg.yml b/ansible/host_vars/prod-thr/cfg.yml index 955d7d135..11d0ee1cf 100644 --- a/ansible/host_vars/prod-thr/cfg.yml +++ b/ansible/host_vars/prod-thr/cfg.yml @@ -15,5 +15,4 @@ NEXTCLOUD_BASE_URL: https://nextcloud.schulcloud-thueringen.de BLOCKLIST_OF_EMAIL_DOMAINS: "schul-cloud.org" -FEATURE_IDENTITY_MANAGEMENT_STORE_ENABLED: "false" JWT_PUBLIC_KEY: '-----BEGIN RSA PUBLIC KEY-----\nMIICCgKCAgEAsAJYGUDM4mApwx+ApjzjK03qTHwUEUNLe4xNj1B0I+K36oJx3jAS\njN8TZqDoIAvIuK6eXIZP3AcxmbphFUmzS8z/9i5tBdf1UXsf1alqaQSmaEEKalXL\npZSH2m53NmVs4mu5uVCKGhlnkOd0/jIuEfuO3Q00YtFlaYglIMqagU1fD+zXgqdI\nwGWWxcIju1960aGo7CqMFTrE+STMowBNH5T/OUn+NWhs94gJWzFM356EehS5LKjI\nkRpXmPI7Utj4x1vMXtDm1VJZ9U0CvUzeTOnAjitjyV8xJV+Muubs6QM1OIBWfPoY\n13364ZkfSsBpRH+uOImNv1mj+/AqFuEyucc52XLI6D4tfZKvEQR/qXUiJTPdgZE0\n8sAkwiEE5Y34h/MJq5/N1AuW5OUMVKqpv4tkXkGL3KHG5A3dwAFV/5inTVr1xdG1\nVx0vdne6Jv4/AejLdey+FoBd90RSYYZgecBvbbM4eq4pTqQMZvAwC/DsDDismibn\nufxYQ0GsZ0qFG//VVMHjHIW26yOuoga52o4El84VJTzdxTv2rDkgM4BvpRtqm+w/\n7jOyvgoHha6HS9nRFcfbV6g7EYjaGk96V5MicIeVzFYV8Yrrb9iBnhiT1gQex+JR\nazwKtqtPFgExtFVx364sVA2bXqgm9pM/TFgQ9Qe+h4GuO+5y+HqbuyUCAwEAAQ==\n-----END RSA PUBLIC KEY-----\n' diff --git a/ansible/host_vars/ref-dbc/cfg.yml b/ansible/host_vars/ref-dbc/cfg.yml index ba79095d9..4387dfbdd 100644 --- a/ansible/host_vars/ref-dbc/cfg.yml +++ b/ansible/host_vars/ref-dbc/cfg.yml @@ -3,5 +3,4 @@ DOMAIN: staging.dbildungscloud.org DISPLAY_REQUEST_LEVEL: -1 ALERT_STATUS_URL: https://status.dbildungscloud.de/ -FEATURE_IDENTITY_MANAGEMENT_LOGIN_ENABLED: "true" JWT_PUBLIC_KEY: '-----BEGIN RSA PUBLIC KEY-----\nMIICCgKCAgEAzmY2P+LW1ImBVKLsqnP8Xiel7agXL94W76Xeo7JfeCBZzKGHzMJH\n0F4SnpqXoWADQ3spoWohgr/suR604Zo63oBb6c5nIqt+KNZdOtkCEOb9clYtI0CE\nLUqtRXtaVPDaGjK4+1R5oZiDZ2zUsBhTXp0FqCpN7dQeWbM1J8X+CWxEdMT8kaGu\nMjpWLIoB+JYWu8U5zc1nNU4VYoeMWRPNBbnj832ZpnZ+LMIF9HxlyAR2uevyMwGj\nDhL8AJfyiq42p89ksEiLZ3y/KLX6WKKP2JfDulAotqv5CYjR0wvsZgT8vr2cnQ80\nhaTv8aApJ7xZ4ElhuAe6SOq6cWr/x8uQZQFqH6GXQne2EBx2OVtMo8yXmwKTX2Ws\n0RxPF3zNnaFL7yb07jt1R4vhXbdIecOY4BQLx4ICiaezqtqJEDiZz9varJ/MQTyl\njfx1DTFkG0Q3Ce34mz6/N+fEoykE8uyqioK41trf/Zipm0Fwjq73mMGMdKauWTz/\n5Dzjh09JRYyRTS3D2K0X9FLkjMeIr953NNYG9XX4vMUiysLdFHN7NA8TaDcuSXSe\n/SXPfnyhgU5SDUBMYVOhW3otBWM/B41O634x7geU/RCKWThiHqrfXoFPGvvMJQO8\nuEJ0rgcZyS0WOcruLm8EuZqaMb7rR5t5EXv4Mlu9YA3XuwyrM8H7lu0CAwEAAQ==\n-----END RSA PUBLIC KEY-----\n' diff --git a/ansible/host_vars/ref-thr/cfg.yml b/ansible/host_vars/ref-thr/cfg.yml index a6847e896..96079fdad 100644 --- a/ansible/host_vars/ref-thr/cfg.yml +++ b/ansible/host_vars/ref-thr/cfg.yml @@ -13,5 +13,4 @@ FEATURE_H5P_EDITOR_ENABLED: "true" BLOCKLIST_OF_EMAIL_DOMAINS: "schul-cloud.org" -FEATURE_IDENTITY_MANAGEMENT_STORE_ENABLED: "false" JWT_PUBLIC_KEY: '-----BEGIN RSA PUBLIC KEY-----\nMIICCgKCAgEAsMKXe1sn5Ifc0wxEdsmKYkhMkMoo4HYOZu4rdXahPCcBmIa5AN2u\nHO1q2+gtLFqT/iT8/dUTZrorrEEZq6+flGDwZC9IEkNv1Cahdg+6vAr3X/8zFUdn\nW/R04REeFS0T59YuoGJs8k7CbrjDqlwqzjIggHUrV2JGDLsGOl/2Z4JjeajSAGBH\njor5YRTD9TlO5eLSermzksH2OnC/IiP96UKb4dTdzRLtTPBC3mxxx8+sSGSRiCma\n4ebN36E9ErzXaDUdzJ++7UJ/gZtY3LhBKav6F/G0025Er8OSRe6r7WnDgFb+JevL\nzWQ+DSNeaAsn8X4qhQ1u7qq7kDwOam+EmeCQbxrv1CbC+wWRv6Ik1XHo7Wjk6vsT\n1E+stdIO8OAiCL0KfdkmesvxIoGL94YdFr4QWZ0bApH/MLijQyl3fu9moBsT8/iu\n1QTRaDTk1AbmUc7FHtziuE1+lVn9Qetjwm5ANGr022QuhmOa0HhaqAfXL8hXEoca\nNnFmeB9C2mjweN6xHkyY3nOB6InzLf1ju7+k548pt6pl8UbbRApdYbo/KyMC/Ma5\nmKrL2P/LC1bsssQh/AXaMM2x1GcmFDaEE00gD3s4acgeLtMZxy+g2eD90FyKgDCb\nyoKagcmbGT8TI6ExNjuhwAnJdd0O5xwSCso50W/giIuIFm1XcHwvHQUCAwEAAQ==\n-----END RSA PUBLIC KEY-----\n'