diff --git a/rds/base/charts/all/Chart.lock b/rds/base/charts/all/Chart.lock index ef0c938..16228e3 100644 --- a/rds/base/charts/all/Chart.lock +++ b/rds/base/charts/all/Chart.lock @@ -51,4 +51,4 @@ dependencies: repository: https://owncloud-docker.github.io/helm-charts version: 0.4.1 digest: sha256:c23f6f5d58ca92ec95d87fe4d97de87b8d07cf9b0da3f85b6eed9d95e3c5b27c -generated: "2024-02-02T10:45:47.952156261+01:00" +generated: "2024-01-26T12:45:44.958867792+01:00" diff --git a/rds/base/charts/all/charts/jaeger-0.34.0.tgz b/rds/base/charts/all/charts/jaeger-0.34.0.tgz index 7881768..058d4ba 100644 Binary files a/rds/base/charts/all/charts/jaeger-0.34.0.tgz and b/rds/base/charts/all/charts/jaeger-0.34.0.tgz differ diff --git a/rds/base/charts/all/charts/layer0-describo-0.2.9.tgz b/rds/base/charts/all/charts/layer0-describo-0.2.9.tgz index b9e2a9e..fefdc03 100644 Binary files a/rds/base/charts/all/charts/layer0-describo-0.2.9.tgz and b/rds/base/charts/all/charts/layer0-describo-0.2.9.tgz differ diff --git a/rds/base/charts/all/charts/layer0-helper-describo-token-updater-0.2.1.tgz b/rds/base/charts/all/charts/layer0-helper-describo-token-updater-0.2.1.tgz index c2d22e6..68893dd 100644 Binary files a/rds/base/charts/all/charts/layer0-helper-describo-token-updater-0.2.1.tgz and b/rds/base/charts/all/charts/layer0-helper-describo-token-updater-0.2.1.tgz differ diff --git a/rds/base/charts/all/charts/layer0-web-0.3.3.tgz b/rds/base/charts/all/charts/layer0-web-0.3.3.tgz index a58c1fe..149278a 100644 Binary files a/rds/base/charts/all/charts/layer0-web-0.3.3.tgz and b/rds/base/charts/all/charts/layer0-web-0.3.3.tgz differ diff --git a/rds/base/charts/all/charts/layer1-port-openscienceframework-0.2.3.tgz b/rds/base/charts/all/charts/layer1-port-openscienceframework-0.2.3.tgz index 29f68d4..a680161 100644 Binary files a/rds/base/charts/all/charts/layer1-port-openscienceframework-0.2.3.tgz and b/rds/base/charts/all/charts/layer1-port-openscienceframework-0.2.3.tgz differ diff --git a/rds/base/charts/all/charts/layer1-port-owncloud-0.3.3.tgz b/rds/base/charts/all/charts/layer1-port-owncloud-0.3.3.tgz index 0df6d8e..2c11272 100644 Binary files a/rds/base/charts/all/charts/layer1-port-owncloud-0.3.3.tgz and b/rds/base/charts/all/charts/layer1-port-owncloud-0.3.3.tgz differ diff --git a/rds/base/charts/all/charts/layer1-port-reva-0.2.0.tgz b/rds/base/charts/all/charts/layer1-port-reva-0.2.0.tgz index 798786d..b397b6e 100644 Binary files a/rds/base/charts/all/charts/layer1-port-reva-0.2.0.tgz and b/rds/base/charts/all/charts/layer1-port-reva-0.2.0.tgz differ diff --git a/rds/base/charts/all/charts/layer1-port-zenodo-0.2.2.tgz b/rds/base/charts/all/charts/layer1-port-zenodo-0.2.2.tgz index 8d5cf43..9150469 100644 Binary files a/rds/base/charts/all/charts/layer1-port-zenodo-0.2.2.tgz and b/rds/base/charts/all/charts/layer1-port-zenodo-0.2.2.tgz differ diff --git a/rds/base/charts/all/charts/layer2-exporter-service-0.2.3.tgz b/rds/base/charts/all/charts/layer2-exporter-service-0.2.3.tgz index 1718285..33b3b0a 100644 Binary files a/rds/base/charts/all/charts/layer2-exporter-service-0.2.3.tgz and b/rds/base/charts/all/charts/layer2-exporter-service-0.2.3.tgz differ diff --git a/rds/base/charts/all/charts/layer2-metadata-service-0.2.3.tgz b/rds/base/charts/all/charts/layer2-metadata-service-0.2.3.tgz index 3758b25..62ddabc 100644 Binary files a/rds/base/charts/all/charts/layer2-metadata-service-0.2.3.tgz and b/rds/base/charts/all/charts/layer2-metadata-service-0.2.3.tgz differ diff --git a/rds/base/charts/all/charts/layer2-port-service-0.2.5.tgz b/rds/base/charts/all/charts/layer2-port-service-0.2.5.tgz index 2f913d9..f2ce825 100644 Binary files a/rds/base/charts/all/charts/layer2-port-service-0.2.5.tgz and b/rds/base/charts/all/charts/layer2-port-service-0.2.5.tgz differ diff --git a/rds/base/charts/all/charts/layer3-research-manager-0.3.4.tgz b/rds/base/charts/all/charts/layer3-research-manager-0.3.4.tgz index c638118..6238703 100644 Binary files a/rds/base/charts/all/charts/layer3-research-manager-0.3.4.tgz and b/rds/base/charts/all/charts/layer3-research-manager-0.3.4.tgz differ diff --git a/rds/base/charts/all/charts/layer3-token-storage-0.3.0.tgz b/rds/base/charts/all/charts/layer3-token-storage-0.3.0.tgz index 66593d6..99ef394 100644 Binary files a/rds/base/charts/all/charts/layer3-token-storage-0.3.0.tgz and b/rds/base/charts/all/charts/layer3-token-storage-0.3.0.tgz differ diff --git a/rds/base/charts/all/charts/redis-16.13.2.tgz b/rds/base/charts/all/charts/redis-16.13.2.tgz index adda012..a6ac9c3 100644 Binary files a/rds/base/charts/all/charts/redis-16.13.2.tgz and b/rds/base/charts/all/charts/redis-16.13.2.tgz differ diff --git a/rds/base/charts/all/charts/redis-cluster-7.6.4.tgz b/rds/base/charts/all/charts/redis-cluster-7.6.4.tgz index c50cecf..743daa4 100644 Binary files a/rds/base/charts/all/charts/redis-cluster-7.6.4.tgz and b/rds/base/charts/all/charts/redis-cluster-7.6.4.tgz differ diff --git a/rds/base/values/values.yaml b/rds/base/values/values.yaml index b3316e8..f37a055 100644 --- a/rds/base/values/values.yaml +++ b/rds/base/values/values.yaml @@ -37,17 +37,6 @@ global: SUPPORT_EMAIL: drive@sunet.se MANUAL_URL: www.sunet.se/services/molnbaserade-tjanster/sunet-drive storageClass: csi-sc-cinderplugin - env: - - name: OPENSCIENCEFRAMEWORK_OAUTH_CLIENT_ID - valueFrom: - secretKeyRef: - name: osf-client - key: osf-client-id - - name: OPENSCIENCEFRAMEWORK_OAUTH_CLIENT_SECRET - valueFrom: - secretKeyRef: - name: osf-client - key: osf-client-secret layer0-describo: postgresql: postgresqlDatabase: describo @@ -87,13 +76,17 @@ layer1-port-zenodo: enabled: true environment: ADDRESS: https://sandbox.zenodo.org + OAUTH_CLIENT_ID: IAMZENODOID + OAUTH_CLIENT_SECRET: IAMZENODOSECRET layer1-port-openscienceframework: enabled: true environment: ADDRESS: https://test.accounts.test.osf.io API_ADDRESS: https://api.test.osf.io/v2 + # needs to be adjusted to correct values + OAUTH_CLIENT_ID: rdsdrivetest + OAUTH_CLIENT_SECRET: THISISATEST layer2-metadata-service: {} layer3-research-manager: {} -layer3-token-storage: - image: zivgitlab.wwu.io/sciebo-rds/sciebo-rds/central_service_token_storage:develop +layer3-token-storage: {} loglevel: DEBUG