@sap/cds-dk 6.3.2 → 6.4.1

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

@@ -1,24 +1,27 @@
-const path = require('path');
-const { exists, read, copy, rimraf } = require('../../../cds').utils;
+const { join } = require('path');
+const { exists, read, rimraf } = require('../../../cds').utils;
 const ProjectReader = require('../../util/projectReader');
 const { mergeYAML } = require('../../util/merge')
+const { parseMd5File, writeMd5File, copyAndTrack } = require('../../util/md5Tracking')
 //const { yaml } = require('@sap/cds-foss')
 
 module.exports = class HelmTemplate extends require('../templateBase') {
     constructor(projectPath, generator) {
         super(projectPath, generator, __dirname);
         this.projectReader = new ProjectReader(projectPath);
+        this.oldTrackingData = undefined;
+        this.newTrackingData = {};
     }
 
     static hasFacet(_, projectPath, 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
-        return exists(path.join(projectPath, 'chart', 'values.yaml'))
+        return exists(join(projectPath, 'chart', 'values.yaml'))
     }
 
     async canRun() {
         if (this.options.force) {
-            await rimraf(path.join(this.projectPath, 'chart'))
+            await rimraf(join(this.projectPath, 'chart'))
             return true;
         }
         return true;
@@ -26,42 +29,41 @@ module.exports = class HelmTemplate extends require('../templateBase') {
 
     async run() {
         const projectDescriptor = await this.projectReader.read(this.options)
+        this.oldTrackingData = await parseMd5File(join(this.projectPath, 'chart', '.cds-add-helm-files.md5'));
 
-        await copy(
-            path.join(__dirname, 'subchart'),
-            path.join(this.projectPath, 'chart', 'charts', 'web-application'),
+        await copyAndTrack(
+            join(__dirname, 'subchart'),
+            join(this.projectPath, 'chart', 'charts', 'web-application'),
+            this
         )
-        await copy(
-            path.join(__dirname, 'chart'),
-            path.join(this.projectPath, 'chart')
+        await copyAndTrack(
+            join(__dirname, 'chart'),
+            join(this.projectPath, 'chart'),
+            this
         )
 
-        const webApplicationChartPath = process.env.WEB_APPLICATION_CHART ?? path.join(__dirname, 'subchart')
-        const chartFilePath = path.join(webApplicationChartPath, 'Chart.yaml')
-        const chartFile = await read(chartFilePath)
-        //const { version } = yaml.parse(chartFile)
-
         await mergeYAML(
-            path.join(this.projectPath, 'chart', 'Chart.yaml'),
-            path.join(__dirname, 'files', 'Chart.yaml.hbs'),
-            projectDescriptor, { forceOverwrite: true }
+            join(this.projectPath, 'chart', 'Chart.yaml'),
+            join(__dirname, 'files', 'Chart.yaml.hbs'),
+            projectDescriptor
         )
 
         await mergeYAML(
-            path.join(this.projectPath, 'chart', 'values.yaml'),
-            path.join(__dirname, 'files', 'values.yaml.hbs'),
-            projectDescriptor, { forceOverwrite: true }
+            join(this.projectPath, 'chart', 'values.yaml'),
+            join(__dirname, 'files', 'values.yaml.hbs'),
+            projectDescriptor
         )
         await this.runDependentMerging();
+        await writeMd5File(join(this.projectPath, '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']
+        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.projectPath, this.generator)
-            if (Template.hasFacet(await this.getEnv(), this.projectPath, this.options)) await template.runDependentMerging()
+            if (Template.hasFacet(await this.getEnv(), this.projectPath, this.options)) await template.runDependentMerging(this)
         }
     }
 };

package/lib/init/template/helm/subchart/templates/_helpers.tpl

@@ -202,4 +202,33 @@ If release name contains chart name it will be used as service insatnce name.
 {{- end }}
 {{- $_ := set $result "vars" $variables }}
 {{- $result | mustToJson }}
+{{- end }}
+
+{{- define "web-application.processEnvFrom" -}}
+{{- $ := . -}}
+{{- $result := dict }}
+{{- $variables := list }}
+{{- range $secretName := .Values.envSecretNames }}
+  {{- $variable := dict }}
+  {{- $_ := set $variable "name" $secretName -}}
+  {{- $variables = append $variables (dict "secretRef" $variable)}}
+{{- end }}
+{{- range $envFrom := .Values.envFrom }}
+  {{- if hasKey $envFrom "configMapRef" }}
+    {{- if and (hasKey $envFrom.configMapRef "tpl") ($envFrom.configMapRef.tpl) }}
+    {{- $name := (tpl $envFrom.configMapRef.name $) }}
+    {{- $_ := set $envFrom.configMapRef "name" $name }}
+    {{- end }}
+    {{- $_ := unset $envFrom.configMapRef "tpl" }}
+  {{- else }}
+    {{- if and (hasKey $envFrom.secretRef "tpl") ($envFrom.secretRef.tpl) }}
+    {{- $name := (tpl $envFrom.secretRef.name $) }}
+    {{- $_ := set $envFrom.secretRef "name" $name }}
+    {{- end }}
+    {{- $_ := unset $envFrom.secretRef "tpl" }}
+  {{- end }}
+  {{- $variables = append $variables $envFrom }}
+{{- end }}
+{{- $_ := set $result "vars" $variables }}
+{{- $result | mustToJson }}
 {{- end }}

package/lib/init/template/helm/subchart/templates/api-rule.yaml

@@ -1,11 +1,15 @@
 {{ if .Values.expose.enabled}}
-apiVersion: gateway.kyma-project.io/v1alpha1
+apiVersion: gateway.kyma-project.io/v1beta1
 kind: APIRule
 metadata:
   name: {{ include "web-application.fullname" . }}
   labels: {{- include "web-application.labels" . | nindent 4 }}
 spec:
   gateway: kyma-gateway.kyma-system.svc.cluster.local
+  host: {{ include "web-application.exposeHost" . }}
+  service:
+    name: {{ include "web-application.fullname" . }}
+    port: {{ .Values.port }}
   rules:
   - accessStrategies:
     - handler: allow
@@ -17,8 +21,4 @@ spec:
     - DELETE
     - HEAD
     path: /.*
-  service:
-    host: {{ include "web-application.exposeHost" . }}
-    name: {{ include "web-application.fullname" . }}
-    port: {{ .Values.port }}
 {{ end }}

package/lib/init/template/helm/subchart/templates/deployment.yaml

@@ -25,9 +25,9 @@ spec:
           containerPort: {{ .Values.port }}
           protocol: TCP
         envFrom:
-        {{- range $secretName := .Values.envSecretNames }}
-        - secretRef:
-            name: {{ $secretName }}
+        {{- $envFromVars := (include "web-application.processEnvFrom" . | fromJson) }}
+        {{- if not (eq (len $envFromVars.vars) 0) }}
+        {{- $envFromVars.vars | toYaml | nindent 8}}
         {{- end }}
         env:
         {{- if .Values.bindings }}
@@ -50,28 +50,29 @@ spec:
         - name: APPLICATION_URI
           value: {{ include "web-application.applicationUri" . }}
         {{- end }}
+        {{- $health := .Values.health_check | default .Values.health }}
         livenessProbe:
-        {{- if .Values.health_check.liveness.path }}
+        {{- if $health.liveness.path }}
           httpGet:
-            path: {{ .Values.health_check.liveness.path }}
+            path: {{ $health.liveness.path }}
             port: http
         {{- else }}
           tcpSocket:
             port: {{ .Values.port }}
         {{- end }}
         readinessProbe:
-        {{- if .Values.health_check.readiness.path }}
+        {{- if $health.readiness.path }}
           httpGet:
-            path: {{ .Values.health_check.readiness.path }}
+            path: {{ $health.readiness.path }}
             port: http
         {{- else }}
           tcpSocket:
             port: {{ .Values.port }}
         {{- end }}
         startupProbe:
-        {{- if .Values.health_check.liveness.path }}
+        {{- if $health.liveness.path }}
           httpGet:
-            path: {{ .Values.health_check.liveness.path }}
+            path: {{ $health.liveness.path }}
             port: http
         {{- else }}
           tcpSocket:
@@ -96,6 +97,8 @@ spec:
             - ALL
           privileged: false
           readOnlyRootFilesystem: false
+          seccompProfile:
+            type: RuntimeDefault
       restartPolicy: Always
       securityContext:
         runAsNonRoot: true