Support Data Center aggregation by default when auto-discovering syst…

…em tenants (#3778) * Support Data Center aggregation by default when auto-discovering system tenants * Bump values.yaml * Remove image bump * Adapt E2E tests * Bump values.yaml * Fix e2e tests om system fetcher --------- Co-authored-by: I568766 <[email protected]>
kyma-incubator · Apr 17, 2024 · a32c48d · a32c48d
1 parent ef68ff6
commit a32c48d
Show file tree

Hide file tree

Showing 2 changed files with 77 additions and 49 deletions.
diff --git a/chart/compass/values.yaml b/chart/compass/values.yaml
@@ -228,7 +228,7 @@ global:
       name: compass-external-services-mock
     e2e_tests:
       dir: dev/incubator/
-      version: "PR-3793"
+      version: "PR-3778"
       name: compass-e2e-tests
   isLocalEnv: false
   isForTesting: false
@@ -1118,8 +1118,8 @@ global:
     appTemplatesProductLabel: "systemRole"
     systemSourceKey: "prop"
     appTemplates: []
-    templatePlaceholderToSystemKeyMappings: '[ { "placeholder_name": "name", "system_key": "$.displayName" }, { "placeholder_name": "display-name", "system_key": "$.displayName" }, { "placeholder_name": "systemNumber", "system_key": "$.systemNumber" }, { "placeholder_name": "productId", "system_key": "$.productId" }, { "placeholder_name": "ppmsProductVersionId", "system_key": "$.ppmsProductVersionId", "optional": true }, { "placeholder_name": "region", "system_key": "$.additionalAttributes.systemSCPLandscapeID", "optional": true }, { "placeholder_name": "description", "system_key": "$.productDescription", "optional": true }, { "placeholder_name": "baseUrl", "system_key": "$.additionalUrls.mainUrl", "optional": true }, { "placeholder_name": "providerName", "system_key": "$.infrastructureProvider", "optional": true } ]'
-    templateOverrideApplicationInput: '{"name": "{{name}}","description": "{{description}}","providerName": "{{providerName}}","statusCondition": "INITIAL","systemNumber": "{{systemNumber}}","labels": {"managed": "true","productId": "{{productId}}","ppmsProductVersionId": "{{ppmsProductVersionId}}","region": "{{region}}"},"baseUrl": "{{baseUrl}}"}'
+    templatePlaceholderToSystemKeyMappings: '[ { "placeholder_name": "name", "system_key": "$.displayName" }, { "placeholder_name": "display-name", "system_key": "$.displayName" }, { "placeholder_name": "systemNumber", "system_key": "$.systemNumber" }, { "placeholder_name": "productId", "system_key": "$.productId" }, { "placeholder_name": "ppmsProductVersionId", "system_key": "$.ppmsProductVersionId", "optional": true }, { "placeholder_name": "region", "system_key": "$.additionalAttributes.systemSCPLandscapeID", "optional": true }, { "placeholder_name": "dataCenterId", "system_key": "$.regionId", "optional": true }, { "placeholder_name": "description", "system_key": "$.productDescription", "optional": true }, { "placeholder_name": "baseUrl", "system_key": "$.additionalUrls.mainUrl", "optional": true }, { "placeholder_name": "providerName", "system_key": "$.infrastructureProvider", "optional": true } ]'
+    templateOverrideApplicationInput: '{ "name": "{{name}}", "description": "{{description}}", "providerName": "{{providerName}}", "statusCondition": "INITIAL", "systemNumber": "{{systemNumber}}", "labels": { "managed": "true", "productId": "{{productId}}", "ppmsProductVersionId": "{{ppmsProductVersionId}}", "region": "{{region}}", "dataCenter": "{{dataCenterId}}" }, "baseUrl": "{{baseUrl}}" }'
     http:
       client:
         skipSSLValidation: false