From 06c471e4e7fe1820071738aa5b7071e298a24e7b Mon Sep 17 00:00:00 2001 From: Alexander Rieder Date: Tue, 7 Mar 2023 14:07:24 +0100 Subject: [PATCH] Native HANA consumption --- .../3638-kyma-multitenant/parameters.json | 11 ++++++++-- .../usecase-customer-template.json | 1 + .../3638-kyma-multitenant/usecase.json | 19 ++++++++++++++++++ .../3999-kyma-day2-operations/README.md | 2 +- .../3999-kyma-day2-operations/parameters.json | 6 +++--- .../usecase-customer-template.json | 1 + .../3999-kyma-day2-operations/usecase.json | 20 +++++++++++++++++++ .../parameters.json | 11 ++++++++-- .../usecase-customer-template.json | 1 + .../usecase.json | 19 ++++++++++++++++++ 10 files changed, 83 insertions(+), 8 deletions(-) diff --git a/usecases/released/discoverycenter/3638-kyma-multitenant/parameters.json b/usecases/released/discoverycenter/3638-kyma-multitenant/parameters.json index 344e00ef..0a59d235 100644 --- a/usecases/released/discoverycenter/3638-kyma-multitenant/parameters.json +++ b/usecases/released/discoverycenter/3638-kyma-multitenant/parameters.json @@ -3,7 +3,6 @@ "usecasefile": "usecases/released/discoverycenter/3638-kyma-multitenant/usecase.json", "region": "us10", "subaccountname": "EasyFranchise", - "cfspacename": "hana", "loginmethod": "sso", "envvariables": { "BTPSA_KYMA_IMAGE_NAME_APPROUTER": "ghcr.io/sap-samples/btp-kyma-multitenant-extension-approuter:main", @@ -14,5 +13,13 @@ "BTPSA_KYMA_IMAGE_NAME_EMAIL_SERVICE": "ghcr.io/sap-samples/btp-kyma-multitenant-extension-email-service:main", "BTPSA_KYMA_IMAGE_NAME_UI": "ghcr.io/sap-samples/btp-kyma-multitenant-extension-ui:main", "BTPSA_KYMA_IMAGE_NAME_BUSINESS_PARTNER_MOCK": "ghcr.io/sap-samples/btp-kyma-multitenant-extension-business-partner-mock:main" - } + }, + "myusergroups": [ + { + "name": "admins", + "members": [ + + ] + } + ] } \ No newline at end of file diff --git a/usecases/released/discoverycenter/3638-kyma-multitenant/usecase-customer-template.json b/usecases/released/discoverycenter/3638-kyma-multitenant/usecase-customer-template.json index 5c34f6f2..59e0015b 100644 --- a/usecases/released/discoverycenter/3638-kyma-multitenant/usecase-customer-template.json +++ b/usecases/released/discoverycenter/3638-kyma-multitenant/usecase-customer-template.json @@ -14,6 +14,7 @@ { "name": "easyfranchise-", "plan": "default", + "targetenvironment": "sapbtp", "category": "APPLICATION", "repeatstatusrequest": 10, "repeatstatustimeout": 120, diff --git a/usecases/released/discoverycenter/3638-kyma-multitenant/usecase.json b/usecases/released/discoverycenter/3638-kyma-multitenant/usecase.json index 147ddf32..8f65c4a1 100644 --- a/usecases/released/discoverycenter/3638-kyma-multitenant/usecase.json +++ b/usecases/released/discoverycenter/3638-kyma-multitenant/usecase.json @@ -25,12 +25,14 @@ "name": "destination", "plan": "lite", "entitleonly": true, + "targetenvironment": "sapbtp", "category": "SERVICE" }, { "name": "xsuaa", "plan": "broker", "entitleonly": true, + "targetenvironment": "sapbtp", "category": "SERVICE" }, { @@ -40,6 +42,7 @@ "repeatstatusrequest": 60, "repeatstatustimeout": 3600, "instancename": "EasyFranchiseHANADB", + "targetenvironment": "sapbtp", "parameters": { "data": { "edition": "cloud", @@ -54,6 +57,22 @@ ] } } + }, + { + "name": "hana-cloud-tools", + "plan": "tools", + "targetenvironment": "sapbtp", + "category": "APPLICATION", + "repeatstatusrequest": 10, + "repeatstatustimeout": 120, + "requiredrolecollections": [ + { + "name": "SAP HANA Cloud Administrator", + "assignedUserGroupsFromParameterFile": [ + "admins" + ] + } + ] } ], "executeAfterAccountSetup": [ diff --git a/usecases/released/discoverycenter/3999-kyma-day2-operations/README.md b/usecases/released/discoverycenter/3999-kyma-day2-operations/README.md index 9250e90a..10956d66 100644 --- a/usecases/released/discoverycenter/3999-kyma-day2-operations/README.md +++ b/usecases/released/discoverycenter/3999-kyma-day2-operations/README.md @@ -61,6 +61,6 @@ Now run the main script `btpsa` with the following command: ./btpsa -parameterfile 'usecases/released/discoverycenter/3999-kyma-day2-operations/parameters.json' -globalaccount '' -myemail '' ``` -> Note: Before the deployment starts you can choose between two options (Mission-start and Mission-end). The Mission-start option will setup the account and neccessary application in order to execute the mission and enhance the existing application with the day2 opteration features. The Mission-end option contains all tasks from the mission itself and you don't need to go through the mission steps. For the complete expirience it is recommended to choose the Mission-start option. +> Note: Before the deployment starts you can choose between two options (Mission-start and Mission-end). The Mission-start option will setup the account and necessary application in order to execute the mission and enhance the existing application with the day2 operation features. The Mission-end option contains all tasks from the mission itself and you don't need to go through the mission steps. For the complete experience it is recommended to choose the Mission-start option. The btp-setup-automator script will now prepare your SAP BTP account to cover the discovery center mission. You can have a look at the [usecase.json](usecase.json) and [parameters.json](parameters.json) for more details about the used services and configuration parameters (e.g. DB Password for SAP HANA Cloud). diff --git a/usecases/released/discoverycenter/3999-kyma-day2-operations/parameters.json b/usecases/released/discoverycenter/3999-kyma-day2-operations/parameters.json index 43ca64d3..4f196473 100644 --- a/usecases/released/discoverycenter/3999-kyma-day2-operations/parameters.json +++ b/usecases/released/discoverycenter/3999-kyma-day2-operations/parameters.json @@ -3,7 +3,6 @@ "usecasefile": "usecases/released/discoverycenter/3999-kyma-day2-operations/usecase.json", "region": "us10", "subaccountname": "EasyFranchise", - "cfspacename": "hana", "loginmethod": "sso", "envvariables": { "BTPSA_KYMA_IMAGE_TAG": "main", @@ -21,8 +20,9 @@ }, "myusergroups": [ { - "name": "admins", - "members": [ + "name": "admins", + "members": [ + ] } ] diff --git a/usecases/released/discoverycenter/3999-kyma-day2-operations/usecase-customer-template.json b/usecases/released/discoverycenter/3999-kyma-day2-operations/usecase-customer-template.json index 5c34f6f2..59e0015b 100644 --- a/usecases/released/discoverycenter/3999-kyma-day2-operations/usecase-customer-template.json +++ b/usecases/released/discoverycenter/3999-kyma-day2-operations/usecase-customer-template.json @@ -14,6 +14,7 @@ { "name": "easyfranchise-", "plan": "default", + "targetenvironment": "sapbtp", "category": "APPLICATION", "repeatstatusrequest": 10, "repeatstatustimeout": 120, diff --git a/usecases/released/discoverycenter/3999-kyma-day2-operations/usecase.json b/usecases/released/discoverycenter/3999-kyma-day2-operations/usecase.json index 9437fd16..97a5f1c2 100644 --- a/usecases/released/discoverycenter/3999-kyma-day2-operations/usecase.json +++ b/usecases/released/discoverycenter/3999-kyma-day2-operations/usecase.json @@ -25,18 +25,21 @@ "name": "destination", "plan": "lite", "entitleonly": true, + "targetenvironment": "sapbtp", "category": "SERVICE" }, { "name": "xsuaa", "plan": "broker", "entitleonly": true, + "targetenvironment": "sapbtp", "category": "SERVICE" }, { "name": "hana-cloud", "plan": "hana-free", "category": "SERVICE", + "targetenvironment": "sapbtp", "repeatstatusrequest": 60, "repeatstatustimeout": 3600, "instancename": "EasyFranchiseHANADB", @@ -55,9 +58,26 @@ } } }, + { + "name": "hana-cloud-tools", + "plan": "tools", + "targetenvironment": "sapbtp", + "category": "APPLICATION", + "repeatstatusrequest": 10, + "repeatstatustimeout": 120, + "requiredrolecollections": [ + { + "name": "SAP HANA Cloud Administrator", + "assignedUserGroupsFromParameterFile": [ + "admins" + ] + } + ] + }, { "name": "cicd-app", "plan": "free", + "targetenvironment": "sapbtp", "category": "APPLICATION", "repeatstatusrequest": 10, "repeatstatustimeout": 120, diff --git a/usecases/released/discoverycenter/4000-kyma-identity-management/parameters.json b/usecases/released/discoverycenter/4000-kyma-identity-management/parameters.json index 027e7299..51479b4e 100644 --- a/usecases/released/discoverycenter/4000-kyma-identity-management/parameters.json +++ b/usecases/released/discoverycenter/4000-kyma-identity-management/parameters.json @@ -3,7 +3,6 @@ "usecasefile": "usecases/released/discoverycenter/4000-kyma-identity-management/usecase.json", "region": "us10", "subaccountname": "EasyFranchise", - "cfspacename": "hana", "loginmethod": "sso", "envvariables": { "BTPSA_KYMA_IMAGE_NAME_APPROUTER": "ghcr.io/sap-samples/btp-kyma-identity-management-approuter:main", @@ -14,5 +13,13 @@ "BTPSA_KYMA_IMAGE_NAME_EMAIL_SERVICE": "ghcr.io/sap-samples/btp-kyma-identity-management-email-service:main", "BTPSA_KYMA_IMAGE_NAME_UI": "ghcr.io/sap-samples/btp-kyma-identity-management-ui:main", "BTPSA_KYMA_IMAGE_NAME_BUSINESS_PARTNER_MOCK": "ghcr.io/sap-samples/btp-kyma-identity-management-business-partner-mock:main" - } + }, + "myusergroups": [ + { + "name": "admins", + "members": [ + + ] + } + ] } \ No newline at end of file diff --git a/usecases/released/discoverycenter/4000-kyma-identity-management/usecase-customer-template.json b/usecases/released/discoverycenter/4000-kyma-identity-management/usecase-customer-template.json index 5c34f6f2..59e0015b 100644 --- a/usecases/released/discoverycenter/4000-kyma-identity-management/usecase-customer-template.json +++ b/usecases/released/discoverycenter/4000-kyma-identity-management/usecase-customer-template.json @@ -14,6 +14,7 @@ { "name": "easyfranchise-", "plan": "default", + "targetenvironment": "sapbtp", "category": "APPLICATION", "repeatstatusrequest": 10, "repeatstatustimeout": 120, diff --git a/usecases/released/discoverycenter/4000-kyma-identity-management/usecase.json b/usecases/released/discoverycenter/4000-kyma-identity-management/usecase.json index 8f1497cd..0b56a315 100644 --- a/usecases/released/discoverycenter/4000-kyma-identity-management/usecase.json +++ b/usecases/released/discoverycenter/4000-kyma-identity-management/usecase.json @@ -25,17 +25,20 @@ "name": "destination", "plan": "lite", "entitleonly": true, + "targetenvironment": "sapbtp", "category": "SERVICE" }, { "name": "xsuaa", "plan": "broker", "entitleonly": true, + "targetenvironment": "sapbtp", "category": "SERVICE" }, { "name": "hana-cloud", "plan": "hana-free", + "targetenvironment": "sapbtp", "category": "SERVICE", "repeatstatusrequest": 60, "repeatstatustimeout": 3600, @@ -54,6 +57,22 @@ ] } } + }, + { + "name": "hana-cloud-tools", + "plan": "tools", + "targetenvironment": "sapbtp", + "category": "APPLICATION", + "repeatstatusrequest": 10, + "repeatstatustimeout": 120, + "requiredrolecollections": [ + { + "name": "SAP HANA Cloud Administrator", + "assignedUserGroupsFromParameterFile": [ + "admins" + ] + } + ] } ], "executeAfterAccountSetup": [