@sap/cds-dk 6.8.3 → 7.0.0

package/lib/init/template/helm/subcharts/service-instance/templates/serviceinstance.yaml

@@ -2,8 +2,8 @@
 apiVersion: services.cloud.sap.com/v1
 kind: ServiceInstance
 metadata:
-  labels: {{- include "service-instance.labels" . | nindent 4 }}
-  name: {{ include "service-instance.fullname" . }}
+  labels: {{- include "service-instance.internal.labels" . | nindent 4 }}
+  name: {{ include "service-instance.internal.fullname" . }}
 spec:
   serviceOfferingName: {{ .Values.serviceOfferingName }}
   servicePlanName: {{ .Values.servicePlanName }}

package/lib/init/template/helm/subcharts/service-instance/values.md

@@ -18,7 +18,7 @@
 | - [jsonParameters](#jsonParameters )           | No      | string          | No         | -          | Some services support the provisioning of additional configuration parameters. For the list of supported parameters, check the documentation of the particular service offering. |
 | - [parametersFrom](#parametersFrom )           | No      | array of object | No         | -          | List of sources to populate parameters.                                                                                                                                          |
 
-## <a name="global"></a>1. ![Optional](https://img.shields.io/badge/Optional-yellow) Property `global<br />`
+## <a name="global"></a>1. ![Optional](https://img.shields.io/badge/Optional-yellow) Property `global`
 
 **Title:** Helm global values
 
@@ -29,7 +29,7 @@
 
 **Description:** For more information, see https://helm.sh/docs/chart_template_guide/subcharts_and_globals/#global-chart-values
 
-## <a name="nameOverride"></a>2. ![Optional](https://img.shields.io/badge/Optional-yellow) Property `nameOverride<br />`
+## <a name="nameOverride"></a>2. ![Optional](https://img.shields.io/badge/Optional-yellow) Property `nameOverride`
 
 **Title:** Chart name override
 
@@ -43,7 +43,7 @@
 | --------------------------------- | ------------------------------------------------------------------------------------------- |
 | **Must match regular expression** | ```[0-9a-z][0-9a-z-.]*``` [Test](https://regex101.com/?regex=%5B0-9a-z%5D%5B0-9a-z-.%5D%2A) |
 
-## <a name="fullnameOverride"></a>3. ![Optional](https://img.shields.io/badge/Optional-yellow) Property `fullnameOverride<br />`
+## <a name="fullnameOverride"></a>3. ![Optional](https://img.shields.io/badge/Optional-yellow) Property `fullnameOverride`
 
 **Title:** Override for the `.fullname` helper function.
 
@@ -57,7 +57,7 @@
 | --------------------------------- | ------------------------------------------------------------------------------------------- |
 | **Must match regular expression** | ```[0-9a-z][0-9a-z-.]*``` [Test](https://regex101.com/?regex=%5B0-9a-z%5D%5B0-9a-z-.%5D%2A) |
 
-## <a name="serviceOfferingName"></a>4. ![Required](https://img.shields.io/badge/Required-blue) Property `serviceOfferingName<br />`
+## <a name="serviceOfferingName"></a>4. ![Required](https://img.shields.io/badge/Required-blue) Property `serviceOfferingName`
 
 |          |          |
 | -------- | -------- |
@@ -69,7 +69,7 @@
 | --------------------------------- | ------------------------------------------------------------------------------------------- |
 | **Must match regular expression** | ```[0-9a-z][0-9a-z-.]*``` [Test](https://regex101.com/?regex=%5B0-9a-z%5D%5B0-9a-z-.%5D%2A) |
 
-## <a name="servicePlanName"></a>5. ![Required](https://img.shields.io/badge/Required-blue) Property `servicePlanName<br />`
+## <a name="servicePlanName"></a>5. ![Required](https://img.shields.io/badge/Required-blue) Property `servicePlanName`
 
 |          |          |
 | -------- | -------- |
@@ -81,7 +81,7 @@
 | --------------------------------- | ------------------------------------------------------------------------------------------- |
 | **Must match regular expression** | ```[0-9a-z][0-9a-z-.]*``` [Test](https://regex101.com/?regex=%5B0-9a-z%5D%5B0-9a-z-.%5D%2A) |
 
-## <a name="externalName"></a>6. ![Optional](https://img.shields.io/badge/Optional-yellow) Property `externalName<br />`
+## <a name="externalName"></a>6. ![Optional](https://img.shields.io/badge/Optional-yellow) Property `externalName`
 
 |          |          |
 | -------- | -------- |
@@ -93,7 +93,7 @@
 | --------------------------------- | ------------------------------------------------------------------------------------------- |
 | **Must match regular expression** | ```[0-9a-z][0-9a-z-.]*``` [Test](https://regex101.com/?regex=%5B0-9a-z%5D%5B0-9a-z-.%5D%2A) |
 
-## <a name="customTags"></a>7. ![Optional](https://img.shields.io/badge/Optional-yellow) Property `customTags<br />`
+## <a name="customTags"></a>7. ![Optional](https://img.shields.io/badge/Optional-yellow) Property `customTags`
 
 |          |                   |
 | -------- | ----------------- |
@@ -105,13 +105,13 @@
 | ------------------------------------- | ----------- |
 | [customTags items](#customTags_items) | -           |
 
-### <a name="autogenerated_heading_2"></a>7.1. customTags items<br />
+### <a name="autogenerated_heading_2"></a>7.1. customTags items
 
 |          |          |
 | -------- | -------- |
 | **Type** | `string` |
 
-## <a name="parameters"></a>8. ![Optional](https://img.shields.io/badge/Optional-yellow) Property `parameters<br />`
+## <a name="parameters"></a>8. ![Optional](https://img.shields.io/badge/Optional-yellow) Property `parameters`
 
 |                           |                                                                                                                                   |
 | ------------------------- | --------------------------------------------------------------------------------------------------------------------------------- |
@@ -120,7 +120,7 @@
 
 **Description:** Some services support the provisioning of additional configuration parameters. For the list of supported parameters, check the documentation of the particular service offering.
 
-## <a name="jsonParameters"></a>9. ![Optional](https://img.shields.io/badge/Optional-yellow) Property `jsonParameters<br />`
+## <a name="jsonParameters"></a>9. ![Optional](https://img.shields.io/badge/Optional-yellow) Property `jsonParameters`
 
 |          |          |
 | -------- | -------- |
@@ -128,7 +128,7 @@
 
 **Description:** Some services support the provisioning of additional configuration parameters. For the list of supported parameters, check the documentation of the particular service offering.
 
-## <a name="parametersFrom"></a>10. ![Optional](https://img.shields.io/badge/Optional-yellow) Property `parametersFrom<br />`
+## <a name="parametersFrom"></a>10. ![Optional](https://img.shields.io/badge/Optional-yellow) Property `parametersFrom`
 
 |          |                   |
 | -------- | ----------------- |
@@ -140,7 +140,7 @@
 | --------------------------------------------- | ----------------------------------------- |
 | [parametersFrom items](#parametersFrom_items) | Kubernetes Secret as a parameters source. |
 
-### <a name="autogenerated_heading_3"></a>10.1. parametersFrom items<br />
+### <a name="autogenerated_heading_3"></a>10.1. parametersFrom items
 
 |                           |                                                                                                          |
 | ------------------------- | -------------------------------------------------------------------------------------------------------- |
@@ -153,7 +153,7 @@
 | ----------------------------------------------------- | ------- | ------ | ---------- | ---------- | ----------------------------------------- |
 | - [secretKeyRef](#parametersFrom_items_secretKeyRef ) | No      | object | No         | -          | Kubernetes Secret as a parameters source. |
 
-#### <a name="parametersFrom_items_secretKeyRef"></a>10.1.1. Property `secretKeyRef<br />`
+#### <a name="parametersFrom_items_secretKeyRef"></a>10.1.1. Property `secretKeyRef`
 
 |                           |                                                                                                          |
 | ------------------------- | -------------------------------------------------------------------------------------------------------- |
@@ -167,7 +167,7 @@
 | + [name](#parametersFrom_items_secretKeyRef_name ) | No      | string | No         | -          | Name of a Secret.                                                                                                                  |
 | + [key](#parametersFrom_items_secretKeyRef_key )   | No      | string | No         | -          | Key in that Secret, which contains a string that represents the json to include in the set of parameters to be sent to the broker. |
 
-##### <a name="parametersFrom_items_secretKeyRef_name"></a>10.1.1.1. Property `name<br />`
+##### <a name="parametersFrom_items_secretKeyRef_name"></a>10.1.1.1. Property `name`
 
 |          |          |
 | -------- | -------- |
@@ -175,7 +175,7 @@
 
 **Description:** Name of a Secret.
 
-##### <a name="parametersFrom_items_secretKeyRef_key"></a>10.1.1.2. Property `key<br />`
+##### <a name="parametersFrom_items_secretKeyRef_key"></a>10.1.1.2. Property `key`
 
 |          |          |
 | -------- | -------- |

package/lib/init/template/helm/subcharts/web-application/Chart.yaml

@@ -4,3 +4,5 @@ description: A Helm chart for web app
 kubeVersion: ">= 1.21"
 type: application
 version: 0.1.0
+sources:
+- "https://github.tools.sap/unified-runtime/web-application"

package/lib/init/template/helm/subcharts/web-application/templates/NOTES.txt

@@ -0,0 +1,15 @@
+{{- $deprecations := list -}}
+
+{{/*
+    v0.9.0 deprecations 
+*/}}
+{{- if not (hasKey .Values "readOnlyRootFilesystem") -}}
+    {{- $deprecations = append $deprecations "You are currently using the default value of readOnlyRootFilesystem, which is currently false, but will change to true soon. We recommend setting the value to true now and validate that your application works with the new default." -}}
+{{- end -}}
+
+{{- if gt (len $deprecations) 0 -}}
+Found usage of {{len $deprecations}} deprecated {{ len $deprecations | plural "feature" "features" }} in {{ .Chart.Name }}:
+{{- range $deprecations }}
+- {{ . }}
+{{- end }}
+{{- end -}}

package/lib/init/template/helm/subcharts/web-application/templates/_helpers.tpl

@@ -1,7 +1,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "web-application.name" -}}
+{{- define "web-application.internal.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
@@ -10,7 +10,7 @@ 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 "web-application.fullname" -}}
+{{- define "web-application.internal.fullname" -}}
   {{- if .Values.fullnameOverride }}
     {{- if gt (len .Values.fullnameOverride) 63 }}
       {{- fail (printf "name exceeds 63 characters: '%s'" .Values.fullnameOverride) }}
@@ -30,25 +30,25 @@ If release name contains chart name it will be used as a full name.
 
 {{/*
 */}}
-{{- define "web-application.bindingName" -}}
-{{- printf "%s-%s" (include "web-application.fullname" .root ) .name }}
+{{- define "web-application.internal.bindingName" -}}
+{{- printf "%s-%s" (include "web-application.internal.fullname" .root ) .name }}
 {{- end }}
 
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "web-application.chart" -}}
+{{- define "web-application.internal.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
 Common labels
 */}}
-{{- define "web-application.labels" -}}
+{{- define "web-application.internal.labels" -}}
 helm.sh/revision: {{ .Release.Revision | quote }}
-helm.sh/chart: {{ include "web-application.chart" . }}
+helm.sh/chart: {{ include "web-application.internal.chart" . }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{ include "web-application.selectorLabels" . }}
+{{ include "web-application.internal.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
@@ -57,8 +57,8 @@ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{/*
 Selector labels
 */}}
-{{- define "web-application.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "web-application.name" . }}
+{{- define "web-application.internal.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "web-application.internal.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- if .Values.global}}
 {{- if .Values.global.component }}
@@ -73,11 +73,11 @@ app.kubernetes.io/partOf: {{ .Values.global.partOf }}
 {{/*
 Define Host for the APIRule
 */}}
-{{- define "web-application.exposeHost" -}}
+{{- define "web-application.internal.exposeHost" -}}
 {{- if .Values.expose.host }}
 {{- tpl .Values.expose.host . }}
 {{- else }}
-{{- $name := (include "web-application.fullname" .) }}
+{{- $name := (include "web-application.internal.fullname" .) }}
 {{- if hasPrefix $name .Release.Namespace }}
 {{- .Release.Namespace }}
 {{- else }}
@@ -89,14 +89,14 @@ Define Host for the APIRule
 {{/*
 Define the application uri which will be used for the VCAP_APPLICATION env variable
 */}}
-{{- define "web-application.applicationUri" -}}
-{{- include "web-application.fullname" . }}
+{{- define "web-application.internal.applicationUri" -}}
+{{- include "web-application.internal.fullname" . }}
 {{- end }}
 
 {{/*
 Service Binding secret mounts
 */}}
-{{- define "web-application.serviceMounts" -}}
+{{- define "web-application.internal.serviceMounts" -}}
 {{- $bindings := omit .Values.bindings "defaultProperties" -}}
 {{- range $name, $params := $bindings }}
 - mountPath: /bindings/{{ $name }}/
@@ -108,10 +108,10 @@ Service Binding secret mounts
 {{/*
 Service Binding secret volumes
 */}}
-{{- define "web-application.serviceVolumes" -}}
+{{- define "web-application.internal.serviceVolumes" -}}
 {{- $bindings := omit .Values.bindings "defaultProperties" -}}
 {{- range $name, $params := $bindings }}
-{{- $secretName := (include "web-application.bindingName" (dict "root" $ "name" $name)) }}
+{{- $secretName := (include "web-application.internal.bindingName" (dict "root" $ "name" $name)) }}
 {{- if $params.fromSecret }}
 {{- $secretName = $params.fromSecret}}
 {{- else if $params.secretName }}
@@ -126,21 +126,21 @@ Service Binding secret volumes
 {{/*
 Name of the imagePullSecret
 */}}
-{{- define "web-application.imagePullSecretName" -}}
+{{- define "web-application.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 "web-application.fullname" . }}
+{{- include "web-application.internal.fullname" . }}
 {{- end }}
 {{- end }}
 
 {{/*
 Calculate the final image name
 */}}
-{{- define "web-application.imageName" -}}
+{{- define "web-application.internal.imageName" -}}
 {{- $tag := .Values.image.tag | default .Values.global.image.tag | default "latest" }}
 {{- $registry := .Values.image.registry | default .Values.global.image.registry }}
 {{- if $registry }}
@@ -155,7 +155,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 "web-application.serviceInstanceName" -}}
+{{- define "web-application.internal.serviceInstanceName" -}}
   {{- $name := "" }}
   {{- if .binding.serviceInstanceFullname }}
     {{- if gt (len .binding.serviceInstanceFullname) 63 }}
@@ -174,7 +174,7 @@ If release name contains chart name it will be used as service instance name.
   {{- tpl $name .root }}
 {{- end }}
 
-{{- define "web-application.processEnv" -}}
+{{- define "web-application.internal.processEnv" -}}
 {{- $result := dict }}
 {{- $variables := list }}
 {{- range $k, $v := .Values.env }}
@@ -219,7 +219,7 @@ If release name contains chart name it will be used as service instance name.
  {{- (fromYaml (tpl (toYaml $result) $)) | mustToJson }}
 {{- end }}
 
-{{- define "web-application.processEnvFrom" -}}
+{{- define "web-application.internal.processEnvFrom" -}}
 {{- $result := dict }}
 {{- $variables := list }}
 {{- range $envFrom := .Values.envFrom }}

package/lib/init/template/helm/subcharts/web-application/templates/api-rule.yaml

@@ -2,13 +2,13 @@
 apiVersion: gateway.kyma-project.io/v1beta1
 kind: APIRule
 metadata:
-  name: {{ include "web-application.fullname" . }}
-  labels: {{- include "web-application.labels" . | nindent 4 }}
+  name: {{ include "web-application.internal.fullname" . }}
+  labels: {{- include "web-application.internal.labels" . | nindent 4 }}
 spec:
   gateway: {{ .Values.expose.gateway }}
-  host: {{ include "web-application.exposeHost" . }}
+  host: {{ include "web-application.internal.exposeHost" . }}
   service:
-    name: {{ include "web-application.fullname" . }}
+    name: {{ include "web-application.internal.fullname" . }}
     port: {{ .Values.port }}
   rules:
     {{- toYaml .Values.expose.rules | nindent 6 }}

package/lib/init/template/helm/subcharts/web-application/templates/deployment.yaml

@@ -1,33 +1,33 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  labels: {{- include "web-application.labels" . | nindent 4 }}
-  name: {{ include "web-application.fullname" . }}
+  labels: {{- include "web-application.internal.labels" . | nindent 4 }}
+  name: {{ include "web-application.internal.fullname" . }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
-    matchLabels: {{- include "web-application.selectorLabels" . | nindent 6 }}
+    matchLabels: {{- include "web-application.internal.selectorLabels" . | nindent 6 }}
   template:
     metadata:
-      labels: {{- include "web-application.selectorLabels" . | nindent 8 }}
+      labels: {{- include "web-application.internal.selectorLabels" . | nindent 8 }}
       annotations:
-        container.apparmor.security.beta.kubernetes.io/{{ include "web-application.name" . }}: runtime/default
+        container.apparmor.security.beta.kubernetes.io/{{ include "web-application.internal.name" . }}: runtime/default
     spec:
-      {{- if (include "web-application.imagePullSecretName" .) }}
+      {{- if (include "web-application.internal.imagePullSecretName" .) }}
       imagePullSecrets:
-        - name: {{ include "web-application.imagePullSecretName" . }}
+        - name: {{ include "web-application.internal.imagePullSecretName" . }}
       {{- end }}
       automountServiceAccountToken: false
-      serviceAccountName: {{ tpl (.Values.serviceAccountName | default (include "web-application.fullname" .)) $ }}
+      serviceAccountName: {{ tpl (.Values.serviceAccountName | default (include "web-application.internal.fullname" .)) $ }}
       containers:
-      - image: {{ include "web-application.imageName" . }}
-        name: {{ include "web-application.name" . }}
+      - image: {{ include "web-application.internal.imageName" . }}
+        name: {{ include "web-application.internal.name" . }}
         ports:
         - name: http
           containerPort: {{ .Values.port }}
           protocol: TCP
         envFrom:
-        {{- $envFromVars := (include "web-application.processEnvFrom" . | fromJson) }}
+        {{- $envFromVars := (include "web-application.internal.processEnvFrom" . | fromJson) }}
         {{- if not (eq (len $envFromVars.vars) 0) }}
         {{- $envFromVars.vars | toYaml | nindent 8}}
         {{- end }}
@@ -38,17 +38,17 @@ spec:
           value: {{ .Values.port | quote }}
         - name: TMPDIR
           value: /tmp
-        {{- $envVars := (include "web-application.processEnv" $ | fromJson) }}
+        {{- $envVars := (include "web-application.internal.processEnv" $ | fromJson) }}
         {{- if not (eq (len $envVars.vars) 0) }}
         {{- $envVars.vars | toYaml | nindent 8}}
         {{- end }}
         {{- if not $envVars.appName}}
         - name: APPLICATION_NAME
-          value: {{ include "web-application.fullname" . }}
+          value: {{ include "web-application.internal.fullname" . }}
         {{- end }}
         {{- if not $envVars.appURI}}
         - name: APPLICATION_URI
-          value: {{ include "web-application.applicationUri" . }}
+          value: {{ include "web-application.internal.applicationUri" . }}
         {{- end }}
         livenessProbe:
         {{- if .Values.health.liveness.path }}
@@ -88,7 +88,7 @@ spec:
         - name: {{ $volume.name | quote }}
           {{- toYaml $volume.volumeMount  | nindent 10 }}
         {{- end }}
-        {{- include "web-application.serviceMounts" . | nindent 8 }}
+        {{- include "web-application.internal.serviceMounts" . | nindent 8 }}
         resources:
           {{- toYaml .Values.resources | nindent 10 }}
         securityContext:
@@ -107,7 +107,7 @@ spec:
       topologySpreadConstraints:
       {{- range $constraint := .Values.availability.topologySpreadConstraints }}
       - labelSelector:
-          matchLabels: {{- include "web-application.selectorLabels" $ | nindent 12 }}
+          matchLabels: {{- include "web-application.internal.selectorLabels" $ | nindent 12 }}
         maxSkew: {{ $constraint.maxSkew }}
         topologyKey: {{ $constraint.topologyKey }}
         whenUnsatisfiable: {{ $constraint.whenUnsatisfiable }}
@@ -117,7 +117,7 @@ spec:
         name: tmp
       - emptyDir: {}
         name: bindings-root
-      {{- include "web-application.serviceVolumes" . | nindent 6 }}
+      {{- include "web-application.internal.serviceVolumes" . | nindent 6 }}
       {{- range $volume := .Values.additionalVolumes }}
       -
         {{- tpl (omit $volume "volumeMount" | toYaml) $ | nindent 8 }}

package/lib/init/template/helm/subcharts/web-application/templates/network-policy.yaml

@@ -2,8 +2,8 @@
 kind: NetworkPolicy
 apiVersion: networking.k8s.io/v1
 metadata:
-  name: {{ include "web-application.fullname" . }}
-  labels: {{- include "web-application.labels" . | nindent 4 }}
+  name: {{ include "web-application.internal.fullname" . }}
+  labels: {{- include "web-application.internal.labels" . | nindent 4 }}
 spec:
   ingress:
 {{- if .Values.expose.enabled }}
@@ -14,10 +14,24 @@ spec:
       namespaceSelector:
         matchLabels:
           kubernetes.io/metadata.name: istio-system
+    ports:
+      - protocol: TCP
+        port: {{ .Values.port }}
+      {{- range $port := .Values.networkSecurity.additionalPorts }}
+      - protocol: TCP
+        port: {{ $port }}
+      {{- end }}
 {{- end }}
 {{- if .Values.networkSecurity.allowNamespaceInternal }}
   - from:
     - podSelector: {}
+    ports:
+      - protocol: TCP
+        port: {{ .Values.port }}
+      {{- range $port := .Values.networkSecurity.additionalPorts }}
+      - protocol: TCP
+        port: {{ $port }}
+      {{- end }}
 {{- end }}
 {{- range $netRule := .Values.networkSecurity.ingress }}
   - from:
@@ -33,9 +47,16 @@ spec:
     {{- else }}
       podSelector: {}
     {{- end }}
+    ports:
+      - protocol: TCP
+        port: {{ $.Values.port }}
+      {{- range $port := $.Values.networkSecurity.additionalPorts }}
+      - protocol: TCP
+        port: {{ $port }}
+      {{- end }}
 {{- end }}
   policyTypes:
   - Ingress
   podSelector:
-    matchLabels: {{- include "web-application.selectorLabels" . | nindent 6 }}
+    matchLabels: {{- include "web-application.internal.selectorLabels" . | nindent 6 }}
 {{- end }}

package/lib/init/template/helm/subcharts/web-application/templates/pod-disruption-budget.yaml

@@ -1,9 +1,9 @@
 apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
-  name: {{ include "web-application.fullname" . }}
-  labels: {{- include "web-application.labels" . | nindent 4 }}
+  name: {{ include "web-application.internal.fullname" . }}
+  labels: {{- include "web-application.internal.labels" . | nindent 4 }}
 spec:
   maxUnavailable: {{ .Values.availability.podDisruptionBudget.maxUnavailable }}
   selector:
-    matchLabels: {{- include "web-application.selectorLabels" . | nindent 6 }}
+    matchLabels: {{- include "web-application.internal.selectorLabels" . | nindent 6 }}

package/lib/init/template/helm/subcharts/web-application/templates/secret.yaml

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

package/lib/init/template/helm/subcharts/web-application/templates/service-account.yaml

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

package/lib/init/template/helm/subcharts/web-application/templates/service-binding.yaml

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

package/lib/init/template/helm/subcharts/web-application/templates/service.yaml

@@ -1,11 +1,11 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "web-application.fullname" . }}
-  labels: {{- include "web-application.labels" . | nindent 4 }}
+  name: {{ include "web-application.internal.fullname" . }}
+  labels: {{- include "web-application.internal.labels" . | nindent 4 }}
 spec:
   ports:
     - port: {{ .Values.port }}
       targetPort: {{ .Values.port }}
       protocol: TCP
-  selector: {{- include "web-application.selectorLabels" . | nindent 4 }}
+  selector: {{- include "web-application.internal.selectorLabels" . | nindent 4 }}