@sap/cds-dk 7.9.4 → 8.0.2

package/lib/build/buildTaskProviderFactory.js

@@ -18,7 +18,6 @@ class BuildTaskProviderFactory {
                 throw new BuildError(`Invalid build options - property '${key}' must be a string`)
             }
         })
-        this._buildOptions = options
         this._context = { options, tasks: [] } // resolved tasks
     }
     get options() {
@@ -40,14 +39,10 @@ class BuildTaskProviderFactory {
 
     async applyTaskDefaults(tasks) {
         return Promise.all(tasks.map(async (task) => {
-            if (!task.for && !task.use) {
-                throw new Error(`Invalid build task definition - property 'for' and property 'use' missing`)
+            if (!task.for) {
+                throw new BuildError(`Mandatory property 'for' not defined for build task.`)
             }
-            const provider = this._getProvider(task)
-            if (provider instanceof DefaultBuildTaskProvider) {
-                DEBUG?.(`No provider found for build task '${task.use}', using default provider`)
-            }
-            return this._applyTaskDefaults(provider, [task])
+            return this._applyTaskDefaults(this._getProvider(task), [task])
         }))
     }
 
@@ -67,23 +62,23 @@ class BuildTaskProviderFactory {
     }
 
     /**
-     * Create a BuildPlugin instance for the given build task.
+     * Create a Plugin instance for the given build task.
      * The implementation is loaded based on the build task's 'for' or 'use' option.
      * @param {*} task
      */
     createPlugin(task) {
-        const BuildPlugin = this.getPlugin(task)
+        const Plugin = this.getPlugin(task)
         const resolvedTask = this._resolveTask(task)
-        DEBUG?.(`loaded build plugin [${resolvedTask.use}]`)
+        DEBUG?.(`loaded build plugin [${resolvedTask.for}]`)
 
-        const plugin = new BuildPlugin()
-        if (!(plugin instanceof BuildPlugin)) {
+        const plugin = new Plugin()
+        if (!(plugin instanceof Plugin)) {
             throw new Error(`Invalid Build plugin type ${task.for}`)
         }
         plugin._task = resolvedTask
         plugin._context = this.context
         this.context.tasks.push(resolvedTask)
-        DEBUG?.(`created build plugin [${resolvedTask.use}]`)
+        DEBUG?.(`created build plugin [${resolvedTask.for}]`)
         return plugin
     }
 
@@ -98,7 +93,7 @@ class BuildTaskProviderFactory {
         try {
             return provider.getPlugin(task)
         } catch (e) {
-            console.error(`Provider failed to load build plugin class - provider: ${provider.constructor.name}, task: ${task.for || task.use} :\n` + e)
+            console.error(`Provider failed to load build plugin class ${task.for} - provider: ${provider.constructor.name}`)
             throw e
         }
     }
@@ -124,7 +119,7 @@ class BuildTaskProviderFactory {
             //validate source path
             fs.realpathSync(resolvedTask.src)
         } catch (e) {
-            throw new Error(`Build task [${resolvedTask.for || resolvedTask.use}] could not be resolved - folder src [${path.resolve(cds.root, task.src)}] does not exist`)
+            throw new BuildError(`The 'src' folder '${path.resolve(cds.root, task.src)}' for build task '${resolvedTask.for}' does not exist`)
         }
         resolvedTask.dest = path.resolve(cds.root, cds.env.build.target, task.dest || task.src)
         resolvedTask.options = task.options || {}
@@ -136,12 +131,12 @@ class BuildTaskProviderFactory {
             try {
                 return provider.providesTask(key)
             } catch (e) {
-                console.error(`Build task provider ${provider.constructor.name} returned an error:\n` + e)
+                console.error(`Build task provider ${provider.constructor.name} returned an error`)
                 throw e
             }
         })
         if (!provider) {
-            throw new BuildError(`No provider found for build task '${key.for || key.use}'. Ensure that all required dependencies have been added and 'npm install' has been executed.`)
+            throw new BuildError(`No provider found for build task '${key.for}'. Ensure that all required dependencies have been added and 'npm install' has been executed.`)
         }
         return provider
     }
@@ -155,37 +150,13 @@ class BuildTaskProviderFactory {
     }
 
     _loadProviders() {
-        // DefaultBuildTaskProvider must be last entry
         return [
             new InternalBuildTaskProvider(),
-            new PluginBuildTaskProvider(),
-            new DefaultBuildTaskProvider()
+            new PluginBuildTaskProvider()
         ]
     }
 }
 
-/**
- * Default provider implementation handling fully qualified custom build task declarations.
- * Has to be the last entry in the providers list.
- */
-class DefaultBuildTaskProvider extends BuildTaskProvider {
-    constructor() {
-        super()
-    }
-
-    providesTask(key) {
-        return !!key.use
-    }
-
-    getPlugin(task) {
-        try {
-            return require(require.resolve(task.use, { paths: [cds.root] }))
-        } catch (e) {
-            throw new Error(`Build task could not be resolved - module [${task.use}] cannot be loaded:\n` + e)
-        }
-    }
-}
-
 /**
  * Default provider implementation handling fully qualified custom build task declarations.
  */
@@ -226,7 +197,8 @@ class PluginBuildTaskProvider extends BuildTaskProvider {
     }
 
     getTask(key) {
-        const task = this.plugins.get(key.for).taskDefaults ?? {}
+        // plugin entry is already validated, a taskDefaults default member exists
+        const task = JSON.parse(JSON.stringify(this.plugins.get(key.for).taskDefaults ?? {}))
         task.for = key.for
         task.src ??= DEFAULT_SRC_FOLDER
         task.src = task.src.replace(/\/$/, '')

package/lib/build/constants.js

@@ -4,8 +4,6 @@ exports.OUTPUT_MODE_FILESYSTEM = 0x1
 exports.OUTPUT_MODE_RESULT = 0x2
 
 exports.DEFAULT_SRC_FOLDER = '.'
-exports.BUILD_TASK_NPM_SCOPE = "@sap"
-exports.BUILD_TASK_PREFIX = exports.BUILD_TASK_NPM_SCOPE + "/cds/build"
 exports.BUILD_TASK_JAVA = "java"
 exports.BUILD_TASK_JAVA_CF = "java-cf"
 exports.BUILD_TASK_NODEJS = "nodejs"
@@ -16,6 +14,8 @@ exports.BUILD_TASK_MTX = "mtx"
 exports.BUILD_TASK_MTX_SIDECAR = "mtx-sidecar"
 exports.BUILD_TASK_MTX_EXTENSION = "mtx-extension"
 exports.BUILD_TASKS = [this.BUILD_TASK_JAVA, this.BUILD_TASK_JAVA_CF, this.BUILD_TASK_NODEJS, this.BUILD_TASK_NODE_CF, this.BUILD_TASK_HANA, this.BUILD_TASK_FIORI, this.BUILD_TASK_MTX, this.BUILD_TASK_MTX_SIDECAR, this.BUILD_TASK_MTX_EXTENSION]
+exports.DEFAULT_BUILTIN_PRIORITY_MIN = 0
+exports.DEFAULT_BUILTIN_PRIORITY_MAX = 524
 
 exports.ODATA_VERSION_V2 = "v2"
 exports.ODATA_VERSION_V4 = "v4"
@@ -33,8 +33,8 @@ exports.CONTENT_CDSRC_JSON = "contentCdsrcJson"                 // copy .cdsrc.j
 exports.CONTENT_NODE_MODULES = "contentNodeModules"             // copy node_modules folder into deployment folder - DISABLED by default
 exports.CONTENT_ENV = "contentEnv"                              // copy .env file into deployment folder - DISABLED by default
 exports.CONTENT_DEFAULT_ENV_JSON = "contentDefaultEnvJson"      // copy default-env.json file into deployment folder - DISABLED by default
-exports.CONTENT_WS = "ws"                                       // determine model paths including submodules + CONTENT_SUBMODULES_HANA - DISABLED by default
 
+exports.OPTION_WS = "ws"                                        // run a workspace build, e.g. including model folders of configured npm workspaces
 exports.CSV_FILE_TARGET = "csvFileTarget"                       // target folder when copying CSV files to the deployment target folder ./db/src/gen/*, default is 'data'
 exports.CSV_FILE_DETECTION = "csvFileDetection"                 // detect CSV files based on CDS model location - ENABLED by default
 exports.EXTENSION_POINT_VALIDATION = "extensionPointValidation" // validate extension point restrictions defined by the extended SaaS app - ENABLED by default

package/lib/build/index.js

@@ -1,10 +1,10 @@
 const fs = require('fs')
 const cds = require('../cds')
 const BuildTaskEngine = require('./buildTaskEngine')
-const BuildPlugin = require('./buildPlugin')
+const Plugin = require('./plugin')
 const { BuildError } = require('./util')
 
-module.exports = { build, register, Plugin: BuildPlugin, BuildError, BuildPlugin }
+module.exports = { build, register, Plugin, BuildError }
 
 /**
  * Executes cds build in the directory defined by cds.root.

package/lib/build/{buildPlugin.js → plugin.js}

@@ -1,8 +1,8 @@
 const path = require('path')
-const fs = require('fs').promises
+const fs = require('fs')
 const cds = require('../cds')
 const { OUTPUT_MODE, OUTPUT_MODE_FILESYSTEM, SEVERITY_INFO, SEVERITY_WARNING, SEVERITY_ERROR } = require('./constants')
-const { hasOptionValue, getProperty, relativePaths, BuildMessage, pathExists } = require('./util')
+const { hasOptionValue, getProperty, relativePaths, BuildMessage, pathExists, filterFeaturePaths, getFiles } = require('./util')
 const DEBUG = cds.debug('cli|build')
 
 /**
@@ -19,27 +19,27 @@ const DEBUG = cds.debug('cli|build')
  * </ul>
  * The reflected CSN can be accessed using the async method <code>model()</code>.
  */
-class BuildPlugin {
+class Plugin {
     /**
      * @constructor
      */
     constructor() {
-        this._written = new Set()
+        this._files = new Set()
         this._messages = []
     }
-    static hasTask() {
-        return true
-    }
+
     static INFO = SEVERITY_INFO
     static WARNING = SEVERITY_WARNING
     static ERROR = SEVERITY_ERROR
+
     /**
-     * Returns the build context
-     * @returns {object}
+     * Determines whether a task of this type will be created when cds build is executed,
+     * returns true by default.
      */
-    get context() {
-        return this._context
+    static hasTask() {
+        return true
     }
+
     /**
      * Returns the build task executed by this build plugin.
      * @return {object}
@@ -59,26 +59,33 @@ class BuildPlugin {
     }
 
     /**
-     * Returns the list of files written by this build plugin.
+     * Returns the list of files and folders written by this build plugin.
      * @return {Array}
      */
     get files() {
-        return [...this._written]
+        return [...this._files]
     }
 
     /**
-     * Returns the priority of this plugin as number, where 0 represents the minimum value and
-     * Number.MAX_SAFE_INTEGER the maximum value.
-     * Positive numbers mean higher and negative numbers lower priority. Build plugins
-     * with higher priority value are executed before plugins with lower priority.
-     * <br>
-     * Note: Currently not supported for custom build plugins as they are always executed
-     * before the built-in plugins.
+     * Returns the build context
+     * @returns {object}
+     */
+    get context() {
+        return this._context
+    }
+
+    /**
+     * Returns the priority of this plugin as number, where 1024 represents the default value
+     * to ensure that custom plugins are by default executed before the built-in plugins.
+     * The higher the priority value, the sooner the build plugin will be run.
+     * The range of valid priority values is from -1024 to +1024.
+     * Built-in plugins have a priority value range from 0 - 524.
      * @return {number} the priority for this plugin as integer.
      */
     get priority() {
-        return 1
+        return 1024
     }
+
     /**
      * Called by the framework immediately after this instance has been created.
      * The instance has already been fully initialized.
@@ -93,8 +100,7 @@ class BuildPlugin {
      * @abstract
      * Called by the framework to create the artifacts of this build plugin.
      */
-    async build() {
-    }
+    async build() { }
 
     /**
      * Called by the framework immediately before 'build' to delete any output created by this build plugin.
@@ -110,7 +116,7 @@ class BuildPlugin {
             && this.task.src !== this.task.dest
             && !isSubDirectory(this.task.dest, this.task.src)
             && await pathExists(this.task.dest)) {
-            return fs.rm(this.task.dest, { force: true, recursive: true })
+            return fs.promises.rm(this.task.dest, { force: true, recursive: true })
         }
     }
 
@@ -130,19 +136,17 @@ class BuildPlugin {
                         dest = path.resolve(this.task.dest, dest)
                     }
                     this.pushFile(dest)
-                    await fs.mkdir(path.dirname(dest), { recursive: true })
-                    await fs.writeFile(dest, typeof data === "object" && !Buffer.isBuffer(data) ? JSON.stringify(data, null, 2) : data)
+                    await fs.promises.mkdir(path.dirname(dest), { recursive: true })
+                    await fs.promises.writeFile(dest, typeof data === "object" && !Buffer.isBuffer(data) ? JSON.stringify(data, null, 2) : data)
                 }
             }
         }
     }
 
-    // TODO only works with files due to fs.copyFile, check usages
     /**
-     * Copy a file or directory if the build task option 'outputMode' does not have the value 'resultOnly'.
-     * The directory can have contents.
+     * Asynchronously copies a single file or the entire directory structure from 'src' to 'dest', including subdirectories and files.
      * <p>
-     * Note: The file name is stored in the list of files written by this build plugin.
+     * Note: The file names are stored in the list of files written by this build plugin.
      * </p>
      * @param {string} src The absolute or relative source path of the file or directory to copy.
      * Relative paths will be resolved to this task's source path.
@@ -161,10 +165,16 @@ class BuildPlugin {
                         // relative to build task's destination path
                         dest = path.resolve(this.task.dest, dest)
                     }
-                    this.pushFile(dest)
-                    return fs.cp(src, dest, { recursive: true })
+                    // list all copied files recursively
+                    if (fs.lstatSync(src).isDirectory()) {
+                        await fs.promises.cp(src, dest, { recursive: true })
+                        const files = getFiles(dest)
+                        files.forEach(file => this.pushFile(file))
+                    } else {
+                        this.pushFile(dest)
+                        return fs.promises.cp(src, dest, { recursive: true })
+                    }
                 }
-                return dest
             }
         }
     }
@@ -182,11 +192,13 @@ class BuildPlugin {
     }
 
     /**
-     * Returns the reflected CSN model using this build task's model settings.
-     * @return {object} the reflected CSN
+     * Returns a compiled CSN model according to the model paths defined by this build task.
+     * The model includes model enhancements defined by feature toggles, if any.
+     * @return {object} the compiled CSN model
      */
     async model() {
-        const files = this._resolveModel()
+        const files = cds.resolve(this.task.options.model || this.task.src)
+
         if (!files || files.length === 0) {
             console.log(`no CDS model found for [${this.task.for}] build task [${this.task.src}] - nothing to be done`)
             return null
@@ -202,6 +214,20 @@ class BuildPlugin {
         return model
     }
 
+    /**
+     * Returns a compiled base model CSN according to the model paths defined by this build task.
+     * The base model does not include any model enhancements defined by feature toggles.
+     * @return {object} the compiled base model CSN
+     */
+    async baseModel() {
+        const model = await this.model()
+        if (!model) {
+            return model
+        }
+        const sources = filterFeaturePaths(model, this.task.options.model || this.task.src)
+        return sources.features ? cds.load(sources.base, this.options()) : model
+    }
+
     options() {
         return { messages: this._messages }
     }
@@ -211,16 +237,9 @@ class BuildPlugin {
      * @param {string} filePath
      */
     pushFile(filePath) {
-        this._written.add(filePath)
-    }
-    /**
-     * Returns a list of CDS model files defining the transitive closure of the CDS model based on the model options
-     * defined for this build task.
-     */
-    _resolveModel() {
-        const modelPaths = Array.isArray(this.task.options.model) && this.task.options.model.length > 0 ? this.task.options.model : !Array.isArray(this.task.options.model) && this.task.options.model || this.task.src
-        return cds.resolve(modelPaths)
+        this._files.add(filePath)
     }
+
     /** Determines whether the given build option value has been set for this build task.
       * If the value is omitted, the existence of the given property name is checked.
       */
@@ -238,4 +257,4 @@ class BuildPlugin {
         return value
     }
 }
-module.exports = BuildPlugin
+module.exports = Plugin

package/lib/{init/template/helm/files → build/plugins/helm/files/subcharts}/content-deployment/Chart.yaml

@@ -2,4 +2,4 @@ apiVersion: v2
 description: A Helm Chart for creating a Content Deployment job
 name: content-deployment
 type: application
-version: 1.6.0
+version: 1.6.1

package/lib/{init/template/helm/files → build/plugins/helm/files/subcharts}/content-deployment/values.yaml

@@ -15,7 +15,7 @@ global:
     _internal:
       content-deployment:
         versions:
-          1.6.0: true
+          1.6.1: true
 # Will be used instead of the `.Chart.Name`, e.g. when generating the Deployment name.
 # nameOverride: name
 

package/lib/{init/template/helm/files → build/plugins/helm/files/subcharts}/service-instance/Chart.yaml

@@ -2,4 +2,4 @@ apiVersion: v2
 description: A Helm chart for creating service instances on btp-service-operator
 name: service-instance
 type: application
-version: 1.3.0
+version: 1.5.1

package/lib/{init/template/helm/files → build/plugins/helm/files/subcharts}/service-instance/templates/_helpers.tpl

@@ -64,3 +64,10 @@ app.kubernetes.io/partOf: {{ .Values.global.partOf }}
 {{- end }}
 {{- end }}
 {{- end }}
+
+{{/*
+  Binding name
+*/}}
+{{- define "service-instance.internal.bindingName" -}}
+{{- printf "%s-%s" (include "service-instance.internal.fullname" .root ) .name }}
+{{- end }}

package/lib/build/plugins/helm/files/subcharts/service-instance/templates/servicebinding.yaml

@@ -0,0 +1,32 @@
+{{- $bindings := omit .Values.bindings "defaultProperties" -}}
+{{- range $name, $params := $bindings }}
+{{- $defaultProperties := deepCopy $.Values.bindings.defaultProperties -}}
+{{- $mergedParams := (deepCopy $params | mergeOverwrite $defaultProperties ) }}
+---
+apiVersion: services.cloud.sap.com/v1
+kind: ServiceBinding
+metadata:
+  name: {{ include "service-instance.internal.bindingName" (dict "root" $ "name" $name) }}
+  labels: {{- include "service-instance.internal.labels" $ | nindent 4 }}
+  {{- if or $.Values.annotations.serviceBinding }}
+  annotations:
+  {{- tpl (toYaml $.Values.annotations.serviceBinding) $ | nindent 4 }}
+  {{- end }}
+spec:
+  serviceInstanceName: {{ include "service-instance.internal.fullname" $ }}
+  {{- if $mergedParams.externalName }}
+  externalName: {{ $mergedParams.externalName }}
+  {{- end }}
+  {{- if $mergedParams.secretName }}
+  secretName: {{ tpl $mergedParams.secretName $ }}
+  {{- end }}
+  {{- if $mergedParams.parameters }}
+  parameters: {{ $mergedParams.parameters | toYaml | nindent 4 }}
+  {{- end }}
+  {{- if $mergedParams.parametersFrom }}
+  parametersFrom: {{ tpl ($mergedParams.parametersFrom | toYaml) $ | nindent 4 }}
+  {{- end }}
+  {{- if $mergedParams.credentialsRotationPolicy }}
+  credentialsRotationPolicy: {{ $mergedParams.credentialsRotationPolicy | toYaml | nindent 4 }}
+  {{- end }}
+{{- end }}

package/lib/{init/template/helm/files → build/plugins/helm/files/subcharts}/service-instance/templates/serviceinstance.yaml

@@ -11,6 +11,9 @@ metadata:
 spec:
   serviceOfferingName: {{ .Values.serviceOfferingName }}
   servicePlanName: {{ .Values.servicePlanName }}
+  {{- if .Values.btpAccessCredentialsSecret }}
+  btpAccessCredentialsSecret: {{ .Values.btpAccessCredentialsSecret }}
+  {{- end }}
   {{- if .Values.externalName }}
   externalName: {{ .Values.externalName }}
   {{- end }}

package/lib/{init/template/helm/files → build/plugins/helm/files/subcharts}/service-instance/values.schema.json

@@ -32,6 +32,10 @@
             "type": "string",
             "pattern": "[0-9a-z][0-9a-z-.]*"
         },
+        "btpAccessCredentialsSecret": {
+            "$id": "#/properties/btpAccessCredentialsSecret",
+            "type": "string"
+        },
         "externalName": {
             "$id": "#/properties/externalName",
             "type": "string",
@@ -93,6 +97,65 @@
                             "type": "string"
                         }
                     }
+                },
+                "serviceBinding": {
+                    "type": "object",
+                    "patternProperties": {
+                        ".*": {
+                            "type": "string"
+                        }
+                    }
+                }
+            }
+        },
+        "bindings": {
+            "$id": "#/properties/bindings",
+            "title": "Service Binding configuration",
+            "type": "object",
+            "additionalProperties": false,
+            "patternProperties": {
+                "^[-._a-zA-Z][-._a-zA-Z0-9]*$": {
+                    "type": "object",
+                    "additionalProperties": false,
+                    "properties": {
+                        "externalName": {
+                            "type": "string"
+                        },
+                        "secretName": {
+                            "type": "string"
+                        },
+                        "parameters": {
+                            "type": "object"
+                        },
+                        "parametersFrom": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "additionalProperties": false,
+                                "properties": {
+                                    "secretKeyRef": {
+                                        "type": "object",
+                                        "additionalProperties": false,
+                                        "required": [
+                                            "name",
+                                            "key"
+                                        ],
+                                        "properties": {
+                                            "name": {
+                                                "type": "string"
+                                            },
+                                            "key": {
+                                                "type": "string"
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        },
+                        "credentialsRotationPolicy": {
+                            "type": "object"
+                        }
+                    }
                 }
             }
         }

package/lib/{init/template/helm/files → build/plugins/helm/files/subcharts}/service-instance/values.yaml

@@ -10,6 +10,9 @@
 # The plan to use for the service instance.
 # servicePlanName: plan-name
 
+# The secret containing the relevant subaccount's credentials where the ServiceInstance will be provisioned.
+# btpAccessCredentialsSecret: secret-name
+
 # The name for the service instance in SAP BTP.
 # externalName: feature-flags-test
 
@@ -38,9 +41,28 @@
 
 annotations:
   serviceInstance: {}
+  serviceBinding: {}
+bindings:
+  defaultProperties:
+    credentialsRotationPolicy:
+      enabled: false
+      rotationFrequency: "720h"
+      rotatedBindingTTL: "24h"
+#   my-service-binding:
+#     externalName: my-service-binding-external-name
+#     secretName: my-service-binding-secret
+#     parameters:
+#       foo: bar
+#     parametersFrom:
+#       - secretKeyRef:
+#           key: test
+#           name: test
+#     credentialsRotationPolicy:
+#       enabled: false
+
 global:
   sap:
     _internal:
       service-instance:
         versions:
-          1.3.0: true
+          1.5.1: true

package/lib/{init/template/helm/files → build/plugins/helm/files/subcharts}/web-application/Chart.yaml

@@ -3,4 +3,4 @@ description: A Helm chart for web app
 kubeVersion: '>= 1.21'
 name: web-application
 type: application
-version: 1.13.1
+version: 1.16.0

package/lib/{init/template/helm/files → build/plugins/helm/files/subcharts}/web-application/templates/deployment.yaml

@@ -8,7 +8,9 @@ metadata:
   {{- tpl (toYaml .Values.annotations.deployment) $ | nindent 4 }}
   {{- end }}
 spec:
+  {{- if not .Values.hpa.enabled }}
   replicas: {{ .Values.replicaCount }}
+  {{- end }}
   selector:
     matchLabels: {{- include "web-application.selectorLabels" . | nindent 6 }}
   template:

package/lib/build/plugins/helm/files/subcharts/web-application/templates/hpa.yaml

@@ -0,0 +1,22 @@
+{{- if .Values.hpa.enabled -}}
+apiVersion: autoscaling/v2
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ include "web-application.fullname" . }}
+  labels: {{- include "web-application.labels" . | nindent 4 }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: deployment
+    name: {{ include "web-application.fullname" . }}
+  minReplicas: {{ .Values.hpa.minReplicas }}
+  maxReplicas: {{ .Values.hpa.maxReplicas }}
+  {{- if .Values.hpa.behavior }}
+  behavior:
+    {{- toYaml .Values.hpa.behavior | nindent 4 }}
+  {{- end }}
+  {{- if .Values.hpa.metrics }}
+  metrics:
+    {{- toYaml .Values.hpa.metrics | nindent 4 }}
+  {{- end }}
+{{- end }}

package/lib/{init/template/helm/files → build/plugins/helm/files/subcharts}/web-application/templates/pod-disruption-budget.yaml

@@ -5,5 +5,6 @@ metadata:
   labels: {{- include "web-application.labels" . | nindent 4 }}
 spec:
   maxUnavailable: {{ .Values.availability.podDisruptionBudget.maxUnavailable }}
+  unhealthyPodEvictionPolicy: {{ .Values.availability.podDisruptionBudget.unhealthyPodEvictionPolicy }}
   selector:
     matchLabels: {{- include "web-application.selectorLabels" . | nindent 6 }}