@sap/cds-dk 9.4.2 → 9.5.0

package/lib/init/template/containerize/files/containerize.yaml.hbs

@@ -2,11 +2,25 @@
 _schema-version: '1.0'
 repository: {{& imageRegistry}}
 tag: latest
+{{#hasHelmUnifiedRuntime}}
+{{#isJava}}
 before-all:
-  - npx cds build --production
-  {{#isJava}}
+  - helm dependency update ./gen/chart
   - mvn clean package -DskipTests=true --batch-mode
-  {{/isJava}}
+{{/isJava}}
+{{/hasHelmUnifiedRuntime}}
+{{^hasJava}}
+{{#hasHelmUnifiedRuntime}}
+before-all:
+  - helm dependency update ./gen/chart
+{{/hasHelmUnifiedRuntime}}
+{{/hasJava}}
+{{^hasHelmUnifiedRuntime}}
+{{#hasJava}}
+before-all:
+  - mvn clean package -DskipTests=true --batch-mode
+{{/hasJava}}
+{{/hasHelmUnifiedRuntime}}
 modules:
   - name: {{appName}}-srv
     build-parameters:

package/lib/init/template/containerize/index.js

@@ -5,10 +5,6 @@ const { merge } = require('../../merge')
 
 module.exports = class ContainerizeTemplate extends require('../../plugin') {
 
-    static help() {
-        return 'containerization using ctz CLI'
-    }
-
     static hasInProduction () {
         return exists('containerize.yaml')
     }

package/lib/init/template/data/as-json.js

@@ -12,7 +12,7 @@ const MAX_ASSOC_DEPTH = 5
  * @param {object} csn the model
  * @param {Number} numRecords the number of records to be created for each artifact
  * @param {{referenceData? : Record<string, string}} options misc. options
- * @returns {Record<string, object[]>} the filled data
+ * @returns {Promise<Record<string, object[]>>} the filled data
  */
 const asJson = module.exports = async (data, csn, numRecords=1, options={}) => {
   let { referenceData, contentType, artifact='entity' } = options
@@ -66,10 +66,10 @@ const asJson = module.exports = async (data, csn, numRecords=1, options={}) => {
     data[name] = uniqRecords(data[name], artifact)
   }
   for (let [key, d] of Object.entries(data)) {
-    if (contentType === 'json' && d.deleteReference && !d.keepReferece) {
+    if (contentType === 'json' && d.deleteReference && !d.keepReference) {
       delete data[key]
     }
-    delete d.keepReferece
+    delete d.keepReference
     delete d.deleteReference
     uniqRecords(d, csn.definitions[key])
   }
@@ -235,7 +235,10 @@ function dataForField(element, artifact, csn, record, data, parent, depth, refer
       const prec  = element.precision ? Math.min(Math.pow(10, element.precision - scale) - 1, Number.MAX_SAFE_INTEGER) : 100
       const range = { from: 0, to: prec }
       annotatedIntRange(element, range)
-      return +(randomDecimalInRange(range).toFixed(scale))
+      if (scale === 0) return randomIntInRange(range)
+      const intPart = randomIntInRange(range)
+      const frac = Math.floor(randomUnit() * Math.pow(10, scale))
+      return +(intPart + frac / Math.pow(10, scale)).toFixed(scale)
     }
     case 'cds.Double': {
       const range = {from: 0, to: 100}
@@ -287,7 +290,7 @@ function dataForField(element, artifact, csn, record, data, parent, depth, refer
         else if (!targetRecords) // target entity is not in the list of entities to be created
           return
 
-        if (targetRecords.length > 0) { // use record generated by following asociation
+        if (targetRecords.length > 0) { // use record generated by following association
           targetRecord = targetRecords.at(-1)  // make sure the localized record references the newly generated texts
         } else {
           targetRecord = fillRecord({}, randomNumber(), target, csn, data, artifact, depth+1, referenceData)
@@ -295,7 +298,7 @@ function dataForField(element, artifact, csn, record, data, parent, depth, refer
             targetRecords.push(targetRecord)
             uniqRecords(targetRecords, target)
           }
-          if (parent && (parent.name != artifact.name)) data[target.name].keepReferece = true
+          if (parent && (parent.name != artifact.name)) data[target.name].keepReference = true
         }
       }
 
@@ -371,7 +374,7 @@ asJson.randomFromReferenceData = function(entity, csn, referenceData) {
 /* whether the given name matches the entity or one of its projections */
 function matchesEntityOrProjection(name, entity, csn) {
   if (name === entity?.name)  return true
-  // follow simle projections
+  // follow simple projections
   const p = entity?.query?.SELECT || entity?.projection
   if (p?.from?.ref?.length === 1) {
     if (p.from.ref[0] === name)  return true
@@ -551,21 +554,13 @@ function randomDateInRange(dateRange) {
   return returnDate
 }
 
-function randomDecimalInRange(decimalRange) {
-  const max = decimalRange.to
-  const min = decimalRange.from
-  const num = max === 0 ? 0 : min + (randomNumber() % (max - min))
-  let dec = randomNumber()
-  const divider = Math.pow(10, dec.toString().length)
-  dec = dec / divider
-  const returnValue = num + dec
-  return returnValue
+function randomDecimalInRange({ from: min, to: max }) {
+  return min + randomUnit() * (max - min)
 }
 
-function randomIntInRange(intRange) {
-  const max = intRange.to
-  const min = intRange.from
-  return min + (randomNumber() % max)
+function randomIntInRange({ from: min, to: max }) {
+  const span = Math.max(0, max - min + 1)
+  return min + Math.floor(randomUnit() * span)
 }
 
 const p = 5651;
@@ -575,3 +570,6 @@ function randomNumber() {
   counter = (counter * counter) % M
   return counter;
 }
+function randomUnit() {
+  return randomNumber() / (M - 1) // ~[0,1]
+}

package/lib/init/template/destination/index.js

@@ -26,10 +26,6 @@ module.exports = class DestinationTemplate extends require('../../plugin') {
         const project = readProject()
         const { addHelm, addApprouter, addMultitenancy, addHelmUnifiedRuntime, addMta, hasMta, srvPath, isJava } = project
 
-        if (addMultitenancy) {
-            await merge({ cds: { requires: { destinations:true } } }).into('mtx/sidecar/package.json')
-        }
-
         if (addMta || (addApprouter || addMultitenancy) && hasMta) {
             const srv = srv4(srvPath)
             const additions = [srv, destination]

package/lib/init/template/dynatrace/index.js

@@ -37,7 +37,6 @@ module.exports = class extends require('../../plugin') {
       const additions = [dynatrace], relationships = []
       if (addMta) {
         const srv = srv4(srvPath)
-        additions.push(srv)
         relationships.push({
           insert: [dynatrace, 'name'],
           into: [srv, 'requires', 'name']
@@ -45,7 +44,6 @@ module.exports = class extends require('../../plugin') {
       }
       if (addMultitenancy) {
         const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
-        additions.push(mtxSidecar)
         relationships.push({
           insert: [dynatrace, 'name'],
           into: [mtxSidecar, 'requires', 'name']

package/lib/init/template/github-actions/files/kyma-setup/action.yaml

@@ -45,8 +45,6 @@ runs:
       shell: bash
     - run: curl -fsSL https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash
       shell: bash
-    - run: npm install -g ctz
-      shell: bash
     - shell: bash
       run: |
           mkdir ${HOME}/kyma-binaries

package/lib/init/template/github-actions/files/workflows/cf.yaml.hbs

@@ -29,7 +29,22 @@ jobs:
       - uses: actions/setup-node@v5
         with:
           node-version: 22
-      - uses: ./.github/actions/cf-setup
+      {{#isJava}}
+      - uses: actions/setup-java@v5
+        with:
+          distribution: sapmachine
+          java-version: 21
+          cache: maven
+      {{#sap}}
+      - name: Install Maven
+        run: |
+          MAVEN_VERSION=3.9.6
+          curl -fsSL "https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz" -o maven.tgz
+          tar -xzf maven.tgz
+          echo "${PWD}/apache-maven-${MAVEN_VERSION}/bin" >> "$GITHUB_PATH"
+      {{/sap}}
+      {{/isJava}}
+      - uses: cap-js/cf-setup@v1
         with:
           cf-api: {{#literal}}${{ vars.CF_API }}{{/literal}}
           cf-org: {{#literal}}${{ vars.CF_ORG }}{{/literal}}

package/lib/init/template/github-actions/files/workflows/test.yaml.hbs

@@ -21,4 +21,24 @@ jobs:
           node-version: 22
       - uses: actions/checkout@v5
       - run: npm install
+      {{#isJava}}
+      - uses: actions/setup-java@v5
+        with:
+          distribution: sapmachine
+          java-version: 21
+          cache: maven
+      {{#sap}}
+      - name: Install Maven
+        run: |
+          MAVEN_VERSION=3.9.6
+          curl -fsSL "https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz" -o maven.tgz
+          tar -xzf maven.tgz
+          echo "${PWD}/apache-maven-${MAVEN_VERSION}/bin" >> "$GITHUB_PATH"
+      {{/sap}}
+      {{/isJava}}
+      {{#isNodejs}}
       - run: npm test
+      {{/isNodejs}}
+      {{#isJava}}
+      - run: mvn test -B
+      {{/isJava}}

package/lib/init/template/github-actions/index.js

@@ -24,9 +24,11 @@ module.exports = class GitHubActionTemplate extends require('../../plugin') {
   }
 
   async run() {
+    const { hasMta, hasHelm, isJava } = readProject()
     const test = `.github/workflows/test.yaml`
-    if (!exists(test) || cds.cli.options.force) {
-      await renderAndCopy(path.join(__dirname, 'files/workflows/test.yaml.hbs'), test, { sap: cds.cli.options.sap })
+    const { force, sap } = cds.cli.options
+    if (!exists(test) || force) {
+      await renderAndCopy(path.join(__dirname, 'files/workflows/test.yaml.hbs'), test, { sap, isJava })
     } else {
       console.log('> skipping ' + test)
     }
@@ -41,8 +43,7 @@ module.exports = class GitHubActionTemplate extends require('../../plugin') {
         githubSlug = '<org/repo>'
         // console.log(`\ncould not determine GitHub URL for the project – replace '<org/repo>' in ${release}`, DEBUG ? error : '')
       }
-      const { hasMta, hasHelm } = readProject()
-      await renderAndCopy(path.join(__dirname, 'files/workflows/release.yaml.hbs'), release, { sap: cds.cli.options.sap, githubSlug, hasMta, hasHelm })
+      await renderAndCopy(path.join(__dirname, 'files/workflows/release.yaml.hbs'), release, { isJava, sap: cds.cli.options.sap, githubSlug, hasMta, hasHelm })
     } else {
       console.log('> skipping ' + release)
     }
@@ -57,10 +58,6 @@ module.exports = class GitHubActionTemplate extends require('../../plugin') {
       if (force || !exists(cf)) {
         await renderAndCopy(path.join(__dirname, 'files/workflows/cf.yaml.hbs'), cf, project)
       }
-      const cfSetup = '.github/actions/cf-setup'
-      if (force || !exists(cfSetup)) {
-        await copy(path.join(__dirname, 'files/cf-setup'), cfSetup)
-      }
     }
     if (addHelm) {
       const kyma = '.github/workflows/kyma.yaml'

package/lib/init/template/hana/files/db/package.json

@@ -1,11 +1,11 @@
 {
   "name": "deploy",
   "dependencies": {
-    "hdb": "^0",
+    "hdb": "^2.0.0",
     "@sap/hdi-deploy": "^5"
   },
   "engines": {
-    "node": "^22.0.0"
+    "node": "^24.0.0"
   },
   "scripts": {
     "start": "node node_modules/@sap/hdi-deploy/deploy.js --use-hdb --parameter com.sap.hana.di.table/try_fast_table_migration=true",

package/lib/init/template/hana/files/mta.yaml.hbs

@@ -6,7 +6,6 @@ modules:
     requires:
       - name: {{appName}}-db
 
-{{^hasMultitenancy}}
   - name: {{appName}}-db-deployer
     type: hdb
     path: {{& db.path}}
@@ -20,15 +19,12 @@ modules:
 {{/isJava}}
     requires:
       - name: {{appName}}-db
-{{/hasMultitenancy}}
 
-{{#hasMultitenancy}}
   - name: {{appName}}-mtx
     type: nodejs
     path: {{#isNodejs}}gen/{{/isNodejs}}mtx/sidecar
     requires:
       - name: {{appName}}-db
-{{/hasMultitenancy}}
 
 resources:
   - name: {{appName}}-db

package/lib/init/template/hana/index.js

@@ -23,8 +23,7 @@ module.exports = class HanaTemplate extends require('../../plugin') {
         const { isJava, configFile, db } = project
         project.shortcut = !exists(configFile) || typeof (await read(configFile)).cds?.requires?.db !== 'object'
 
-        // REVISIT: Let cds build generate those by default
-        await merge(__dirname, 'files/src/.hdiconfig').into(join(db.folder, 'src/.hdiconfig'))
+        // cds10: Let cds build generate this by default
         await merge(__dirname, 'files/undeploy.json').into(join(db.folder, 'undeploy.json'))
 
         if (isJava) {
@@ -44,9 +43,9 @@ module.exports = class HanaTemplate extends require('../../plugin') {
 
     async combine() {
         const project = readProject()
-        const { addMta, addHelm, addHelmUnifiedRuntime, addMultitenancy, addContainerize, isJava, hasHelm, hasMultitenancy, srvPath } = project
+        const { addMta, hasMta, addHelm, addHelmUnifiedRuntime, addMultitenancy, addContainerize, isJava, hasHelm, hasHelmUnifiedRuntime, hasMultitenancy, srvPath } = project
 
-        if (addMta || addMultitenancy) {
+        if (addMta || addMultitenancy && hasMta) {
             const srv = srv4(srvPath)
             const db = hasMultitenancy ? serviceManager : hdiContainer
             const deletions = hasMultitenancy ? [{
@@ -82,16 +81,15 @@ module.exports = class HanaTemplate extends require('../../plugin') {
 
             const modules = hasMultitenancy ? [srv] : [srv, hdbDeployer]
             await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', {
-                with: project, additions: [...modules, db].filter(a => a), deletions, relationships
+                with: project, additions: [...modules, db], deletions, relationships
             })
         }
 
         if (!hasMultitenancy && (addHelm || addHelmUnifiedRuntime)) {
             await merge(__dirname, 'files', 'values.yaml.hbs').into('chart/values.yaml', { with: project })
-
         }
 
-        if (addMultitenancy && hasHelm) {
+        if (addMultitenancy && (hasHelm || hasHelmUnifiedRuntime)) {
             await merge('chart/values.yaml')
                 .remove(['hana-deployer', 'srv.bindings.db', 'hana'])
 

package/lib/init/template/helm/index.js

@@ -1,7 +1,6 @@
 const { join } = require('path')
-const yaml = require('yaml')
 const cds = require('../../../cds')
-const { exists, rimraf, copy, readFileSync } = cds.utils
+const { readFileSync, exists, rimraf, copy, yaml } = cds.utils
 const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 const { ask4 } = require('../../../util/question')
@@ -10,15 +9,10 @@ const { mvn } = require('../../add')
 
 module.exports = class HelmTemplate extends require('../../plugin') {
 
-    static help() {
-        return 'Kyma deployment using Helm charts'
-    }
-
     options() {
         return {
             'y': {
                 type: 'boolean',
-                help: 'If provided, the default values will be used for all prompts.'
             }
         }
     }
@@ -37,47 +31,36 @@ module.exports = class HelmTemplate extends require('../../plugin') {
     // Won't need this any more with plugin approach: package not there -> plugin not pulled
     static hasInProduction() {
         if (exists('chart/Chart.yaml')) {
-            const chartFile = readFileSync(join(cds.root, 'chart', 'Chart.yaml'), 'utf8')
-            const chartYaml = yaml.parseDocument(chartFile).toJS()
+            const chartYaml = yaml.parse(readFileSync(join(cds.root, 'chart', 'Chart.yaml'), 'utf8'))
             return chartYaml.annotations?.["app.kubernetes.io/managed-by"] === 'cds-dk/helm'
-          }
-          return false
+        }
+        return false
     }
 
     async run() {
         const project = readProject()
-        project.domain = 'abc.com'
-        project.registry = 'registry-server'
-        project.imagePullSecret = 'docker-registry'
-        project.tag = 'latest'
-
-        if (cds.cli.command === 'add' && !HelmTemplate.hasInProduction()) {
-            let registry = 'registry-server', tag = 'latest', domain = 'abc.com'
-
+        let imagePullSecret, registry, domain, tag
+        if (!HelmTemplate.hasInProduction() && !project.isBas /* don't run this for the BAS Yeoman generator */) {
             try {
                 const domainGuess = execSync(`kubectl config view --minify --output jsonpath="{.clusters[*].cluster.server}"`, { stdio: "pipe" }).toString()
                 const domainStartIndex = domainGuess.indexOf('api.')
                 if (domainStartIndex !== -1) domain = domainGuess.substring(domainStartIndex + 4)
             } catch (error) { /* ignore */ }
 
-            // read project.registry
             if (exists('containerize.yaml')) {
-                const containerizeYamlFile = readFileSync(join(cds.root, 'containerize.yaml'), 'utf8')
-                const containerizeYaml = yaml.parseDocument(containerizeYamlFile).toJS()
-                registry = containerizeYaml.repository
-                tag = containerizeYaml.tag
+                const { repository: r, tag: t } = yaml.parse(join(cds.root, 'containerize.yaml'))
+                if (r) registry = r
+                if (t) tag = t
             }
-
-            if (!cds.cli.options['y']) {
-                const [registryAns] = await ask4(`registry server (${registry}): `)
-                registry = registryAns || registry
+            if (!cds.cli.options.y && !cds.cli.options.force) {
+                registry ??= await ask4([`registry server: `])
+                domain ??= await ask4([`cluster domain: `])
             }
-
-            project.domain = domain
-            project.registry = registry
-            project.tag = tag
         }
-
+        project.registry = registry ?? '<registry-server>'
+        project.domain = domain ?? '<cluster-domain>'
+        project.imagePullSecret = imagePullSecret ?? 'docker-registry'
+        project.tag = tag ?? 'latest'
         await copy(join(__dirname, 'files', 'values.schema.json')).to('chart/values.schema.json')
         await merge(__dirname, 'files/Chart.yaml.hbs').into('chart/Chart.yaml', { with: project })
         await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project })

package/lib/init/template/helm-unified-runtime/index.js

@@ -8,10 +8,6 @@ const { merge } = require('../../merge')
 
 module.exports = class HelmUnifiedRuntimeTemplate extends require('../helm') {
 
-  static help() {
-    return 'Kyma deployment using Unified Runtime Helm charts'
-  }
-
   options() {
     return {
       'internal-unified-runtime-charts': {

package/lib/init/template/html5-repo/files/app-package.json.hbs

@@ -3,18 +3,12 @@
   "version": "1.0.0",
   "main": "webapp/index.html",
   "scripts": {
-    "build": "ui5 build preload --clean-dest --config ui5-deploy.yaml",
-    "build-local": "ui5 build preload --clean-dest",
+    "build": "ui5 build preload --clean-dest",
     "start": "ui5 serve"
   },
   "devDependencies": {
     "@ui5/cli": "^4",
     "ui5-task-zipper": "^3"
-  },
-  "ui5": {
-    "dependencies": [
-      "ui5-task-zipper"
-    ]
   }
   {{/hasUI5}}
 }

package/lib/init/template/html5-repo/files/containerize.yaml.hbs

@@ -1,13 +1,4 @@
 ---
-before-all:
-{{#hasUI5}}
-  - mkdir -p app/html5-deployer/resources
-{{#apps}}
-  - npm run build --prefix app/{{app}}
-  # zip filename should match the archiveName specified in ui5-deploy.yaml
-  - cp -f app/{{app}}/dist/{{app}}.zip app/html5-deployer/resources/{{app}}.zip
-{{/apps}}
-{{/hasUI5}}
 modules:
   - name: {{appName}}-html5-deployer
     build-parameters:

package/lib/init/template/html5-repo/files/mta.yaml.hbs

@@ -28,13 +28,6 @@ modules:
       {{#hasXsuaa}}
       - name: {{appName}}-auth
       {{/hasXsuaa}}
-      {{#hasIas}}
-      - name: {{appName}}-ias
-        parameters:
-          config:
-            credential-type: X509_GENERATED
-            app-identifier: app-deployer
-      {{/hasIas}}
       - name: srv-api
       - name: {{appName}}-html5-repo-host
         parameters:

package/lib/init/template/html5-repo/files/ui5.yaml.hbs

@@ -1,6 +1,25 @@
 ---
 # yaml-language-server: $schema=https://sap.github.io/ui5-tooling/schema/ui5.yaml.json
-specVersion: '3.1'
+specVersion: '4.0'
 metadata:
   name: {{app}}
 type: application
+resources:
+  configuration:
+    propertiesFileSourceEncoding: UTF-8
+builder:
+  resources:
+    excludes:
+      - "/test/**"
+      - "/localService/**"
+  customTasks:
+    - name: ui5-task-zipper
+      afterTask: generateVersionInfo
+      configuration:
+        archiveName: {{app}}
+        additionalFiles:
+          - xs-app.json
+    {{#isTypescript}}
+    - name: ui5-tooling-transpile-task
+      afterTask: replaceVersion
+    {{/isTypescript}}

package/lib/init/template/html5-repo/files/values.yaml.hbs

@@ -53,3 +53,9 @@ approuter:
     html5-apps-repo-runtime:
       serviceInstanceName: html5-apps-repo-runtime
 {{/hasApprouter}}
+{{#hasMultitenancy}}
+sidecar:
+  bindings:
+    html5-apps-repo-host:
+      serviceInstanceName: html5-apps-repo-host
+{{/hasMultitenancy}}

package/lib/init/template/html5-repo/files/xs-app.json.hbs

@@ -7,13 +7,15 @@
       "target": "/odata/$1",
       "destination": "srv-api",
       {{#hasXsuaa}}"authenticationType": "xsuaa",{{/hasXsuaa}}
+      {{#hasIas}}"authenticationType": "ias",{{/hasIas}}
       "csrfProtection": true
     },
     {
       "source": "^(.*)$",
-      "target": "$1",
-      "service": "html5-apps-repo-rt"{{#hasXsuaa}},
-      "authenticationType": "xsuaa"{{/hasXsuaa}}
+      "service": "html5-apps-repo-rt",
+      {{#hasXsuaa}}"authenticationType": "xsuaa",{{/hasXsuaa}}
+      {{#hasIas}}"authenticationType": "ias",{{/hasIas}}
+      "target": "$1"
     }
   ]
 }

package/lib/init/template/html5-repo/index.js

@@ -2,7 +2,7 @@ const { join } = require('path')
 const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
 const { srv4, html5RepoHost, html5Runtime, xsuaa, appDeployer, approuter, mtxSidecar4 } = require('../../registries/mta')
-const { odataApi } = require('../../registries/xs-app')
+const { odataApi, html5RepoApi } = require('../../registries/xs-app')
 const { exists } = require('../../../cds').utils
 const { renderAndCopy } = require('../../template')
 
@@ -38,13 +38,13 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
         const {
             isJava, srvPath, appPath, apps,
             hasApprouter, addApprouter, addContainerize,  addMultitenancy, addWorkzoneStandard,
-            addSample, hasMta, addMta, hasXsuaa, hasMultitenancy, hasWorkzoneStandard, addHelm, addHelmUnifiedRuntime, hasUI5
+            addSample, hasMta, addMta, hasXsuaa, hasMultitenancy, addHelm, addHelmUnifiedRuntime, hasUI5
         } = project
 
         await Promise.all(apps.map(async ({ app }) => {
             project.app = app
             project.hasIndexHtml = exists(join(appPath, app, 'webapp/index.html'))
-            const additions = [odataApi]
+            const additions = [odataApi, html5RepoApi]
             await merge(__dirname, 'files/xs-app.json.hbs').into(join(appPath, app, 'xs-app.json'), { with: project, additions })
             await merge(__dirname, 'files/app-package.json.hbs').into(join(appPath, app, 'package.json'), { project })
         }))
@@ -59,10 +59,6 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
                 project.app = app
                 await merge(__dirname, 'files/ui5.yaml.hbs').into(join(appPath, app, 'ui5.yaml'), { project })
             }
-            for (const { app } of apps) {
-                project.app = app
-                await merge(__dirname, 'files/ui5-deploy.yaml.hbs').into(join(appPath, app, 'ui5-deploy.yaml'), { project })
-            }
         }
 
         if (addMultitenancy) {
@@ -79,18 +75,12 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
             const appModules = []
             for (const { app } of project.apps) {
                 const html5App = { in: 'modules', where: { type: 'html5', path: `${appPath}${app}` } }
-                appModules.push(html5App)
                 relationships.push({
                     insert: [html5App],
                     into: [appDeployer, 'build-parameters.requires'],
                 })
             }
-            const additions = [srv, appDeployer, html5RepoHost, ...appModules]
-            if (hasApprouter || hasWorkzoneStandard || hasMultitenancy) {
-                additions.push(html5Runtime)
-            }
             if (hasApprouter) {
-                additions.push(approuter)
                 relationships.push({
                     insert: [html5Runtime, 'name'],
                     into: [approuter, 'requires', 'name'],
@@ -101,6 +91,10 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
                     insert: [html5Runtime, 'name'],
                     into: [isJava ? srv : mtxSidecar4('gen/mtx/sidecar'), 'requires', 'name']
                 })
+                relationships.push({
+                    insert: [html5RepoHost, 'name'],
+                    into: [isJava ? srv : mtxSidecar4('gen/mtx/sidecar'), 'requires', 'name']
+                })
             }
             if (hasXsuaa) {
                 relationships.push({
@@ -110,7 +104,7 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
             }
             await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', {
                 with: project,
-                additions,
+                additions: [srv, appDeployer, html5RepoHost, ...appModules],
                 relationships
             })
         }

package/lib/init/template/ias/files/values.yaml.hbs

@@ -1,7 +1,7 @@
 {{#hasMultitenancy}}
 sidecar:
   expose:
-    gateway: default/kyma-mtls-gateway
+    gateway: {{#literal}}"{{ .Release.Namespace }}/kyma-mtls-gateway"{{/literal}}
     host: {{#literal}}"{{ .Release.Name }}-sidecar-{{ .Release.Namespace }}.cert"{{/literal}}
   bindings:
     auth:
@@ -13,18 +13,18 @@ sidecar:
 {{#hasApprouter}}
 approuter:
   expose:
-    gateway: default/kyma-mtls-gateway
+    gateway: {{#literal}}"{{ .Release.Namespace }}/kyma-mtls-gateway"{{/literal}}
     host: {{#literal}}"{{ .Release.Name }}-approuter-{{ .Release.Namespace }}.cert"{{/literal}}
   bindings:
     auth:
       serviceInstanceName: identity
-        parameters:
-          credential-type: X509_GENERATED
-          app-identifier: approuter
+      parameters:
+        credential-type: X509_GENERATED
+        app-identifier: approuter
 {{/hasApprouter}}
 srv:
   expose:
-    gateway: default/kyma-mtls-gateway
+    gateway: {{#literal}}"{{ .Release.Namespace }}/kyma-mtls-gateway"{{/literal}}
     host: {{#literal}}"{{ .Release.Name }}-srv-{{ .Release.Namespace }}.cert"{{/literal}}
   bindings:
     auth: