@sap/cds-dk 6.8.2 → 7.0.0

package/lib/init/template/file-based-messaging/index.js

@@ -6,8 +6,7 @@ const { mergeJSON } = require('../../util/merge')
 module.exports = class FileBasedMessagingTemplate extends require('../templateBase') {
 
   async canRun() {
-    const projectDescriptor = await readProject(this.options)
-    const { isJava } = projectDescriptor.cap
+    const { isJava } = await readProject(this.options)
     if (isJava) throw `'cds add file-based-messaging' is not available for Java yet`
     return true
   }
@@ -18,8 +17,8 @@ module.exports = class FileBasedMessagingTemplate extends require('../templateBa
 
   async run() {
     const projectDescriptor = await readProject(this.options)
-    const { configFile } = projectDescriptor.cap
-    projectDescriptor.cap.shortcut = !(await read(configFile)).cds?.requires?.messaging?.kind
+    const { configFile } = projectDescriptor
+    projectDescriptor.shortcut = !(await read(configFile)).cds?.requires?.messaging?.kind
     await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), projectDescriptor)
   }
 }

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

@@ -8,6 +8,6 @@
   },
   "scripts": {
     "start": "node node_modules/@sap/hdi-deploy/deploy.js",
-    "build": "npm i && npx -p @sap/cds-dk@^6 cds build .. --for hana --production"
+    "build": "npm i && npx cds build .. --for hana --production"
   }
 }

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

@@ -1,46 +1,46 @@
 ---
 modules:
-  - name: {{cap.appName}}-srv
-    type: {{cap.language}}
-    path: {{& cap.srvPath}}
+  - name: {{appName}}-srv
+    type: {{language}}
+    path: {{& srvPath}}
     requires:
-      - name: {{cap.appName}}-db
+      - name: {{appName}}-db
 
-{{^cap.isMultitenant}}
-  - name: {{cap.appName}}-db-deployer
+{{^isMultitenant}}
+  - name: {{appName}}-db-deployer
     type: hdb
-    path: {{& cap.db.0.path}}
+    path: {{& db.0.path}}
     parameters:
       buildpack: nodejs_buildpack
-{{#cap.isJava}}
+{{#isJava}}
     build-parameters:
       builder: custom
       commands:
         - npm run build
-{{/cap.isJava}}
+{{/isJava}}
     requires:
-      - name: {{cap.appName}}-db
-{{/cap.isMultitenant}}
+      - name: {{appName}}-db
+{{/isMultitenant}}
 
-{{#cap.isMultitenant}}
-  - name: {{cap.appName}}-mtx
+{{#isMultitenant}}
+  - name: {{appName}}-mtx
     type: nodejs
-    path: {{#cap.isNodejs}}gen/{{/cap.isNodejs}}mtx/sidecar
+    path: {{#isNodejs}}gen/{{/isNodejs}}mtx/sidecar
     requires:
-      - name: {{cap.appName}}-db
-{{/cap.isMultitenant}}
+      - name: {{appName}}-db
+{{/isMultitenant}}
 
 resources:
-  - name: {{cap.appName}}-db
-    {{^cap.isMultitenant}}
+  - name: {{appName}}-db
+    {{^isMultitenant}}
     type: com.sap.xs.hdi-container
     parameters:
       service: hana
       service-plan: hdi-shared
-    {{/cap.isMultitenant}}
-    {{#cap.isMultitenant}}
+    {{/isMultitenant}}
+    {{#isMultitenant}}
     type: org.cloudfoundry.managed-service
     parameters:
       service: service-manager
       service-plan: container
-    {{/cap.isMultitenant}}
+    {{/isMultitenant}}

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

@@ -1,33 +1,27 @@
 {
-  {{#cap.isNodejs}}
+  {{#isNodejs}}
   "dependencies": {
-      "hdb": "^0.19.0"
+    "@sap/cds-hana": "^2"
   },
   "cds": {
-  {{/cap.isNodejs}}
+  {{/isNodejs}}
     "requires": {
-      {{#cap.for}}
-      "[{{cap.for}}]": {
-        {{#cap.shortcut}}
-        "db": "hana-cloud"
-        {{/cap.shortcut}}
-        {{^cap.shortcut}}
+      {{#profile}}
+      "[{{profile}}]": {
+      {{/profile}}
+      {{#shortcut}}
+        "db": "hana"
+      {{/shortcut}}
+      {{^shortcut}}
         "db": {
-          "kind": "hana-cloud"
+          "kind": "hana"
         }
-        {{/cap.shortcut}}
-      },
-      {{/cap.for}}
-      {{#cap.shortcut}}
-      "db": "{{^cap.for}}hana-cloud{{/cap.for}}{{#cap.for}}sql{{/cap.for}}"
-      {{/cap.shortcut}}
-      {{^cap.shortcut}}
-      "db": {
-        "kind": "sql"
+      {{/shortcut}}
+      {{#profile}}
       }
-      {{/cap.shortcut}}
+      {{/profile}}
     }
-  {{#cap.isNodejs}}
+  {{#isNodejs}}
   }
-  {{/cap.isNodejs}}
+  {{/isNodejs}}
 }

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

@@ -5,7 +5,7 @@ srv:
       serviceInstanceName: hana
 hana-deployer:
   image:
-    repository: <your-container-registry>/{{cap.appName}}-hana-deployer
+    repository: <your-container-registry>/{{appName}}-hana-deployer
     tag: latest
   bindings:
     hana:

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

@@ -9,7 +9,7 @@ const { parseMd5File, writeMd5File } = require('../../util/md5')
 const { copyFiles } = require('../../util/template')
 const { readProject } = require('../../util/projectReader');
 
-const { OPTION_JAVA, URLS } = require('../../constants');
+const { OPTIONS: { JAVA }, URLS } = require('../../constants');
 
 const { srvNode4, srvJava4, hdbDeployer, serviceManager, hdiContainer, mtxSidecar4 } = require('../_merging/registry-mta');
 
@@ -19,20 +19,10 @@ module.exports = class HanaTemplate extends require('../templateBase') {
         return env.requires?.db?.kind === 'hana'
     }
 
-    // REVISIT: Remove with CDS 7
-    async canRun() {
-        const cds = require('../../../cds')
-        const [major, minor] = cds.version.split('.').map(Number)
-        if (major < 5 || major === 5 && minor < 9) {
-            cds.error('The added configuration requires @sap/cds 5.9.0 or higher. Please update @sap/cds to the latest version and run \x1b[1mcds add hana\x1b[0m again.')
-        }
-        return true
-    }
-
     async run() {
         const projectDescriptor = await readProject(this.options)
-        const { isJava, configFile } = projectDescriptor.cap
-        projectDescriptor.cap.shortcut = !(await read(configFile)).cds?.requires?.db?.kind
+        const { isJava, configFile } = projectDescriptor
+        projectDescriptor.shortcut = !(await read(configFile)).cds?.requires?.db?.kind
 
         const env = await this.getEnv() // REVISIT: Get info from projectDescriptor
 
@@ -77,7 +67,7 @@ module.exports = class HanaTemplate extends require('../templateBase') {
 
     async runDependentMerging(context = {}) {
         const projectDescriptor = await readProject(this.options)
-        const { hasMta, hasHelm, hasHtml5Repo, isJava, isMultitenant, srvPath } = projectDescriptor.cap
+        const { hasMta, hasHelm, hasHtml5Repo, isJava, isMultitenant, srvPath } = projectDescriptor
 
 
         if (hasMta) {
@@ -205,7 +195,7 @@ module.exports = class HanaTemplate extends require('../templateBase') {
 
     async _updatePomXml() {
         // if called during cds init the project generation call to AT will add settings
-        if (!this.options.add.has(OPTION_JAVA)) {
+        if (!this.options.add.has(JAVA)) {
             const mvnAddHanaArgs = mvnArchetypes.getAddHanaCmdArgs(this.options);
             try {
                 await commandUtil.spawnCommand('mvn', mvnAddHanaArgs, {

package/lib/init/template/helm/files/Chart.yaml.hbs

@@ -2,9 +2,9 @@
 #
 # This file is generated by "cds add helm"
 apiVersion: v2
-name: {{cap.appName}}
-description: {{cap.appDescription}}
+name: {{appName}}
+description: {{appDescription}}
 type: application
-version: {{cap.appVersion}}
-appVersion: {{cap.appVersion}}
+version: {{appVersion}}
+appVersion: {{appVersion}}
 

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

@@ -5,20 +5,20 @@ global:
 srv:
   bindings: {}
   image:
-    repository: <your-container-registry>/{{cap.appName}}-srv
+    repository: <your-container-registry>/{{appName}}-srv
     tag: latest
-  {{#cap.isJava}}
+  {{#isJava}}
   env:
     SPRING_PROFILES_ACTIVE: cloud
-  {{/cap.isJava}}
+  {{/isJava}}
   resources:
     limits:
       ephemeral-storage: 1G
-      memory: {{#cap.isJava}}1G{{/cap.isJava}}{{^cap.isJava}}500M{{/cap.isJava}}
+      memory: {{#isJava}}1G{{/isJava}}{{^isJava}}500M{{/isJava}}
     requests:
       ephemeral-storage: 1G
-      cpu: {{#cap.isJava}}1000m{{/cap.isJava}}{{^cap.isJava}}500m{{/cap.isJava}}
-      memory: {{#cap.isJava}}1G{{/cap.isJava}}{{^cap.isJava}}500M{{/cap.isJava}}
+      cpu: {{#isJava}}1000m{{/isJava}}{{^isJava}}500m{{/isJava}}
+      memory: {{#isJava}}1G{{/isJava}}{{^isJava}}500M{{/isJava}}
   health:
     liveness:
       path: /

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

@@ -5,12 +5,17 @@ const { mergeYAML } = require('../../util/merge')
 const { parseMd5File, writeMd5File, copyAndTrack } = require('../../util/md5')
 
 module.exports = class HelmTemplate extends require('../templateBase') {
+
     constructor(generator, oldTrackingData = undefined, newTrackingData = {}) {
         super(generator)
         this.oldTrackingData = oldTrackingData;
         this.newTrackingData = newTrackingData;
     }
 
+    getRelatedFacets() {
+        return ['hana', 'xsuaa', 'auditlog', 'enterprise-messaging', 'destination' , 'multitenancy', 'extensibility', 'approuter', 'connectivity']
+    }
+
     static hasFacet(_, options) {
         // REVISIT: this works, but could be semantically nicer with a 'shouldRunDependentMerging' or the like
         if (options?.add.has('mta') && !options?.add.has('helm')) return false
@@ -98,14 +103,4 @@ module.exports = class HelmTemplate extends require('../templateBase') {
         await this.runDependentMerging();
         await writeMd5File(join('chart', '.cds-add-helm-files.md5'), this.newTrackingData);
     }
-
-    async runDependentMerging() {
-        // Re-applying the dependent merging part of other facets if necessary.
-        const dependentFacets = ['hana', 'xsuaa', 'auditlog', 'enterprise-messaging', 'destinations' , 'multitenancy', 'extensibility', 'approuter']
-        for (const facet of dependentFacets) {
-            const Template = require('../'+facet)
-            const template = new Template(this.generator)
-            if (Template.hasFacet(await this.getEnv(), this.options)) await template.runDependentMerging(this)
-        }
-    }
 };

package/lib/init/template/helm/subcharts/content-deployment/Chart.yaml

@@ -3,3 +3,5 @@ name: content-deployment
 description: A Helm Chart for creating a Content Deployment job
 type: application
 version: 0.1.0
+sources:
+- "https://github.tools.sap/unified-runtime/content-deployment"

package/lib/init/template/helm/subcharts/content-deployment/templates/_helpers.tpl

@@ -1,7 +1,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "content-deployment.name" -}}
+{{- define "content-deployment.internal.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
@@ -10,47 +10,53 @@ Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 If release name contains chart name it will be used as a full name.
 */}}
-{{- define "content-deployment.fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
-{{- if contains $name .Release.Name }}
-{{- .Release.Name | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
-{{- end }}
-{{- end }}
+{{- define "content-deployment.internal.fullname" -}}
+  {{- if .Values.fullnameOverride }}
+    {{- if gt (len .Values.fullnameOverride) 63 }}
+      {{- fail (printf "name exceeds 63 characters: '%s'" .Values.fullnameOverride) }}
+    {{- end }}
+    {{- .Values.fullnameOverride }}
+  {{- else }}
+    {{- $name := default .Chart.Name .Values.nameOverride }}
+    {{- if not (eq .Release.Name $name)}}
+      {{- $name = printf "%s-%s" .Release.Name $name }}
+    {{- end }}
+    {{- if gt (len $name) 63 }}
+      {{- fail (printf "name exceeds 63 characters: '%s'" $name) }}
+    {{- end }}
+    {{- $name }}
+  {{- end }}
 {{- end }}
 
 {{/*
 Define a name for the Job object
 */}}
-{{- define "content-deployment.jobName" -}}
-{{- printf "%s-%04d" ((include "content-deployment.fullname" . ) | trunc 59) (mod .Release.Revision 1000) }}
+{{- define "content-deployment.internal.jobName" -}}
+{{- printf "%s-%04d" ((include "content-deployment.internal.fullname" . ) | trunc 59) (mod .Release.Revision 1000) }}
 {{- end }}
 
 {{/*
 Define a name for a ServiceBinding object
 */}}
-{{- define "content-deployment.bindingName" -}}
-{{- printf "%s-%s" (include "content-deployment.fullname" .root ) .name }}
+{{- define "content-deployment.internal.bindingName" -}}
+{{- printf "%s-%s" (include "content-deployment.internal.fullname" .root ) .name }}
 {{- end }}
 
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "content-deployment.chart" -}}
+{{- define "content-deployment.internal.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
 Common labels
 */}}
-{{- define "content-deployment.labels" -}}
+{{- define "content-deployment.internal.labels" -}}
+sidecar.istio.io/inject: "false"
 helm.sh/revision: {{ .Release.Revision | quote }}
-helm.sh/chart: {{ include "content-deployment.chart" . }}
-{{ include "content-deployment.selectorLabels" . }}
+helm.sh/chart: {{ include "content-deployment.internal.chart" . }}
+{{ include "content-deployment.internal.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
@@ -59,9 +65,9 @@ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{/*
 Selector labels
 */}}
-{{- define "content-deployment.selectorLabels" -}}
+{{- define "content-deployment.internal.selectorLabels" -}}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
-app.kubernetes.io/name: {{ include "content-deployment.name" . }}
+app.kubernetes.io/name: {{ include "content-deployment.internal.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- if .Values.global}}
 {{- if .Values.global.component }}
@@ -76,7 +82,7 @@ app.kubernetes.io/partOf: {{ .Values.global.partOf }}
 {{/*
 Service Binding secret mounts
 */}}
-{{- define "content-deployment.serviceMounts" -}}
+{{- define "content-deployment.internal.serviceMounts" -}}
 {{- range $name, $params := .Values.bindings }}
 - mountPath: /bindings/{{ $name }}/
   name: {{ $name }}-binding
@@ -87,9 +93,9 @@ Service Binding secret mounts
 {{/*
 Service Binding secret volumes
 */}}
-{{- define "content-deployment.serviceVolumes" -}}
+{{- define "content-deployment.internal.serviceVolumes" -}}
 {{- range $name, $params := .Values.bindings }}
-{{- $secretName := (include "content-deployment.bindingName" (dict "root" $ "name" $name)) }}
+{{- $secretName := (include "content-deployment.internal.bindingName" (dict "root" $ "name" $name)) }}
 {{- if $params.fromSecret }}
 {{- $secretName = $params.fromSecret}}
 {{- else if $params.secretName }}
@@ -104,21 +110,21 @@ Service Binding secret volumes
 {{/*
 Name of the imagePullSecret
 */}}
-{{- define "content-deployment.imagePullSecretName" -}}
+{{- define "content-deployment.internal.imagePullSecretName" -}}
 {{ $ips := (dict "local" .Values.imagePullSecret "global" .Values.global.imagePullSecret) }}
 {{- if $ips.local.name }}
 {{- $ips.local.name }}
 {{- else if $ips.global.name }}
 {{- $ips.global.name }}
 {{- else if or $ips.local.dockerconfigjson $ips.global.dockerconfigjson }}
-{{- include "content-deployment.fullname" . }}
+{{- include "content-deployment.internal.fullname" . }}
 {{- end }}
 {{- end }}
 
 {{/*
 Calculate the final image name
 */}}
-{{- define "content-deployment.imageName" -}}
+{{- define "content-deployment.internal.imageName" -}}
 {{- $tag := .Values.image.tag | default .Values.global.image.tag | default "latest" }}
 {{- $registry := .Values.image.registry | default .Values.global.image.registry }}
 {{- if $registry }}
@@ -133,7 +139,7 @@ Create the name of a service instance.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 If release name contains chart name it will be used as service instance name.
 */}}
-{{- define "content-deployment.serviceInstanceName" -}}
+{{- define "content-deployment.internal.serviceInstanceName" -}}
   {{- $name := "" }}
   {{- if .binding.serviceInstanceFullname }}
     {{- if gt (len .binding.serviceInstanceFullname) 63 }}
@@ -152,7 +158,7 @@ If release name contains chart name it will be used as service instance name.
   {{- tpl $name .root }}
 {{- end }}
 
-{{- define "content-deployment.processEnv" -}}
+{{- define "content-deployment.internal.processEnv" -}}
 {{- $result := dict }}
 {{- $variables := list }}
 {{- range $k, $v := .Values.env }}
@@ -178,7 +184,7 @@ If release name contains chart name it will be used as service instance name.
 {{- (fromYaml (tpl (toYaml $result) $)) | mustToJson }}
 {{- end }}
 
-{{- define "content-deployment.processEnvFrom" -}}
+{{- define "content-deployment.internal.processEnvFrom" -}}
 {{- $result := dict }}
 {{- $variables := list }}
 {{- range $secretName := .Values.envSecretNames }}

package/lib/init/template/helm/subcharts/content-deployment/templates/job.yaml

@@ -2,8 +2,8 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  labels: {{- include "content-deployment.labels" . | nindent 4 }}
-  name: {{ include "content-deployment.jobName" . }}
+  labels: {{- include "content-deployment.internal.labels" . | nindent 4 }}
+  name: {{ include "content-deployment.internal.jobName" . }}
 spec:
   completions: 1
   manualSelector: false
@@ -11,20 +11,19 @@ spec:
   ttlSecondsAfterFinished: {{ mul .Values.ttlDaysAfterFinished 24 60 60 }}
   template:
     metadata:
-      labels: {{- include "content-deployment.labels" . | nindent 8 }}
+      labels: {{- include "content-deployment.internal.labels" . | nindent 8 }}
       annotations:
-        sidecar.istio.io/inject: "false"
-        container.apparmor.security.beta.kubernetes.io/{{ include "content-deployment.name" . }}: runtime/default
+        container.apparmor.security.beta.kubernetes.io/{{ include "content-deployment.internal.name" . }}: runtime/default
     spec:
-      {{- if (include "content-deployment.imagePullSecretName" .) }}
+      {{- if (include "content-deployment.internal.imagePullSecretName" .) }}
       imagePullSecrets:
-        - name: {{ include "content-deployment.imagePullSecretName" . }}
+        - name: {{ include "content-deployment.internal.imagePullSecretName" . }}
       {{- end }}
       automountServiceAccountToken: false
-      serviceAccountName: {{ tpl (.Values.serviceAccountName | default (include "content-deployment.fullname" .)) $ }}
+      serviceAccountName: {{ tpl (.Values.serviceAccountName | default (include "content-deployment.internal.fullname" .)) $ }}
       containers:
-      - image: {{ include "content-deployment.imageName" . }}
-        name: {{ include "content-deployment.name" . }}
+      - image: {{ include "content-deployment.internal.imageName" . }}
+        name: {{ include "content-deployment.internal.name" . }}
         env:
         - name: EXIT
           value: "1"
@@ -34,12 +33,12 @@ spec:
           value: /tmp
         - name: SERVICE_BINDING_ROOT
           value: /bindings
-        {{- $envVars := (include "content-deployment.processEnv" $ | fromJson) }}
+        {{- $envVars := (include "content-deployment.internal.processEnv" $ | fromJson) }}
         {{- if not (eq (len $envVars.vars) 0) }}
         {{- $envVars.vars | toYaml | nindent 8}}
         {{- end }}
         envFrom:
-        {{- $envFromVars := (include "content-deployment.processEnvFrom" . | fromJson) }}
+        {{- $envFromVars := (include "content-deployment.internal.processEnvFrom" . | fromJson) }}
         {{- if not (eq (len $envFromVars.vars) 0) }}
         {{- $envFromVars.vars | toYaml | nindent 8}}
         {{- end }}
@@ -55,7 +54,7 @@ spec:
         volumeMounts:
         - mountPath: /tmp
           name: tmp
-        {{- include "content-deployment.serviceMounts" . | nindent 8 }}
+        {{- include "content-deployment.internal.serviceMounts" . | nindent 8 }}
       restartPolicy: OnFailure
       securityContext:
         runAsNonRoot: true
@@ -63,4 +62,4 @@ spec:
       volumes:
       - name: tmp
         emptyDir: {}
-      {{- include "content-deployment.serviceVolumes" . | nindent 6 }}
+      {{- include "content-deployment.internal.serviceVolumes" . | nindent 6 }}

package/lib/init/template/helm/subcharts/content-deployment/templates/secret.yaml

@@ -3,8 +3,8 @@ apiVersion: v1
 kind: Secret
 type: kubernetes.io/dockerconfigjson
 metadata:
-  name: {{ include "content-deployment.imagePullSecretName" . }}
-  labels: {{- include "content-deployment.labels" . | nindent 4 }}
+  name: {{ include "content-deployment.internal.imagePullSecretName" . }}
+  labels: {{- include "content-deployment.internal.labels" . | nindent 4 }}
 data:
   .dockerconfigjson: {{ default .Values.global.imagePullSecret.dockerconfigjson .Values.imagePullSecret.dockerconfigjson }}
 {{- end -}}

package/lib/init/template/helm/subcharts/content-deployment/templates/service-account.yaml

@@ -2,5 +2,5 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "content-deployment.fullname" . }}
+  name: {{ include "content-deployment.internal.fullname" . }}
 {{end}}

package/lib/init/template/helm/subcharts/content-deployment/templates/service-binding.yaml

@@ -4,10 +4,10 @@
 apiVersion: services.cloud.sap.com/v1
 kind: ServiceBinding
 metadata:
-  name: {{ include "content-deployment.bindingName" (dict "root" $ "name" $name) }}
-  labels: {{- include "content-deployment.labels" $ | nindent 4 }}
+  name: {{ include "content-deployment.internal.bindingName" (dict "root" $ "name" $name) }}
+  labels: {{- include "content-deployment.internal.labels" $ | nindent 4 }}
 spec:
-  serviceInstanceName: {{include "content-deployment.serviceInstanceName" (dict "binding" $params "root" $) }}
+  serviceInstanceName: {{include "content-deployment.internal.serviceInstanceName" (dict "binding" $params "root" $) }}
   secretKey: credentials
   {{- if $params.externalName }}
   externalName: {{ $params.externalName }}