Skip to content

Commit f824cf8

Browse files
authored
Merge branch 'main' into toSapMachine.io
2 parents 14b8bd3 + 593a58f commit f824cf8

13 files changed

+106
-38
lines changed

docs/10-concepts/kyma-environment-468c2f3.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Kyma implements a dedicated application runtime to deploy highly scalable, robus
1919
2020
Every Kyma environment consists of:
2121

22-
- A Kubernetes cluster based on project "Gardener" on a cloud provider and region \(data center\) of your choice. To find out the available regions and providers, see [Regions for the Kyma Environment](regions-for-the-kyma-environment-557ec3a.md).
22+
- One or more Kubernetes clusters based on project "Gardener" on a cloud provider and region \(data center\) of your choice. To find out the available regions and providers, see [Regions for the Kyma Environment](regions-for-the-kyma-environment-557ec3a.md).
2323
- A set of Kyma modules picked by a user in the release channel of their choice installed on the provisioned cluster.
2424

2525
![](images/SKR_stack_6b4e9b8.png)
@@ -30,7 +30,7 @@ Every Kyma environment consists of:
3030

3131
## Integration
3232

33-
Every Kyma environment runs on a single Kubernetes cluster created for a specific subaccount. The configuration of the Kyma environment enables you to connect it to a multitude of SAP systems. This way, you can build various formations that aggregate the SAP systems and environment according to your business use cases.
33+
Kyma environment runs on one or more Kubernetes clusters created in a specific subaccount. The configuration of the Kyma environment enables you to connect it to a multitude of SAP systems. This way, you can build various formations that aggregate the SAP systems and environment according to your business use cases.
3434

3535
SAP systems connected to a Kyma environment expose APIs and events. To extend the existing logic of these SAP services, you can build serverless applications called “Functions”, and trigger them to react to particular events or calls to your application's API. You can also use the Kyma environment to deploy microservices or even build full-stack applications.
3636

docs/10-concepts/regions-for-the-kyma-environment-557ec3a.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,9 @@ Europe \(Frankfurt\) EU Access
493493
</td>
494494
<td valign="top">
495495

496-
`aws`
496+
`aws`
497+
498+
`build-runtime-aws`
497499

498500
</td>
499501
</tr>
@@ -1787,5 +1789,5 @@ For more details on the Load Balancers and their features, check out the officia
17871789

17881790
[Available Plans in the Kyma Environment](../50-administration-and-ops/available-plans-in-the-kyma-environment-befe01d.md "Depending on your global account type, you have access to a different plan that specifies the cluster parameters for the Kyma environment.")
17891791

1790-
[Provisioning and Updating Parameters in the Kyma Environment](../50-administration-and-ops/provisioning-and-updating-parameters-in-the-kyma-environment-e2e13bf.md "You can configure the cluster parameters in the Kyma environment.")
1792+
[Provisioning and Updating Parameters in the Kyma Environment](../50-administration-and-ops/provisioning-and-updating-parameters-in-the-kyma-environment-e2e13bf.md "When creating a Kyma cluster, you can configure various parameters to adjust it to your specific needs.")
17911793

docs/10-concepts/service-plans-and-metering-for-cloud-foundry-runtime-8d41fa4.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,7 @@ There are two application settings that define how much runtime memory an applic
578578

579579

580580
> ### Note:
581-
> The total amount of runtime memory that an application uses when all of its instances are running is displayed on the application's *Overview* page under *All Instances Memory*.
581+
> The total amount of runtime memory used by the application is displayed on the *Application Overview* page under *Current Application Memory Usage*.
582582
583583
You can specify custom values for these settings when deploying an application in the Cloud Foundry environment. You can also change them for an application that has already been deployed without having to redeploy it.
584584

