@sap/cds-dk 6.0.4 → 6.1.3

package/lib/k8s/connectivity/index.js

@@ -50,12 +50,12 @@ module.exports = wrapFeature('connectivity', {
             }
         );
 
-        mergeSemantics.existences.push({
+        mergeSemantics.additions.push({
             ref: `{name}-additional-volumes`,
-            keyPath: [name, "additionalVolumes"],
-            constraints: [{
-                comparisonKeyPath: ["name"],
-                value: "connectivity-secret"
+            in: `${name}.additionalVolumes`,
+            where: [{
+                property: 'name',
+                isEqualTo: 'connectivity-secret'
             }]
         });
     },

package/lib/k8s/deployment/index.js

@@ -19,7 +19,7 @@ class Deployment {
 
         const language = this.language || model.language;
         const memory = language === 'Java' ? '1G' : '500M';
-        const cpu = language === 'Java' ? '700m' : '100m';
+        const cpu = language === 'Java' ? '1000m' : '500m';
         const env = language === 'Java' ? {SPRING_PROFILES_ACTIVE: "cloud"} : undefined;
 
         return {
@@ -32,12 +32,11 @@ class Deployment {
                 env,
                 resources: {
                     limits: {
-                        cpu,
                         'ephemeral-storage': '1G',
                         memory
                     },
                     requests: {
-                        cpu: '100m',
+                        cpu,
                         'ephemeral-storage': '1G',
                         memory
                     }
@@ -64,7 +63,6 @@ class Deployment {
 
     async addToChart(builder) {
         await builder.addSubchartFiles(webApplicationChartPath, 'web-application');
-        await builder.addChartFile(Path.join(__dirname, 'subchart-override', 'templates', '_web_application_helpers.tpl'), {fileName: Path.join('charts', 'web-application', 'templates', '_web_application_helpers.tpl')});
     }
 }
 

package/lib/k8s/deployment/subchart/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: web-application
 description: A Helm chart for web app
-
+kubeVersion: ">= 1.21"
 type: application
 version: 0.1.0

package/lib/k8s/deployment/subchart/templates/_helpers.tpl

@@ -81,13 +81,20 @@ Define Host for the APIRule
 {{- end }}
 {{- end }}
 
+{{/*
+Define the application uri which will be used for the VCAP_APPLICATION env variable
+*/}}
+{{- define "web-application.applicationUri" -}}
+{{- include "web-application.fullname" . }}
+{{- end }}
+
 {{/*
 Service Binding secret mounts
 */}}
 {{- define "web-application.serviceMounts" -}}
 {{- range $name, $params := .Values.bindings }}
 - mountPath: /bindings/{{ $name }}/
-  name: "{{ $name }}-binding"
+  name: "{{ $name }}"
   readOnly: true
 {{- end }}
 {{- end }}
@@ -103,18 +110,9 @@ Service Binding secret volumes
 {{- else if $params.secretName }}
 {{- $secretName = $params.secretName }}
 {{- end }}
-- name: {{ $name }}-binding
+- name: {{ $name }}
   secret:
     secretName: {{ $secretName }}
-    items:
-    - key: label
-      path: metadata/label
-    - key: plan
-      path: metadata/plan
-    - key: tags
-      path: metadata/tags
-    - key: credentials
-      path: credentials
 {{- end }}
 {{- end }}
 
@@ -132,6 +130,19 @@ Name of the imagePullSecret
 {{- end }}
 {{- end }}
 
+{{/*
+Calculate the final image name
+*/}}
+{{- define "web-application.imageName" -}}
+{{- $tag := .Values.image.tag | default .Values.global.image.tag | default "latest" }}
+{{- $registry := .Values.image.registry | default .Values.global.image.registry }}
+{{- if $registry }}
+{{- $registry | trimSuffix "/" }}/{{ .Values.image.repository }}:{{ $tag }}
+{{- else }}
+{{- .Values.image.repository }}:{{ $tag }}
+{{- end }}
+{{- end }}
+
 {{/*
 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).

package/lib/k8s/deployment/subchart/templates/deployment.yaml

@@ -18,7 +18,7 @@ spec:
       automountServiceAccountToken: false
       serviceAccountName: {{ .Values.serviceAccountName }}
       containers:
-      - image: "{{ required ".Values.image.repository is required!" .Values.image.repository }}:{{ .Values.image.tag }}"
+      - image: {{ include "web-application.imageName" . }}
         name: {{ include "web-application.name" . }}
         ports:
         - name: http
@@ -30,10 +30,17 @@ spec:
             name: {{ $secretName }}
         {{- end }}
         env:
-        {{- include "cap.web-application.env" . | indent 8 }}
         {{- range $k, $v := .Values.env }}
         - name: {{ $k }}
-          value: {{ tpl ($v | toString) $ | quote }}
+          value: {{ $v | quote }}
+        {{- end }}
+        {{- if not .Values.env.APPLICATION_NAME }}
+        - name: APPLICATION_NAME
+          value: {{ include "web-application.fullname" . }}
+        {{- end }}
+        {{- if not .Values.env.APPLICATION_URI }}
+        - name: APPLICATION_URI
+          value: {{ include "web-application.applicationUri" . }}
         {{- end }}
         {{- if .Values.bindings }}
         - name: SERVICE_BINDING_ROOT
@@ -79,7 +86,7 @@ spec:
         - name: {{ $volume.name | quote }}
           {{- toYaml $volume.volumeMount  | nindent 10 }}
         {{- end }}
-        {{- include "cap.web-application.serviceMounts" . | nindent 8 }}
+        {{- include "web-application.serviceMounts" . | nindent 8 }}
         resources:
           {{- toYaml .Values.resources | nindent 10 }}
         securityContext:
@@ -103,7 +110,7 @@ spec:
       volumes:
       - emptyDir: {}
         name: tmp
-      {{- include "cap.web-application.serviceVolumes" . | nindent 6 }}
+      {{- include "web-application.serviceVolumes" . | nindent 6 }}
       {{- range $volume := .Values.additionalVolumes }}
       -
         {{- omit $volume "volumeMount" | toYaml  | nindent 8 }}

package/lib/k8s/deployment/subchart/templates/network-policy.yaml

@@ -9,7 +9,9 @@ spec:
     - podSelector:
         matchLabels:
           app: istio-ingressgateway
-      namespaceSelector: {}
+      namespaceSelector:
+        matchLabels:
+          name: istio-system
   podSelector:
     matchLabels: {{- include "web-application.selectorLabels" . | nindent 6 }}
   policyTypes:

package/lib/k8s/deployment/subchart/templates/pod-disruption-budget.yaml

@@ -1,5 +1,5 @@
 {{- if .Values.ha.enabled }}
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: {{ include "web-application.fullname" . }}