[Misc] Plugin: providerSubaccountId runtime support added (#85)

Pavan-SAP · web-flow · commit 2fec1fa21975 · 2026-03-27T09:26:03.000Z
* [Misc] Plugin: `providerSubaccountId` runtime support added

Enhancement to source `providerSubaccountId` at runtime.
- misc adjustments until the field becomes mandatory (soon).

* Clarify mandatory fields in README

Updated the README to clarify the mandatory status of globalAccountId and added providerSubaccountId as a mandatory field.
diff --git a/README.md b/README.md
@@ -156,7 +156,8 @@ The generated `chart/values.yaml` contains two types of information:
         ```sh
         kubectl get gateway -n kyma-system kyma-gateway -o jsonpath='{.spec.servers[0].hosts[0]}'
         ```
-    * **Global Account ID (globalAccountId) *[Mandatory]*** - SAP BTP Global Account Identifier where services are entitled for the application.
+    * **Global Account ID (globalAccountId) *[Mandatory for now; will be removed soon]*** - SAP BTP Global Account Identifier where services are entitled for the application.
+    * **Provider Subaccount ID (providerSubaccountId) *[Mandatory]*** - The Subaccount ID of the provider subaccount to which you deploy the application.
     * **Provider subdomain (providerSubdomain) *[Mandatory for applications; it does not apply to services-only scenarios]*** - Subdomain of the provider subaccount to which you deploy the application.
     * **Tenant ID (tenantId) *[Mandatory for applications; it does not apply to services-only scenarios]*** - Tenant ID of the provider subaccount to which you deploy the application.
     * **HANA Instance ID (hanaInstanceId) *[Optional]*** - ID of the SAP HANA instance to which the application is deployed. It's only required if there are multiple SAP HANA instances in the subaccount.
@@ -187,13 +188,14 @@ The generated `chart/values.yaml` contains two types of information:
         capOperatorSubdomain: cap-op
         clusterDomain: abc.com
         globalAccountId: abcdef-abcd-4ef1-9263-1b6b7b6b7b6b
+        providerSubaccountId: da37c8e0-74d4-abcd-b5e2-sd8f7d8f7d8f
         providerSubdomain: provider-subdomain-1234
         tenantId: da37c8e0-74d4-abcd-b5e2-sd8f7d8f7d8f
         hanaInstanceId: 46e285d9-abcd-4c7d-8ebb-502sd8f7d8f7d
         imagePullSecret: regcred
         ```
 
-        Similar to the interactive mode, `appName`, `capOperatorSubdomain`, `clusterDomain`, `globalAccountId`, `providerSubdomain`, and `tenantId` are mandatory fields for applications. In case of services-only scenarios, `appName`, `capOperatorSubdomain`, `clusterDomain`, and `globalAccountId` are mandatory. The plugin throws an error if they're not provided in the input YAML.
+        Similar to the interactive mode, `appName`, `capOperatorSubdomain`, `clusterDomain`, `globalAccountId`, `providerSubaccountId`, `providerSubdomain`, and `tenantId` are mandatory fields for applications. In case of services-only scenarios, `appName`, `capOperatorSubdomain`, `clusterDomain`, and `globalAccountId`, `providerSubaccountId` are mandatory. The plugin throws an error if they're not provided in the input YAML.
 
       After execution, the `runtime-values.yaml` file is created in the chart folder of your project directory.
 
diff --git a/bin/cap-op-plugin.js b/bin/cap-op-plugin.js
@@ -184,8 +184,8 @@ async function generateRuntimeValues(option, inputYamlPath) {
         answerStruct = yaml.parse(await cds.utils.read(cds.utils.path.join(cds.root, inputYamlPath)))
 
         const requiredFields = isServiceOnly
-            ? ['appName', 'capOperatorSubdomain', 'clusterDomain', 'globalAccountId']
-            : ['appName', 'capOperatorSubdomain', 'clusterDomain', 'globalAccountId', 'providerSubdomain', 'tenantId']
+            ? ['appName', 'capOperatorSubdomain', 'clusterDomain', 'globalAccountId', 'providerSubaccountId']
+            : ['appName', 'capOperatorSubdomain', 'clusterDomain', 'globalAccountId', 'providerSubaccountId', 'providerSubdomain', 'tenantId']
 
         const missingFields = requiredFields.filter(field => !answerStruct[field])
         if (missingFields.length) {
@@ -198,14 +198,15 @@ async function generateRuntimeValues(option, inputYamlPath) {
             ['Enter CAP Operator subdomain (In kyma cluster it is "cap-op" by default): ', 'cap-op', true],
             ['Enter your cluster shoot domain: ', await getShootDomain(), true],
             ['Enter your global account ID: ', '', true],
+            ['Enter your provider sub-account ID: ', '', true],
             ...isServiceOnly ? [] : [['Enter your provider subdomain: ', '', true]],
             ...isServiceOnly ? [] : [['Enter your provider tenant ID: ', '', true]],
             ['Enter your HANA database instance ID: ', '', false],
             ['Enter your image pull secrets: ', '', false]
         ]
 
         const answerKeys = [
-            'appName', 'capOperatorSubdomain', 'clusterDomain', 'globalAccountId',
+            'appName', 'capOperatorSubdomain', 'clusterDomain', 'globalAccountId', 'providerSubaccountId',
             ...isServiceOnly ? [] : ['providerSubdomain'],
             ...isServiceOnly ? [] : ['tenantId'],
             'hanaInstanceId', 'imagePullSecret'
diff --git a/files/chart/values.yaml.hbs b/files/chart/values.yaml.hbs
@@ -16,7 +16,9 @@ app:
 
 btp:
   # -- BTP Global account identifier where the application is hosted
-  globalAccountId: # mandatory let helm fail if not provided
+  globalAccountId:
+  # -- BTP Provider sub-account identifier where the application is hosted
+  providerSubaccountId:
   {{#isApp}}
   provider:
     # -- Subdomain of the provider sub-account where application services are created
diff --git a/files/configurableTemplatesChart/values.yaml.hbs b/files/configurableTemplatesChart/values.yaml.hbs
@@ -16,7 +16,9 @@ app:
 
 btp:
   # -- BTP Global account identifier where the application is hosted
-  globalAccountId: # mandatory let helm fail if not provided
+  globalAccountId:
+  # -- BTP Provider sub-account identifier where the application is hosted
+  providerSubaccountId:
   {{#isApp}}
   provider:
     # -- Subdomain of the provider sub-account where application services are created
diff --git a/files/runtime-values.yaml.hbs b/files/runtime-values.yaml.hbs
@@ -56,6 +56,7 @@ app:
 
 btp:
     globalAccountId: {{globalAccountId}}
+    providerSubaccountId: {{providerSubaccountId}}
     {{#isApp}}
     provider:
         subdomain: {{providerSubdomain}}
diff --git a/lib/util.js b/lib/util.js
@@ -280,7 +280,8 @@ function writeCAPApplicationCRO(yaml, hasIas, isService) {
       '  name: {{ .name }}',
       '{{- end }}',
       'btpAppName: {{ include "appName" $ }}',
-      'globalAccountId: {{ .Values.btp.globalAccountId }}'
+      'globalAccountId: {{ .Values.btp.globalAccountId }}',
+      'providerSubaccountId: {{ .Values.btp.providerSubaccountId }}'
     ])
 
     if (!isService) {
diff --git a/test/cap-op-plugin.test.js b/test/cap-op-plugin.test.js
@@ -94,10 +94,11 @@ EXAMPLES
         rlQuestion.onSecondCall().callsArgWith(1, '')
         rlQuestion.onThirdCall().callsArgWith(1, 'c-abc.kyma.ondemand.com')
         rlQuestion.onCall(3).callsArgWith(1, 'dc94db56-asda-adssa-dada-123456789012')
-        rlQuestion.onCall(4).callsArgWith(1, 'bem-aad-sadad-123456789012')
-        rlQuestion.onCall(5).callsArgWith(1, 'dasdsd-1234-1234-1234-123456789012')
-        rlQuestion.onCall(6).callsArgWith(1, 'sdasd-4c4d-4d4d-4d4d-123456789012')
-        rlQuestion.onCall(7).callsArgWith(1, 'regcred')
+        rlQuestion.onCall(4).callsArgWith(1, 'dc94db56-asda-adssa-dada-123456789012')
+        rlQuestion.onCall(5).callsArgWith(1, 'bem-aad-sadad-123456789012')
+        rlQuestion.onCall(6).callsArgWith(1, 'dasdsd-1234-1234-1234-123456789012')
+        rlQuestion.onCall(7).callsArgWith(1, 'sdasd-4c4d-4d4d-4d4d-123456789012')
+        rlQuestion.onCall(8).callsArgWith(1, 'regcred')
 
         cds.root = bookshop
         await capOperatorPlugin('generate-runtime-values')
@@ -131,10 +132,11 @@ EXAMPLES
         rlQuestion.onSecondCall().callsArgWith(1, '')
         rlQuestion.onThirdCall().callsArgWith(1, 'c-abc.kyma.ondemand.com')
         rlQuestion.onCall(3).callsArgWith(1, 'dc94db56-asda-adssa-dada-123456789012')
-        rlQuestion.onCall(4).callsArgWith(1, 'bem-aad-sadad-123456789012')
-        rlQuestion.onCall(5).callsArgWith(1, 'dasdsd-1234-1234-1234-123456789012')
-        rlQuestion.onCall(6).callsArgWith(1, 'sdasd-4c4d-4d4d-4d4d-123456789012')
-        rlQuestion.onCall(7).callsArgWith(1, 'regcred')
+        rlQuestion.onCall(4).callsArgWith(1, 'dc94db56-asda-adssa-dada-123456789012')
+        rlQuestion.onCall(5).callsArgWith(1, 'bem-aad-sadad-123456789012')
+        rlQuestion.onCall(6).callsArgWith(1, 'dasdsd-1234-1234-1234-123456789012')
+        rlQuestion.onCall(7).callsArgWith(1, 'sdasd-4c4d-4d4d-4d4d-123456789012')
+        rlQuestion.onCall(8).callsArgWith(1, 'regcred')
 
         cds.root = bookshop
         await capOperatorPlugin('generate-runtime-values')
@@ -157,8 +159,9 @@ EXAMPLES
         rlQuestion.onSecondCall().callsArgWith(1, '')
         rlQuestion.onThirdCall().callsArgWith(1, 'c-abc.kyma.ondemand.com')
         rlQuestion.onCall(3).callsArgWith(1, 'dc94db56-asda-adssa-dada-123456789012')
-        rlQuestion.onCall(4).callsArgWith(1, 'sdasd-4c4d-4d4d-4d4d-123456789012')
-        rlQuestion.onCall(5).callsArgWith(1, 'regcred')
+        rlQuestion.onCall(4).callsArgWith(1, 'dc94db56-asda-adssa-dada-123456789012')
+        rlQuestion.onCall(5).callsArgWith(1, 'sdasd-4c4d-4d4d-4d4d-123456789012')
+        rlQuestion.onCall(6).callsArgWith(1, 'regcred')
 
         cds.root = bookshop
         await capOperatorPlugin('generate-runtime-values')
@@ -250,10 +253,11 @@ EXAMPLES
         rlQuestion.onSecondCall().callsArgWith(1, '')
         rlQuestion.onThirdCall().callsArgWith(1, 'c-abc.kyma.ondemand.com')
         rlQuestion.onCall(3).callsArgWith(1, 'dc94db56-asda-adssa-dada-123456789012')
-        rlQuestion.onCall(4).callsArgWith(1, 'bem-aad-sadad-123456789012')
-        rlQuestion.onCall(5).callsArgWith(1, 'dasdsd-1234-1234-1234-123456789012')
-        rlQuestion.onCall(6).callsArgWith(1, 'sdasd-4c4d-4d4d-4d4d-123456789012')
-        rlQuestion.onCall(7).callsArgWith(1, 'regcred')
+        rlQuestion.onCall(4).callsArgWith(1, 'dc94db56-asda-adssa-dada-123456789012')
+        rlQuestion.onCall(5).callsArgWith(1, 'bem-aad-sadad-123456789012')
+        rlQuestion.onCall(6).callsArgWith(1, 'dasdsd-1234-1234-1234-123456789012')
+        rlQuestion.onCall(7).callsArgWith(1, 'sdasd-4c4d-4d4d-4d4d-123456789012')
+        rlQuestion.onCall(8).callsArgWith(1, 'regcred')
 
         cds.root = bookshop
         await capOperatorPlugin('generate-runtime-values')
@@ -277,10 +281,11 @@ EXAMPLES
         rlQuestion.onSecondCall().callsArgWith(1, '')
         rlQuestion.onThirdCall().callsArgWith(1, 'c-abc.kyma.ondemand.com')
         rlQuestion.onCall(3).callsArgWith(1, 'dc94db56-asda-adssa-dada-123456789012')
-        rlQuestion.onCall(4).callsArgWith(1, 'bem-aad-sadad-123456789012')
-        rlQuestion.onCall(5).callsArgWith(1, 'dasdsd-1234-1234-1234-123456789012')
-        rlQuestion.onCall(6).callsArgWith(1, 'sdasd-4c4d-4d4d-4d4d-123456789012')
-        rlQuestion.onCall(7).callsArgWith(1, 'regcred')
+        rlQuestion.onCall(4).callsArgWith(1, 'dc94db56-asda-adssa-dada-123456789012')
+        rlQuestion.onCall(5).callsArgWith(1, 'bem-aad-sadad-123456789012')
+        rlQuestion.onCall(6).callsArgWith(1, 'dasdsd-1234-1234-1234-123456789012')
+        rlQuestion.onCall(7).callsArgWith(1, 'sdasd-4c4d-4d4d-4d4d-123456789012')
+        rlQuestion.onCall(8).callsArgWith(1, 'regcred')
 
         cds.root = bookshop
         await capOperatorPlugin('generate-runtime-values')
@@ -304,8 +309,9 @@ EXAMPLES
         rlQuestion.onSecondCall().callsArgWith(1, '')
         rlQuestion.onThirdCall().callsArgWith(1, 'c-abc.kyma.ondemand.com')
         rlQuestion.onCall(3).callsArgWith(1, 'dc94db56-asda-adssa-dada-123456789012')
-        rlQuestion.onCall(4).callsArgWith(1, 'sdasd-4c4d-4d4d-4d4d-123456789012')
-        rlQuestion.onCall(5).callsArgWith(1, 'regcred')
+        rlQuestion.onCall(4).callsArgWith(1, 'dc94db56-asda-adssa-dada-123456789012')
+        rlQuestion.onCall(5).callsArgWith(1, 'sdasd-4c4d-4d4d-4d4d-123456789012')
+        rlQuestion.onCall(6).callsArgWith(1, 'regcred')
 
         cds.root = bookshop
         await capOperatorPlugin('generate-runtime-values')
diff --git a/test/files/expectedChart/runtime-values-ias.yaml b/test/files/expectedChart/runtime-values-ias.yaml
@@ -28,6 +28,7 @@ app:
     app: istio-ingressgateway
 btp:
   globalAccountId: dc94db56-asda-adssa-dada-123456789012
+  providerSubaccountId: dc94db56-asda-adssa-dada-123456789012
   provider:
     subdomain: bem-aad-sadad-123456789012
     tenantId: dasdsd-1234-1234-1234-123456789012
diff --git a/test/files/expectedChart/runtime-values-svc-ias.yaml b/test/files/expectedChart/runtime-values-svc-ias.yaml
@@ -16,6 +16,7 @@ app:
     app: istio-ingressgateway
 btp:
   globalAccountId: dc94db56-asda-adssa-dada-123456789012
+  providerSubaccountId: dc94db56-asda-adssa-dada-123456789012
 imagePullSecrets:
   - regcred
 workloads:
diff --git a/test/files/expectedChart/runtime-values-svc.yaml b/test/files/expectedChart/runtime-values-svc.yaml
@@ -11,6 +11,7 @@ app:
     app: istio-ingressgateway
 btp:
   globalAccountId: dc94db56-asda-adssa-dada-123456789012
+  providerSubaccountId: dc94db56-asda-adssa-dada-123456789012
 imagePullSecrets:
   - regcred
 workloads:
diff --git a/test/files/expectedChart/runtime-values.yaml b/test/files/expectedChart/runtime-values.yaml
@@ -20,6 +20,7 @@ app:
     app: istio-ingressgateway
 btp:
   globalAccountId: dc94db56-asda-adssa-dada-123456789012
+  providerSubaccountId: dc94db56-asda-adssa-dada-123456789012
   provider:
     subdomain: bem-aad-sadad-123456789012
     tenantId: dasdsd-1234-1234-1234-123456789012
diff --git a/test/files/expectedChart/templates/cap-operator-cros-ias.yaml b/test/files/expectedChart/templates/cap-operator-cros-ias.yaml
@@ -18,6 +18,7 @@ spec:
   {{- end }}
   btpAppName: {{ include "appName" $ }}
   globalAccountId: {{ .Values.btp.globalAccountId }}
+  providerSubaccountId: {{ .Values.btp.providerSubaccountId }}
   provider:
     subDomain: {{ .Values.btp.provider.subdomain }}
     tenantId: {{ .Values.btp.provider.tenantId }}
diff --git a/test/files/expectedChart/templates/cap-operator-cros-svc-ias.yaml b/test/files/expectedChart/templates/cap-operator-cros-svc-ias.yaml
@@ -18,6 +18,7 @@ spec:
   {{- end }}
   btpAppName: {{ include "appName" $ }}
   globalAccountId: {{ .Values.btp.globalAccountId }}
+  providerSubaccountId: {{ .Values.btp.providerSubaccountId }}
   btp:
     services:
     {{- $serviceInstances := .Values.serviceInstances }}
diff --git a/test/files/expectedChart/templates/cap-operator-cros-svc.yaml b/test/files/expectedChart/templates/cap-operator-cros-svc.yaml
@@ -13,6 +13,7 @@ spec:
   {{- end }}
   btpAppName: {{ include "appName" $ }}
   globalAccountId: {{ .Values.btp.globalAccountId }}
+  providerSubaccountId: {{ .Values.btp.providerSubaccountId }}
   btp:
     services:
     {{- $serviceInstances := .Values.serviceInstances }}
diff --git a/test/files/expectedChart/templates/cap-operator-cros.yaml b/test/files/expectedChart/templates/cap-operator-cros.yaml
@@ -13,6 +13,7 @@ spec:
   {{- end }}
   btpAppName: {{ include "appName" $ }}
   globalAccountId: {{ .Values.btp.globalAccountId }}
+  providerSubaccountId: {{ .Values.btp.providerSubaccountId }}
   provider:
     subDomain: {{ .Values.btp.provider.subdomain }}
     tenantId: {{ .Values.btp.provider.tenantId }}
diff --git a/test/files/expectedChart/values-ias.yaml b/test/files/expectedChart/values-ias.yaml
@@ -103,6 +103,7 @@ app:
     app: istio-ingressgateway
 btp:
   globalAccountId: null
+  providerSubaccountId: null
   provider:
     subdomain: null
     tenantId: null
diff --git a/test/files/expectedChart/values-svc-ias.yaml b/test/files/expectedChart/values-svc-ias.yaml
@@ -65,6 +65,7 @@ app:
     app: istio-ingressgateway
 btp:
   globalAccountId: null
+  providerSubaccountId: null
 imagePullSecrets: []
 workloads:
   server:
diff --git a/test/files/expectedChart/values-svc.yaml b/test/files/expectedChart/values-svc.yaml
@@ -60,6 +60,7 @@ app:
     app: istio-ingressgateway
 btp:
   globalAccountId: null
+  providerSubaccountId: null
 imagePullSecrets: []
 workloads:
   server:
diff --git a/test/files/expectedChart/values.yaml b/test/files/expectedChart/values.yaml
@@ -94,6 +94,7 @@ app:
     app: istio-ingressgateway
 btp:
   globalAccountId: null
+  providerSubaccountId: null
   provider:
     subdomain: null
     tenantId: null
diff --git a/test/files/expectedChart/valuesWithDestination.yaml b/test/files/expectedChart/valuesWithDestination.yaml
@@ -94,6 +94,7 @@ app:
     app: istio-ingressgateway
 btp:
   globalAccountId: null
+  providerSubaccountId: null
   provider:
     subdomain: null
     tenantId: null
diff --git a/test/files/expectedChart/valuesWithMTA.yaml b/test/files/expectedChart/valuesWithMTA.yaml
@@ -120,6 +120,7 @@ app:
     app: istio-ingressgateway
 btp:
   globalAccountId: null
+  providerSubaccountId: null
   provider:
     subdomain: null
     tenantId: null
diff --git a/test/files/expectedConfigurableTemplatesChart/runtime-values-ias.yaml b/test/files/expectedConfigurableTemplatesChart/runtime-values-ias.yaml
@@ -28,6 +28,7 @@ app:
     app: istio-ingressgateway
 btp:
   globalAccountId: dc94db56-asda-adssa-dada-123456789012
+  providerSubaccountId: dc94db56-asda-adssa-dada-123456789012
   provider:
     subdomain: bem-aad-sadad-123456789012
     tenantId: dasdsd-1234-1234-1234-123456789012
diff --git a/test/files/expectedConfigurableTemplatesChart/runtime-values-svc.yaml b/test/files/expectedConfigurableTemplatesChart/runtime-values-svc.yaml
@@ -11,6 +11,7 @@ app:
     app: istio-ingressgateway
 btp:
   globalAccountId: dc94db56-asda-adssa-dada-123456789012
+  providerSubaccountId: dc94db56-asda-adssa-dada-123456789012
 imagePullSecrets:
   - regcred
 hanaInstanceId: sdasd-4c4d-4d4d-4d4d-123456789012
diff --git a/test/files/expectedConfigurableTemplatesChart/runtime-values.yaml b/test/files/expectedConfigurableTemplatesChart/runtime-values.yaml
@@ -20,6 +20,7 @@ app:
     app: istio-ingressgateway
 btp:
   globalAccountId: dc94db56-asda-adssa-dada-123456789012
+  providerSubaccountId: dc94db56-asda-adssa-dada-123456789012
   provider:
     subdomain: bem-aad-sadad-123456789012
     tenantId: dasdsd-1234-1234-1234-123456789012
diff --git a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-ias.yaml b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-ias.yaml
@@ -18,6 +18,7 @@ spec:
   {{- end }}
   btpAppName: {{ include "appName" $ }}
   globalAccountId: {{ .Values.btp.globalAccountId }}
+  providerSubaccountId: {{ .Values.btp.providerSubaccountId }}
   provider:
     subDomain: {{ .Values.btp.provider.subdomain }}
     tenantId: {{ .Values.btp.provider.tenantId }}
diff --git a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-modified-svc.yaml b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-modified-svc.yaml
@@ -13,6 +13,7 @@ spec:
   {{- end }}
   btpAppName: {{ include "appName" $ }}
   globalAccountId: {{ .Values.btp.globalAccountId }}
+  providerSubaccountId: {{ .Values.btp.providerSubaccountId }}
   btp:
     services:
     {{- $serviceInstances := .Values.serviceInstances }}
diff --git a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-modified.yaml b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-modified.yaml
@@ -13,6 +13,7 @@ spec:
   {{- end }}
   btpAppName: {{ include "appName" $ }}
   globalAccountId: {{ .Values.btp.globalAccountId }}
+  providerSubaccountId: {{ .Values.btp.providerSubaccountId }}
   provider:
     subDomain: {{ .Values.btp.provider.subdomain }}
     tenantId: {{ .Values.btp.provider.tenantId }}
diff --git a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-mta.yaml b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-mta.yaml
@@ -13,6 +13,7 @@ spec:
   {{- end }}
   btpAppName: {{ include "appName" $ }}
   globalAccountId: {{ .Values.btp.globalAccountId }}
+  providerSubaccountId: {{ .Values.btp.providerSubaccountId }}
   provider:
     subDomain: {{ .Values.btp.provider.subdomain }}
     tenantId: {{ .Values.btp.provider.tenantId }}
diff --git a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-svc-ias.yaml b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-svc-ias.yaml
@@ -18,6 +18,7 @@ spec:
   {{- end }}
   btpAppName: {{ include "appName" $ }}
   globalAccountId: {{ .Values.btp.globalAccountId }}
+  providerSubaccountId: {{ .Values.btp.providerSubaccountId }}
   btp:
     services:
     {{- $serviceInstances := .Values.serviceInstances }}
diff --git a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-svc.yaml b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-svc.yaml
@@ -13,6 +13,7 @@ spec:
   {{- end }}
   btpAppName: {{ include "appName" $ }}
   globalAccountId: {{ .Values.btp.globalAccountId }}
+  providerSubaccountId: {{ .Values.btp.providerSubaccountId }}
   btp:
     services:
     {{- $serviceInstances := .Values.serviceInstances }}
diff --git a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros.yaml b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros.yaml
@@ -13,6 +13,7 @@ spec:
   {{- end }}
   btpAppName: {{ include "appName" $ }}
   globalAccountId: {{ .Values.btp.globalAccountId }}
+  providerSubaccountId: {{ .Values.btp.providerSubaccountId }}
   provider:
     subDomain: {{ .Values.btp.provider.subdomain }}
     tenantId: {{ .Values.btp.provider.tenantId }}
diff --git a/test/files/expectedConfigurableTemplatesChart/values-ias.yaml b/test/files/expectedConfigurableTemplatesChart/values-ias.yaml
@@ -103,6 +103,7 @@ app:
     app: istio-ingressgateway
 btp:
   globalAccountId: null
+  providerSubaccountId: null
   provider:
     subdomain: null
     tenantId: null
diff --git a/test/files/expectedConfigurableTemplatesChart/values-modified-svc.yaml b/test/files/expectedConfigurableTemplatesChart/values-modified-svc.yaml
@@ -60,6 +60,7 @@ app:
     app: istio-ingressgateway
 btp:
   globalAccountId: null
+  providerSubaccountId: null
 imagePullSecrets: []
 workloads:
   server:
diff --git a/test/files/expectedConfigurableTemplatesChart/values-modified.yaml b/test/files/expectedConfigurableTemplatesChart/values-modified.yaml
@@ -94,6 +94,7 @@ app:
     app: istio-ingressgateway
 btp:
   globalAccountId: null
+  providerSubaccountId: null
   provider:
     subdomain: null
     tenantId: null
diff --git a/test/files/expectedConfigurableTemplatesChart/values-svc-ias.yaml b/test/files/expectedConfigurableTemplatesChart/values-svc-ias.yaml
diff --git a/test/files/expectedConfigurableTemplatesChart/values-svc.yaml b/test/files/expectedConfigurableTemplatesChart/values-svc.yaml
diff --git a/test/files/expectedConfigurableTemplatesChart/values.yaml b/test/files/expectedConfigurableTemplatesChart/values.yaml
diff --git a/test/files/expectedConfigurableTemplatesChart/valuesWithMTA.yaml b/test/files/expectedConfigurableTemplatesChart/valuesWithMTA.yaml
diff --git a/test/files/input_values.yaml b/test/files/input_values.yaml
diff --git a/test/files/input_values_wrong.yaml b/test/files/input_values_wrong.yaml
diff --git a/test/files/runtime-values-of-simple-chart.yaml b/test/files/runtime-values-of-simple-chart.yaml
diff --git a/test/files/runtime-values-of-simple-service-chart.yaml b/test/files/runtime-values-of-simple-service-chart.yaml
diff --git a/test/files/updatedValues.schema.json b/test/files/updatedValues.schema.json
diff --git a/test/files/values-of-simple-chart-filled.yaml b/test/files/values-of-simple-chart-filled.yaml
diff --git a/test/files/values-of-simple-service-chart-filled.yaml b/test/files/values-of-simple-service-chart-filled.yaml