docs/10-concepts/trial-accounts-and-free-tier-046f127.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,6 @@ In the [SAP Discovery Center service catalog overview](https://discovery-center.
8888

8989
- A trial account includes 4 GB of memory for applications.
9090

91-
> ### Restriction:
92-
> The trial offering for SAP BTP, Cloud Foundry runtime is temporarily limited. New SAP BTP trial accounts are currently provisioned with no runtime memory quota, making it impossible to deploy applications. Trial accounts created before October 15, 2025 aren’t affected. For more information, see [the announcement blog post](https://community.sap.com/t5/technology-blog-posts-by-sap/btp-trial-update-cf-runtime-availability/ba-p/14247240) and follow the updates on SAP Community.
93-
9491
- You can use 8 GB of instance memory.
9592

9693
- There are 10 total routes and 40 total services available.

docs/20-getting-started/about-the-trial-account-c4fff0f.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ A trial account lets you try out the Kyma environment for free with a restricted
1212

1313
The trial account is valid for 90 days. During this time, you can explore and use the basic functionality of SAP BTP, Kyma runtime for 14 days. After 90 days, your account is automatically deleted, and you’ll no longer be able to access your data. See [Trial Accounts and Free Tier](https://help.sap.com/docs/btp/sap-business-technology-platform-internal/trial-accounts-and-free-tier?locale=en-US&state=DRAFT&version=Internal#trial-lifecycle) to learn more about the trial periods.
1414

15-
Note that while your trial account is valid for 90 days, the Kyma environment that you create with it expires **14 days** after its creation and is then deleted permanently. To create a new Kyma environment, you must first disable the expired Kyma on your subaccount. To learn how to do that, see [Disable Expired Trial Kyma Environment](setting-up-your-trial-account-57074a0.md#loiod022bb1dde7d499685ee6ef3ab825680).
15+
Note that while your trial account is valid for 90 days, the Kyma environment that you create with it expires **14 days** after its creation and is then deleted permanently. To create a new Kyma environment, you must first disable the expired Kyma in your subaccount. To learn how to do that, see [Disable Expired Trial Kyma Environment](setting-up-your-trial-account-57074a0.md#loiod022bb1dde7d499685ee6ef3ab825680).
1616

1717
> ### Caution:
1818
> Once your account has expired, your cluster is deleted and all the cluster resources are removed. We recommend that you back up your cluster configuration to restore it quickly if you choose to create a new Kyma environment.
@@ -24,6 +24,7 @@ Note that while your trial account is valid for 90 days, the Kyma environment th
2424
## Scope and Limitations
2525

2626
- It's possible to provision only one Kyma environment per global account.
27+
- You can only create a single Kyma cluster per subaccount.
2728
- You can manage members in your trial account.
2829
- Kyma trial accounts are available in all SAP BTP regions.
2930
- A trial account provides you with a 1-node cluster with 4 vCPU and 16 GB of memory. An idle cluster without any customer workload uses around 33% of vCPU and 33% of memory.

docs/20-getting-started/getting-started-with-a-trial-account-in-the-cloud-foundry-environment-e50ab7b.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44

55
Quickly get started with a trial account.
66

7-
> ### Restriction:
8-
> The trial offering for SAP BTP, Cloud Foundry runtime is temporarily limited. New SAP BTP trial accounts are currently provisioned with no runtime memory quota, making it impossible to deploy applications. Trial accounts created before October 15, 2025 aren’t affected. For more information, see [the announcement blog post](https://community.sap.com/t5/technology-blog-posts-by-sap/btp-trial-update-cf-runtime-availability/ba-p/14247240) and follow the updates on SAP Community.
9-
107

118

129
<a name="loioe50ab7b423f04a8db301d7678946626e__section_ncd_t5k_wbb"/>

docs/30-development/service-binding-parameters-c7b09b7.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ Some services support additional configuration parameters with the bind request.
99
1010
The SAP Cloud Deployment service supports the following methods for the specification of service-binding parameters:
1111

12-
- Method 1 - In-line parameters into MTA descriptors \(deployment or extension descriptors\)
13-
- Method 2 - JSON file with external configuration, containing the required service-configuration parameters
12+
- Method A - In-line parameters into MTA descriptors \(deployment or extension descriptors\)
13+
- Method B - JSON file with external configuration, containing the required service-configuration parameters
1414
- A combination of the first two methods, as described in the table below
1515

1616
> ### Note:
@@ -25,12 +25,12 @@ In the MTA deployment descriptor, the `requires` dependency between a module and
2525
<tr>
2626
<th valign="top">
2727

28-
Method 1
28+
Method A
2929

3030
</th>
3131
<th valign="top">
3232

33-
Method 2
33+
Method B
3434

3535
</th>
3636
<th valign="top">
@@ -135,9 +135,9 @@ Combination of the two methods
135135
> ### Note:
136136
> The examples are only illustrative for service-binding parameters. Each service offering supports its own set of parameters.
137137
138-
Method 1 shows how to define the service-binding parameters in the MTA deployment descriptor \(`mtad.yaml`\). If you use this method, all parameters under the special `config` parameter are used for the service-bind request. This parameter is optional.
138+
Method A shows how to define the service-binding parameters in the MTA deployment descriptor \(`mtad.yaml`\). If you use this method, all parameters under the special `config` parameter are used for the service-bind request. This parameter is optional.
139139
140-
Method 2 shows how to define the service-binding parameters for a service-bind request in a JSON file. Using this method, there are dependencies on entries in other configuration files. For example, when using the JSON method, an additional entry must be included in the `MANIFEST.MF` file. This new entry has to define the path to the JSON file that contains the parameters and the name of the resource for which the parameters should be used.
140+
Method B shows how to define the service-binding parameters for a service-bind request in a JSON file. Using this method, there are dependencies on entries in other configuration files. For example, when using the JSON method, an additional entry must be included in the `MANIFEST.MF` file. This new entry has to define the path to the JSON file that contains the parameters and the name of the resource for which the parameters should be used.
141141
142142
Note that when you use the combination of the two methods, the parameters defined in the descriptor have higher priority than the ones defined in the JSON file.
143143

docs/30-development/service-instance-parameters-a36df26.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,8 @@ Using method A, all parameters under the special `config` parameter are used for
135135
136136
Using method B, there are dependencies on further configuration entries in other configuration files. For example, if you use this JSON method, an additional entry must be included in the `MANIFEST.MF` file which defines the path to the JSON file containing the parameters as well as the name of the resource for which the parameters should be used.
137137
138+
Note that when you use the combination of the two methods, the parameters defined in the descriptor have higher priority than the ones defined in the JSON file.
139+
138140
139141
140142
<a name="loioa36df26b36484129b482ae20c3eb8004__section_ap5_lrd_mfc"/>

docs/50-administration-and-ops/available-plans-in-the-kyma-environment-befe01d.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1281,7 +1281,7 @@ Updating
12811281
**Related Information**
12821282

12831283

1284-
[Provisioning and Updating Parameters in the Kyma Environment](provisioning-and-updating-parameters-in-the-kyma-environment-e2e13bf.md "You can configure the cluster parameters in the Kyma environment.")
1284+
[Provisioning and Updating Parameters in the Kyma Environment](provisioning-and-updating-parameters-in-the-kyma-environment-e2e13bf.md "When creating a Kyma cluster, you can configure various parameters to adjust it to your specific needs.")
12851285

12861286
[Regions for the Kyma Environment](../10-concepts/regions-for-the-kyma-environment-557ec3a.md "To work with the Kyma environment, you need to specify the region for both your subaccount and the cluster.")
12871287

docs/50-administration-and-ops/creating-kyma-instances-09dd313.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ If you prefer to work in a terminal or want to automate operations using scripts
2525
In the process of provisioning a Kyma cluster, an instance of SAP Service Manager is created \(see [Credentials](../30-development/preconfigured-credentials-and-access-ab106d7.md#loioab106d78f9704b10b7c46a8de880da9c__section_uyv_vfq_tcc)\). Therefore, each Kyma instance has an instance of Service Manager assigned to it. If you have multiple Kyma clusters in your subaccount, you can easily trace which Service Manager instance is assigned to which Kyma instance by the Service Manager instance's display name, which is the same as its matching Kyma instance's ID.
2626

2727
> ### Note:
28-
> If the creation of an SAP Service Manager instance doesn't succeed, Kyma provisioning cannot begin. If the situation persists, create a support ticket \(see <?sap-ot O2O class="- topic/xref " href="948d2ff28da847739fda67cd8cd1f1d4.xml" text="" desc="" xtrc="xref:4" xtrf="file:/home/builder/src/dita-all/jjq1673438782153/loio2080d0faf9d84ce6aa14caa4caa32935_en-US/src/content/localization/en-us/09dd313bf6644250a14f8f38c3d644c0.xml" output-class="" outputTopicFile="file:/home/builder/tp.net.sf.dita-ot/2.3/plugins/com.elovirta.dita.markdown_1.3.0/xsl/dita2markdownImpl.xsl" ?> \).
28+
> If the creation of an SAP Service Manager instance is unsuccessful, Kyma provisioning cannot begin. If the situation persists, create a support ticket \(see [Getting Support](https://help.sap.com/docs/btp/sap-business-technology-platform/btp-getting-support?locale=en-US&version=Cloud)\).
2929
3030
> ### Note:
3131
> To indicate that your SAP BTP, Kyma runtime is used for production, select *Used for production* in your subaccount details. This setting allows Kyma runtime operators to prioritize incidents and support cases affecting production subaccounts over subaccounts used for non-production purposes. See [Change Subaccount Details](change-subaccount-details-567d4a8.md).

0 commit comments

Comments
 (0)