From 8637d8ac29c64a6616bb6eef4f41e16573a2bd28 Mon Sep 17 00:00:00 2001 From: i325261 Date: Fri, 24 Apr 2026 15:47:21 +0200 Subject: [PATCH 1/7] [Misc] Add enableCleanupMonitoring configuration support and update related templates --- files/chart/values.schema.json | 3 +++ files/configurableTemplatesChart/values.schema.json | 3 +++ hack/schema-generation.go | 1 + lib/util.js | 12 +++++++++++- .../templates/cap-operator-cros-ias.yaml | 3 +++ .../templates/cap-operator-cros-svc-ias.yaml | 3 +++ .../templates/cap-operator-cros-svc.yaml | 4 ++++ .../expectedChart/templates/cap-operator-cros.yaml | 4 ++++ .../templates/cap-operator-cros-ias.yaml | 3 +++ .../templates/cap-operator-cros-modified-svc.yaml | 4 ++++ .../templates/cap-operator-cros-modified.yaml | 4 ++++ .../templates/cap-operator-cros-mta.yaml | 4 ++++ .../templates/cap-operator-cros-svc-ias.yaml | 3 +++ .../templates/cap-operator-cros-svc.yaml | 4 ++++ .../templates/cap-operator-cros.yaml | 4 ++++ 15 files changed, 58 insertions(+), 1 deletion(-) diff --git a/files/chart/values.schema.json b/files/chart/values.schema.json index 2116939..11d84b1 100644 --- a/files/chart/values.schema.json +++ b/files/chart/values.schema.json @@ -3207,6 +3207,9 @@ }, "version": { "type": "string" + }, + "enableCleanupMonitoring": { + "type": "boolean" } }, "required": [ diff --git a/files/configurableTemplatesChart/values.schema.json b/files/configurableTemplatesChart/values.schema.json index fe96a34..7bc905b 100644 --- a/files/configurableTemplatesChart/values.schema.json +++ b/files/configurableTemplatesChart/values.schema.json @@ -130,6 +130,9 @@ }, "version": { "type": "string" + }, + "enableCleanupMonitoring": { + "type": "boolean" } }, "required": [ diff --git a/hack/schema-generation.go b/hack/schema-generation.go index 53a426b..20781fc 100644 --- a/hack/schema-generation.go +++ b/hack/schema-generation.go @@ -31,6 +31,7 @@ type app struct { Domains Domains `json:"domains"` IstioIngressGatewayLabels map[string]string `json:"istioIngressGatewayLabels"` Version string `json:"version,omitempty"` + EnableCleanupMonitoring bool `json:"enableCleanupMonitoring,omitempty"` } type serviceInstanceExt struct { diff --git a/lib/util.js b/lib/util.js index 03aaaef..e615713 100644 --- a/lib/util.js +++ b/lib/util.js @@ -251,9 +251,19 @@ function writeCAPApplicationCRO(yaml, hasIas, isService) { 'sme.sap.com/vs-route-request-header-set: |', ' {', ' "x-forwarded-client-cert": "%DOWNSTREAM_PEER_CERT%"', - ' }' + ' }', + '{{- if .Values.app.enableCleanupMonitoring }}', + 'sme.sap.com/enable-cleanup-monitoring: "true"', + '{{- end }}' ]) }) + } else { + yaml.push([ + '{{- if .Values.app.enableCleanupMonitoring }}', + 'annotations:', + ' sme.sap.com/enable-cleanup-monitoring: "true"', + '{{- end }}' + ]) } }) diff --git a/test/files/expectedChart/templates/cap-operator-cros-ias.yaml b/test/files/expectedChart/templates/cap-operator-cros-ias.yaml index 8e8c8a6..f064ca9 100644 --- a/test/files/expectedChart/templates/cap-operator-cros-ias.yaml +++ b/test/files/expectedChart/templates/cap-operator-cros-ias.yaml @@ -8,6 +8,9 @@ metadata: { "x-forwarded-client-cert": "%DOWNSTREAM_PEER_CERT%" } + {{- if .Values.app.enableCleanupMonitoring }} + sme.sap.com/enable-cleanup-monitoring: "true" + {{- end }} spec: domainRefs: - kind: Domain diff --git a/test/files/expectedChart/templates/cap-operator-cros-svc-ias.yaml b/test/files/expectedChart/templates/cap-operator-cros-svc-ias.yaml index 077fb42..47ea27e 100644 --- a/test/files/expectedChart/templates/cap-operator-cros-svc-ias.yaml +++ b/test/files/expectedChart/templates/cap-operator-cros-svc-ias.yaml @@ -8,6 +8,9 @@ metadata: { "x-forwarded-client-cert": "%DOWNSTREAM_PEER_CERT%" } + {{- if .Values.app.enableCleanupMonitoring }} + sme.sap.com/enable-cleanup-monitoring: "true" + {{- end }} spec: domainRefs: - kind: Domain diff --git a/test/files/expectedChart/templates/cap-operator-cros-svc.yaml b/test/files/expectedChart/templates/cap-operator-cros-svc.yaml index 4126d6c..af9a8f5 100644 --- a/test/files/expectedChart/templates/cap-operator-cros-svc.yaml +++ b/test/files/expectedChart/templates/cap-operator-cros-svc.yaml @@ -3,6 +3,10 @@ apiVersion: sme.sap.com/v1alpha1 kind: CAPApplication metadata: name: {{ include "appName" $ }} + {{- if .Values.app.enableCleanupMonitoring }} + annotations: + sme.sap.com/enable-cleanup-monitoring: "true" + {{- end }} spec: domainRefs: - kind: Domain diff --git a/test/files/expectedChart/templates/cap-operator-cros.yaml b/test/files/expectedChart/templates/cap-operator-cros.yaml index ec7fe5a..ed9a2ac 100644 --- a/test/files/expectedChart/templates/cap-operator-cros.yaml +++ b/test/files/expectedChart/templates/cap-operator-cros.yaml @@ -3,6 +3,10 @@ apiVersion: sme.sap.com/v1alpha1 kind: CAPApplication metadata: name: {{ include "appName" $ }} + {{- if .Values.app.enableCleanupMonitoring }} + annotations: + sme.sap.com/enable-cleanup-monitoring: "true" + {{- end }} spec: domainRefs: - kind: Domain diff --git a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-ias.yaml b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-ias.yaml index 6596396..41d4564 100644 --- a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-ias.yaml +++ b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-ias.yaml @@ -8,6 +8,9 @@ metadata: { "x-forwarded-client-cert": "%DOWNSTREAM_PEER_CERT%" } + {{- if .Values.app.enableCleanupMonitoring }} + sme.sap.com/enable-cleanup-monitoring: "true" + {{- end }} spec: domainRefs: - kind: Domain diff --git a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-modified-svc.yaml b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-modified-svc.yaml index f2a3d18..5bd6f7a 100644 --- a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-modified-svc.yaml +++ b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-modified-svc.yaml @@ -3,6 +3,10 @@ apiVersion: sme.sap.com/v1alpha1 kind: CAPApplication metadata: name: {{ include "appName" $ }} + {{- if .Values.app.enableCleanupMonitoring }} + annotations: + sme.sap.com/enable-cleanup-monitoring: "true" + {{- end }} spec: domainRefs: - kind: Domain diff --git a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-modified.yaml b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-modified.yaml index f0f129b..f4371f0 100644 --- a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-modified.yaml +++ b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-modified.yaml @@ -3,6 +3,10 @@ apiVersion: sme.sap.com/v1alpha1 kind: CAPApplication metadata: name: {{ include "appName" $ }} + {{- if .Values.app.enableCleanupMonitoring }} + annotations: + sme.sap.com/enable-cleanup-monitoring: "true" + {{- end }} spec: domainRefs: - kind: Domain diff --git a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-mta.yaml b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-mta.yaml index d9134ed..8bf146b 100644 --- a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-mta.yaml +++ b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-mta.yaml @@ -3,6 +3,10 @@ apiVersion: sme.sap.com/v1alpha1 kind: CAPApplication metadata: name: {{ include "appName" $ }} + {{- if .Values.app.enableCleanupMonitoring }} + annotations: + sme.sap.com/enable-cleanup-monitoring: "true" + {{- end }} spec: domainRefs: - kind: Domain diff --git a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-svc-ias.yaml b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-svc-ias.yaml index 9ea09a1..846defc 100644 --- a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-svc-ias.yaml +++ b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-svc-ias.yaml @@ -8,6 +8,9 @@ metadata: { "x-forwarded-client-cert": "%DOWNSTREAM_PEER_CERT%" } + {{- if .Values.app.enableCleanupMonitoring }} + sme.sap.com/enable-cleanup-monitoring: "true" + {{- end }} spec: domainRefs: - kind: Domain diff --git a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-svc.yaml b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-svc.yaml index 2c054df..e68cdb0 100644 --- a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-svc.yaml +++ b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-svc.yaml @@ -3,6 +3,10 @@ apiVersion: sme.sap.com/v1alpha1 kind: CAPApplication metadata: name: {{ include "appName" $ }} + {{- if .Values.app.enableCleanupMonitoring }} + annotations: + sme.sap.com/enable-cleanup-monitoring: "true" + {{- end }} spec: domainRefs: - kind: Domain diff --git a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros.yaml b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros.yaml index 11f2817..85e1b7b 100644 --- a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros.yaml +++ b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros.yaml @@ -3,6 +3,10 @@ apiVersion: sme.sap.com/v1alpha1 kind: CAPApplication metadata: name: {{ include "appName" $ }} + {{- if .Values.app.enableCleanupMonitoring }} + annotations: + sme.sap.com/enable-cleanup-monitoring: "true" + {{- end }} spec: domainRefs: - kind: Domain From 59b66b2b01a1146efc5acd4d58e79b826c58efb2 Mon Sep 17 00:00:00 2001 From: i325261 Date: Fri, 24 Apr 2026 16:20:02 +0200 Subject: [PATCH 2/7] [Misc] Add enableCleanupMonitoring support in CAPApplication configuration --- files/chart/values.yaml.hbs | 2 ++ files/configurableTemplatesChart/values.yaml.hbs | 2 ++ lib/util.js | 13 ++++--------- .../templates/cap-operator-cros-svc.yaml | 4 +--- .../expectedChart/templates/cap-operator-cros.yaml | 4 +--- test/files/expectedChart/values.yaml | 1 + .../templates/cap-operator-cros-modified-svc.yaml | 4 +--- .../templates/cap-operator-cros-modified.yaml | 4 +--- .../templates/cap-operator-cros-mta.yaml | 4 +--- .../templates/cap-operator-cros-svc.yaml | 4 +--- .../templates/cap-operator-cros.yaml | 4 +--- .../expectedConfigurableTemplatesChart/values.yaml | 1 + 12 files changed, 17 insertions(+), 30 deletions(-) diff --git a/files/chart/values.yaml.hbs b/files/chart/values.yaml.hbs index edee0f5..50ad1c7 100644 --- a/files/chart/values.yaml.hbs +++ b/files/chart/values.yaml.hbs @@ -13,6 +13,8 @@ app: istioIngressGatewayLabels: istio: ingressgateway app: istio-ingressgateway + # -- Enable cleanup monitoring for CAPApplication versions + enableCleanupMonitoring: true btp: # -- BTP Provider sub-account identifier where the application is hosted diff --git a/files/configurableTemplatesChart/values.yaml.hbs b/files/configurableTemplatesChart/values.yaml.hbs index ef40532..075fb2d 100644 --- a/files/configurableTemplatesChart/values.yaml.hbs +++ b/files/configurableTemplatesChart/values.yaml.hbs @@ -13,6 +13,8 @@ app: istioIngressGatewayLabels: istio: ingressgateway app: istio-ingressgateway + # -- Enable cleanup monitoring for CAPApplication versions + enableCleanupMonitoring: true btp: # -- BTP Provider sub-account identifier where the application is hosted diff --git a/lib/util.js b/lib/util.js index e615713..294b22d 100644 --- a/lib/util.js +++ b/lib/util.js @@ -252,18 +252,13 @@ function writeCAPApplicationCRO(yaml, hasIas, isService) { ' {', ' "x-forwarded-client-cert": "%DOWNSTREAM_PEER_CERT%"', ' }', - '{{- if .Values.app.enableCleanupMonitoring }}', - 'sme.sap.com/enable-cleanup-monitoring: "true"', - '{{- end }}' + 'sme.sap.com/enable-cleanup-monitoring: "{{ .Values.app.enableCleanupMonitoring }}"' ]) }) } else { - yaml.push([ - '{{- if .Values.app.enableCleanupMonitoring }}', - 'annotations:', - ' sme.sap.com/enable-cleanup-monitoring: "true"', - '{{- end }}' - ]) + yaml.block(['annotations:'], () => { + yaml.push('sme.sap.com/enable-cleanup-monitoring: "{{ .Values.app.enableCleanupMonitoring }}"') + }) } }) diff --git a/test/files/expectedChart/templates/cap-operator-cros-svc.yaml b/test/files/expectedChart/templates/cap-operator-cros-svc.yaml index af9a8f5..84f73e6 100644 --- a/test/files/expectedChart/templates/cap-operator-cros-svc.yaml +++ b/test/files/expectedChart/templates/cap-operator-cros-svc.yaml @@ -3,10 +3,8 @@ apiVersion: sme.sap.com/v1alpha1 kind: CAPApplication metadata: name: {{ include "appName" $ }} - {{- if .Values.app.enableCleanupMonitoring }} annotations: - sme.sap.com/enable-cleanup-monitoring: "true" - {{- end }} + sme.sap.com/enable-cleanup-monitoring: "{{ .Values.app.enableCleanupMonitoring }}" spec: domainRefs: - kind: Domain diff --git a/test/files/expectedChart/templates/cap-operator-cros.yaml b/test/files/expectedChart/templates/cap-operator-cros.yaml index ed9a2ac..5e6cb2b 100644 --- a/test/files/expectedChart/templates/cap-operator-cros.yaml +++ b/test/files/expectedChart/templates/cap-operator-cros.yaml @@ -3,10 +3,8 @@ apiVersion: sme.sap.com/v1alpha1 kind: CAPApplication metadata: name: {{ include "appName" $ }} - {{- if .Values.app.enableCleanupMonitoring }} annotations: - sme.sap.com/enable-cleanup-monitoring: "true" - {{- end }} + sme.sap.com/enable-cleanup-monitoring: "{{ .Values.app.enableCleanupMonitoring }}" spec: domainRefs: - kind: Domain diff --git a/test/files/expectedChart/values.yaml b/test/files/expectedChart/values.yaml index 526a9a7..38769dc 100644 --- a/test/files/expectedChart/values.yaml +++ b/test/files/expectedChart/values.yaml @@ -92,6 +92,7 @@ app: istioIngressGatewayLabels: istio: ingressgateway app: istio-ingressgateway + enableCleanupMonitoring: true btp: providerSubaccountId: null provider: diff --git a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-modified-svc.yaml b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-modified-svc.yaml index 5bd6f7a..1bc463f 100644 --- a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-modified-svc.yaml +++ b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-modified-svc.yaml @@ -3,10 +3,8 @@ apiVersion: sme.sap.com/v1alpha1 kind: CAPApplication metadata: name: {{ include "appName" $ }} - {{- if .Values.app.enableCleanupMonitoring }} annotations: - sme.sap.com/enable-cleanup-monitoring: "true" - {{- end }} + sme.sap.com/enable-cleanup-monitoring: "{{ .Values.app.enableCleanupMonitoring }}" spec: domainRefs: - kind: Domain diff --git a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-modified.yaml b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-modified.yaml index f4371f0..56f3972 100644 --- a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-modified.yaml +++ b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-modified.yaml @@ -3,10 +3,8 @@ apiVersion: sme.sap.com/v1alpha1 kind: CAPApplication metadata: name: {{ include "appName" $ }} - {{- if .Values.app.enableCleanupMonitoring }} annotations: - sme.sap.com/enable-cleanup-monitoring: "true" - {{- end }} + sme.sap.com/enable-cleanup-monitoring: "{{ .Values.app.enableCleanupMonitoring }}" spec: domainRefs: - kind: Domain diff --git a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-mta.yaml b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-mta.yaml index 8bf146b..8647427 100644 --- a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-mta.yaml +++ b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-mta.yaml @@ -3,10 +3,8 @@ apiVersion: sme.sap.com/v1alpha1 kind: CAPApplication metadata: name: {{ include "appName" $ }} - {{- if .Values.app.enableCleanupMonitoring }} annotations: - sme.sap.com/enable-cleanup-monitoring: "true" - {{- end }} + sme.sap.com/enable-cleanup-monitoring: "{{ .Values.app.enableCleanupMonitoring }}" spec: domainRefs: - kind: Domain diff --git a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-svc.yaml b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-svc.yaml index e68cdb0..5c6fbca 100644 --- a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-svc.yaml +++ b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-svc.yaml @@ -3,10 +3,8 @@ apiVersion: sme.sap.com/v1alpha1 kind: CAPApplication metadata: name: {{ include "appName" $ }} - {{- if .Values.app.enableCleanupMonitoring }} annotations: - sme.sap.com/enable-cleanup-monitoring: "true" - {{- end }} + sme.sap.com/enable-cleanup-monitoring: "{{ .Values.app.enableCleanupMonitoring }}" spec: domainRefs: - kind: Domain diff --git a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros.yaml b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros.yaml index 85e1b7b..347d6e9 100644 --- a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros.yaml +++ b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros.yaml @@ -3,10 +3,8 @@ apiVersion: sme.sap.com/v1alpha1 kind: CAPApplication metadata: name: {{ include "appName" $ }} - {{- if .Values.app.enableCleanupMonitoring }} annotations: - sme.sap.com/enable-cleanup-monitoring: "true" - {{- end }} + sme.sap.com/enable-cleanup-monitoring: "{{ .Values.app.enableCleanupMonitoring }}" spec: domainRefs: - kind: Domain diff --git a/test/files/expectedConfigurableTemplatesChart/values.yaml b/test/files/expectedConfigurableTemplatesChart/values.yaml index 948dff1..25951d0 100644 --- a/test/files/expectedConfigurableTemplatesChart/values.yaml +++ b/test/files/expectedConfigurableTemplatesChart/values.yaml @@ -92,6 +92,7 @@ app: istioIngressGatewayLabels: istio: ingressgateway app: istio-ingressgateway + enableCleanupMonitoring: true btp: providerSubaccountId: null provider: From c85b6bacfcca146dcd4cd3fd55ab08561f4a60da Mon Sep 17 00:00:00 2001 From: i325261 Date: Fri, 24 Apr 2026 16:29:07 +0200 Subject: [PATCH 3/7] test updated --- test/files/expectedChart/templates/cap-operator-cros-ias.yaml | 4 +--- .../expectedChart/templates/cap-operator-cros-svc-ias.yaml | 4 +--- test/files/expectedChart/values-ias.yaml | 1 + test/files/expectedChart/values-svc-ias.yaml | 1 + test/files/expectedChart/values-svc.yaml | 1 + test/files/expectedChart/valuesWithDestination.yaml | 1 + test/files/expectedChart/valuesWithMTA.yaml | 1 + .../templates/cap-operator-cros-ias.yaml | 4 +--- .../templates/cap-operator-cros-svc-ias.yaml | 4 +--- test/files/expectedConfigurableTemplatesChart/values-ias.yaml | 1 + .../values-modified-svc.yaml | 1 + .../expectedConfigurableTemplatesChart/values-modified.yaml | 1 + .../expectedConfigurableTemplatesChart/values-svc-ias.yaml | 1 + test/files/expectedConfigurableTemplatesChart/values-svc.yaml | 1 + .../expectedConfigurableTemplatesChart/valuesWithMTA.yaml | 1 + test/files/values-of-simple-chart-filled.yaml | 1 + test/files/values-of-simple-service-chart-filled.yaml | 1 + 17 files changed, 17 insertions(+), 12 deletions(-) diff --git a/test/files/expectedChart/templates/cap-operator-cros-ias.yaml b/test/files/expectedChart/templates/cap-operator-cros-ias.yaml index f064ca9..63cedef 100644 --- a/test/files/expectedChart/templates/cap-operator-cros-ias.yaml +++ b/test/files/expectedChart/templates/cap-operator-cros-ias.yaml @@ -8,9 +8,7 @@ metadata: { "x-forwarded-client-cert": "%DOWNSTREAM_PEER_CERT%" } - {{- if .Values.app.enableCleanupMonitoring }} - sme.sap.com/enable-cleanup-monitoring: "true" - {{- end }} + sme.sap.com/enable-cleanup-monitoring: "{{ .Values.app.enableCleanupMonitoring }}" spec: domainRefs: - kind: Domain diff --git a/test/files/expectedChart/templates/cap-operator-cros-svc-ias.yaml b/test/files/expectedChart/templates/cap-operator-cros-svc-ias.yaml index 47ea27e..c8fd470 100644 --- a/test/files/expectedChart/templates/cap-operator-cros-svc-ias.yaml +++ b/test/files/expectedChart/templates/cap-operator-cros-svc-ias.yaml @@ -8,9 +8,7 @@ metadata: { "x-forwarded-client-cert": "%DOWNSTREAM_PEER_CERT%" } - {{- if .Values.app.enableCleanupMonitoring }} - sme.sap.com/enable-cleanup-monitoring: "true" - {{- end }} + sme.sap.com/enable-cleanup-monitoring: "{{ .Values.app.enableCleanupMonitoring }}" spec: domainRefs: - kind: Domain diff --git a/test/files/expectedChart/values-ias.yaml b/test/files/expectedChart/values-ias.yaml index 0edb3cb..1e6b7ec 100644 --- a/test/files/expectedChart/values-ias.yaml +++ b/test/files/expectedChart/values-ias.yaml @@ -101,6 +101,7 @@ app: istioIngressGatewayLabels: istio: ingressgateway app: istio-ingressgateway + enableCleanupMonitoring: true btp: providerSubaccountId: null provider: diff --git a/test/files/expectedChart/values-svc-ias.yaml b/test/files/expectedChart/values-svc-ias.yaml index f73b434..bd2daf7 100644 --- a/test/files/expectedChart/values-svc-ias.yaml +++ b/test/files/expectedChart/values-svc-ias.yaml @@ -63,6 +63,7 @@ app: istioIngressGatewayLabels: istio: ingressgateway app: istio-ingressgateway + enableCleanupMonitoring: true btp: providerSubaccountId: null imagePullSecrets: [] diff --git a/test/files/expectedChart/values-svc.yaml b/test/files/expectedChart/values-svc.yaml index 1e78a91..ebd5aea 100644 --- a/test/files/expectedChart/values-svc.yaml +++ b/test/files/expectedChart/values-svc.yaml @@ -58,6 +58,7 @@ app: istioIngressGatewayLabels: istio: ingressgateway app: istio-ingressgateway + enableCleanupMonitoring: true btp: providerSubaccountId: null imagePullSecrets: [] diff --git a/test/files/expectedChart/valuesWithDestination.yaml b/test/files/expectedChart/valuesWithDestination.yaml index 526a9a7..38769dc 100644 --- a/test/files/expectedChart/valuesWithDestination.yaml +++ b/test/files/expectedChart/valuesWithDestination.yaml @@ -92,6 +92,7 @@ app: istioIngressGatewayLabels: istio: ingressgateway app: istio-ingressgateway + enableCleanupMonitoring: true btp: providerSubaccountId: null provider: diff --git a/test/files/expectedChart/valuesWithMTA.yaml b/test/files/expectedChart/valuesWithMTA.yaml index 19d0c5f..a016b06 100644 --- a/test/files/expectedChart/valuesWithMTA.yaml +++ b/test/files/expectedChart/valuesWithMTA.yaml @@ -118,6 +118,7 @@ app: istioIngressGatewayLabels: istio: ingressgateway app: istio-ingressgateway + enableCleanupMonitoring: true btp: providerSubaccountId: null provider: diff --git a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-ias.yaml b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-ias.yaml index 41d4564..203b923 100644 --- a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-ias.yaml +++ b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-ias.yaml @@ -8,9 +8,7 @@ metadata: { "x-forwarded-client-cert": "%DOWNSTREAM_PEER_CERT%" } - {{- if .Values.app.enableCleanupMonitoring }} - sme.sap.com/enable-cleanup-monitoring: "true" - {{- end }} + sme.sap.com/enable-cleanup-monitoring: "{{ .Values.app.enableCleanupMonitoring }}" spec: domainRefs: - kind: Domain diff --git a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-svc-ias.yaml b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-svc-ias.yaml index 846defc..43c3d30 100644 --- a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-svc-ias.yaml +++ b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-svc-ias.yaml @@ -8,9 +8,7 @@ metadata: { "x-forwarded-client-cert": "%DOWNSTREAM_PEER_CERT%" } - {{- if .Values.app.enableCleanupMonitoring }} - sme.sap.com/enable-cleanup-monitoring: "true" - {{- end }} + sme.sap.com/enable-cleanup-monitoring: "{{ .Values.app.enableCleanupMonitoring }}" spec: domainRefs: - kind: Domain diff --git a/test/files/expectedConfigurableTemplatesChart/values-ias.yaml b/test/files/expectedConfigurableTemplatesChart/values-ias.yaml index db0ff10..eccc96e 100644 --- a/test/files/expectedConfigurableTemplatesChart/values-ias.yaml +++ b/test/files/expectedConfigurableTemplatesChart/values-ias.yaml @@ -101,6 +101,7 @@ app: istioIngressGatewayLabels: istio: ingressgateway app: istio-ingressgateway + enableCleanupMonitoring: true btp: providerSubaccountId: null provider: diff --git a/test/files/expectedConfigurableTemplatesChart/values-modified-svc.yaml b/test/files/expectedConfigurableTemplatesChart/values-modified-svc.yaml index 9b81675..1022cd7 100644 --- a/test/files/expectedConfigurableTemplatesChart/values-modified-svc.yaml +++ b/test/files/expectedConfigurableTemplatesChart/values-modified-svc.yaml @@ -58,6 +58,7 @@ app: istioIngressGatewayLabels: istio: ingressgateway app: istio-ingressgateway + enableCleanupMonitoring: true btp: providerSubaccountId: null imagePullSecrets: [] diff --git a/test/files/expectedConfigurableTemplatesChart/values-modified.yaml b/test/files/expectedConfigurableTemplatesChart/values-modified.yaml index 56b57a0..1641741 100644 --- a/test/files/expectedConfigurableTemplatesChart/values-modified.yaml +++ b/test/files/expectedConfigurableTemplatesChart/values-modified.yaml @@ -92,6 +92,7 @@ app: istioIngressGatewayLabels: istio: ingressgateway app: istio-ingressgateway + enableCleanupMonitoring: true btp: providerSubaccountId: null provider: diff --git a/test/files/expectedConfigurableTemplatesChart/values-svc-ias.yaml b/test/files/expectedConfigurableTemplatesChart/values-svc-ias.yaml index 0d1b744..da96511 100644 --- a/test/files/expectedConfigurableTemplatesChart/values-svc-ias.yaml +++ b/test/files/expectedConfigurableTemplatesChart/values-svc-ias.yaml @@ -63,6 +63,7 @@ app: istioIngressGatewayLabels: istio: ingressgateway app: istio-ingressgateway + enableCleanupMonitoring: true btp: providerSubaccountId: null imagePullSecrets: [] diff --git a/test/files/expectedConfigurableTemplatesChart/values-svc.yaml b/test/files/expectedConfigurableTemplatesChart/values-svc.yaml index 784de56..de841ff 100644 --- a/test/files/expectedConfigurableTemplatesChart/values-svc.yaml +++ b/test/files/expectedConfigurableTemplatesChart/values-svc.yaml @@ -58,6 +58,7 @@ app: istioIngressGatewayLabels: istio: ingressgateway app: istio-ingressgateway + enableCleanupMonitoring: true btp: providerSubaccountId: null imagePullSecrets: [] diff --git a/test/files/expectedConfigurableTemplatesChart/valuesWithMTA.yaml b/test/files/expectedConfigurableTemplatesChart/valuesWithMTA.yaml index da90b1f..01b979f 100644 --- a/test/files/expectedConfigurableTemplatesChart/valuesWithMTA.yaml +++ b/test/files/expectedConfigurableTemplatesChart/valuesWithMTA.yaml @@ -118,6 +118,7 @@ app: istioIngressGatewayLabels: istio: ingressgateway app: istio-ingressgateway + enableCleanupMonitoring: true btp: providerSubaccountId: null provider: diff --git a/test/files/values-of-simple-chart-filled.yaml b/test/files/values-of-simple-chart-filled.yaml index c8ae62c..60ed6ef 100644 --- a/test/files/values-of-simple-chart-filled.yaml +++ b/test/files/values-of-simple-chart-filled.yaml @@ -92,6 +92,7 @@ app: istioIngressGatewayLabels: istio: ingressgateway app: istio-ingressgateway + enableCleanupMonitoring: true btp: providerSubaccountId: null provider: diff --git a/test/files/values-of-simple-service-chart-filled.yaml b/test/files/values-of-simple-service-chart-filled.yaml index 221b68d..cd7d90f 100644 --- a/test/files/values-of-simple-service-chart-filled.yaml +++ b/test/files/values-of-simple-service-chart-filled.yaml @@ -58,6 +58,7 @@ app: istioIngressGatewayLabels: istio: ingressgateway app: istio-ingressgateway + enableCleanupMonitoring: true btp: providerSubaccountId: null imagePullSecrets: [] From d9c3018c5a6a7dba29aff8e78cfeae679bd30011 Mon Sep 17 00:00:00 2001 From: i325261 Date: Fri, 24 Apr 2026 17:06:05 +0200 Subject: [PATCH 4/7] [Misc] Refactor service exposure configuration in YAML templates --- lib/util.js | 40 +++++++++---------- .../templates/cap-operator-cros-ias.yaml | 4 ++ .../templates/cap-operator-cros.yaml | 4 ++ .../templates/cap-operator-cros-ias.yaml | 5 +++ .../templates/cap-operator-cros-svc-ias.yaml | 6 +-- .../templates/cap-operator-cros.yaml | 5 +++ 6 files changed, 39 insertions(+), 25 deletions(-) diff --git a/lib/util.js b/lib/util.js index 294b22d..33ae9c5 100644 --- a/lib/util.js +++ b/lib/util.js @@ -510,20 +510,6 @@ function getConfigurableCapOpCroYaml(project) { yaml.dec() // unindent workloads - // --- Service Exposure --- - if (isService) { - yaml.block([' serviceExposures:'], () => { - yaml.block([ - '- subDomain: {{ include "appName" $ }}', - ' routes:'], () => { - yaml.push([ - '- workloadName: server', - ' port: 4004' - ]) - }) - }) - } - // -- Content Jobs --- if (hasAms) { yaml.block([' contentJobs:'], () => { @@ -534,6 +520,18 @@ function getConfigurableCapOpCroYaml(project) { }) } + // --- Service Exposure --- + yaml.block([' serviceExposures:'], () => { + yaml.block([ + '- subDomain: {{ include "appName" $ }}', + ' routes:'], () => { + yaml.push([ + '- workloadName: server', + ' port: 4004' + ]) + }) + }) + return yaml.toString() } @@ -608,14 +606,12 @@ function getCAPOpCroYaml(project) { ]) // --- Service Exposure --- - if (isService) { - yaml.push([ - '\n', - ' {{- if .Values.serviceExposures }}', - ' serviceExposures: {{- toYaml .Values.serviceExposures | trim | nindent 4 }}', - ' {{- end }}' - ]) - } + yaml.push([ + '\n', + ' {{- if .Values.serviceExposures }}', + ' serviceExposures: {{- toYaml .Values.serviceExposures | trim | nindent 4 }}', + ' {{- end }}' + ]) return yaml.toString() } diff --git a/test/files/expectedChart/templates/cap-operator-cros-ias.yaml b/test/files/expectedChart/templates/cap-operator-cros-ias.yaml index 63cedef..ca518db 100644 --- a/test/files/expectedChart/templates/cap-operator-cros-ias.yaml +++ b/test/files/expectedChart/templates/cap-operator-cros-ias.yaml @@ -104,3 +104,7 @@ spec: {{- if .Values.contentJobs }} contentJobs: {{- toYaml .Values.contentJobs | trim | nindent 4 }} {{- end }} + + {{- if .Values.serviceExposures }} + serviceExposures: {{- toYaml .Values.serviceExposures | trim | nindent 4 }} + {{- end }} diff --git a/test/files/expectedChart/templates/cap-operator-cros.yaml b/test/files/expectedChart/templates/cap-operator-cros.yaml index 5e6cb2b..52bf862 100644 --- a/test/files/expectedChart/templates/cap-operator-cros.yaml +++ b/test/files/expectedChart/templates/cap-operator-cros.yaml @@ -100,3 +100,7 @@ spec: {{- if .Values.contentJobs }} contentJobs: {{- toYaml .Values.contentJobs | trim | nindent 4 }} {{- end }} + + {{- if .Values.serviceExposures }} + serviceExposures: {{- toYaml .Values.serviceExposures | trim | nindent 4 }} + {{- end }} diff --git a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-ias.yaml b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-ias.yaml index 203b923..08f40e3 100644 --- a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-ias.yaml +++ b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-ias.yaml @@ -130,3 +130,8 @@ spec: contentJobs: - content-deploy - ams-deployer + serviceExposures: + - subDomain: {{ include "appName" $ }} + routes: + - workloadName: server + port: 4004 diff --git a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-svc-ias.yaml b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-svc-ias.yaml index 43c3d30..9c89e9f 100644 --- a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-svc-ias.yaml +++ b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-svc-ias.yaml @@ -94,11 +94,11 @@ spec: jobDefinition: type: Content image: {{ .Values.workloads.amsDeployer.image }} + contentJobs: + - content-deploy + - ams-deployer serviceExposures: - subDomain: {{ include "appName" $ }} routes: - workloadName: server port: 4004 - contentJobs: - - content-deploy - - ams-deployer diff --git a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros.yaml b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros.yaml index 347d6e9..628bda3 100644 --- a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros.yaml +++ b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros.yaml @@ -110,3 +110,8 @@ spec: jobDefinition: type: Content image: {{ .Values.workloads.contentDeploy.image }} + serviceExposures: + - subDomain: {{ include "appName" $ }} + routes: + - workloadName: server + port: 4004 From 24fd6211c1de10317e2bfcf950d15d2b2c9a3531 Mon Sep 17 00:00:00 2001 From: i325261 Date: Mon, 27 Apr 2026 15:47:33 +0200 Subject: [PATCH 5/7] Don't default serviceExposures in configurable templates --- lib/util.js | 22 ++++++++++--------- .../templates/cap-operator-cros-ias.yaml | 5 ----- .../templates/cap-operator-cros.yaml | 5 ----- 3 files changed, 12 insertions(+), 20 deletions(-) diff --git a/lib/util.js b/lib/util.js index 33ae9c5..d65d1c6 100644 --- a/lib/util.js +++ b/lib/util.js @@ -521,16 +521,18 @@ function getConfigurableCapOpCroYaml(project) { } // --- Service Exposure --- - yaml.block([' serviceExposures:'], () => { - yaml.block([ - '- subDomain: {{ include "appName" $ }}', - ' routes:'], () => { - yaml.push([ - '- workloadName: server', - ' port: 4004' - ]) - }) - }) + if (isService) { + yaml.block([' serviceExposures:'], () => { + yaml.block([ + '- subDomain: {{ include "appName" $ }}', + ' routes:'], () => { + yaml.push([ + '- workloadName: server', + ' port: 4004' + ]) + }) + }) + } return yaml.toString() } diff --git a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-ias.yaml b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-ias.yaml index 08f40e3..203b923 100644 --- a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-ias.yaml +++ b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-ias.yaml @@ -130,8 +130,3 @@ spec: contentJobs: - content-deploy - ams-deployer - serviceExposures: - - subDomain: {{ include "appName" $ }} - routes: - - workloadName: server - port: 4004 diff --git a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros.yaml b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros.yaml index 628bda3..347d6e9 100644 --- a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros.yaml +++ b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros.yaml @@ -110,8 +110,3 @@ spec: jobDefinition: type: Content image: {{ .Values.workloads.contentDeploy.image }} - serviceExposures: - - subDomain: {{ include "appName" $ }} - routes: - - workloadName: server - port: 4004 From ea843b0484b0e21ca050a62159d4bd576840ea8d Mon Sep 17 00:00:00 2001 From: i325261 Date: Mon, 27 Apr 2026 16:47:32 +0200 Subject: [PATCH 6/7] default ttlSecondsAfterFinished to 300 --- lib/util.js | 3 ++- test/files/expectedChart/templates/cap-operator-cros-ias.yaml | 3 ++- .../expectedChart/templates/cap-operator-cros-svc-ias.yaml | 3 ++- test/files/expectedChart/templates/cap-operator-cros-svc.yaml | 3 ++- test/files/expectedChart/templates/cap-operator-cros.yaml | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/util.js b/lib/util.js index d65d1c6..a0cfc3a 100644 --- a/lib/util.js +++ b/lib/util.js @@ -585,7 +585,8 @@ function getCAPOpCroYaml(project) { ' {{- end }}', '\n', ' {{- if $v.jobDefinition }}', - ' jobDefinition: {{- toYaml $v.jobDefinition | trim | nindent 6 }}', + ' {{- $jobDef := merge $v.jobDefinition (dict "ttlSecondsAfterFinished" 300) }}', + ' jobDefinition: {{- toYaml $jobDef | trim | nindent 6 }}', ' {{- end }}', '{{- end }}' ]) diff --git a/test/files/expectedChart/templates/cap-operator-cros-ias.yaml b/test/files/expectedChart/templates/cap-operator-cros-ias.yaml index ca518db..3a5bc27 100644 --- a/test/files/expectedChart/templates/cap-operator-cros-ias.yaml +++ b/test/files/expectedChart/templates/cap-operator-cros-ias.yaml @@ -93,7 +93,8 @@ spec: {{- end }} {{- if $v.jobDefinition }} - jobDefinition: {{- toYaml $v.jobDefinition | trim | nindent 6 }} + {{- $jobDef := merge $v.jobDefinition (dict "ttlSecondsAfterFinished" 300) }} + jobDefinition: {{- toYaml $jobDef | trim | nindent 6 }} {{- end }} {{- end }} diff --git a/test/files/expectedChart/templates/cap-operator-cros-svc-ias.yaml b/test/files/expectedChart/templates/cap-operator-cros-svc-ias.yaml index c8fd470..7249bf0 100644 --- a/test/files/expectedChart/templates/cap-operator-cros-svc-ias.yaml +++ b/test/files/expectedChart/templates/cap-operator-cros-svc-ias.yaml @@ -90,7 +90,8 @@ spec: {{- end }} {{- if $v.jobDefinition }} - jobDefinition: {{- toYaml $v.jobDefinition | trim | nindent 6 }} + {{- $jobDef := merge $v.jobDefinition (dict "ttlSecondsAfterFinished" 300) }} + jobDefinition: {{- toYaml $jobDef | trim | nindent 6 }} {{- end }} {{- end }} diff --git a/test/files/expectedChart/templates/cap-operator-cros-svc.yaml b/test/files/expectedChart/templates/cap-operator-cros-svc.yaml index 84f73e6..a8e4ea9 100644 --- a/test/files/expectedChart/templates/cap-operator-cros-svc.yaml +++ b/test/files/expectedChart/templates/cap-operator-cros-svc.yaml @@ -86,7 +86,8 @@ spec: {{- end }} {{- if $v.jobDefinition }} - jobDefinition: {{- toYaml $v.jobDefinition | trim | nindent 6 }} + {{- $jobDef := merge $v.jobDefinition (dict "ttlSecondsAfterFinished" 300) }} + jobDefinition: {{- toYaml $jobDef | trim | nindent 6 }} {{- end }} {{- end }} diff --git a/test/files/expectedChart/templates/cap-operator-cros.yaml b/test/files/expectedChart/templates/cap-operator-cros.yaml index 52bf862..9d32442 100644 --- a/test/files/expectedChart/templates/cap-operator-cros.yaml +++ b/test/files/expectedChart/templates/cap-operator-cros.yaml @@ -89,7 +89,8 @@ spec: {{- end }} {{- if $v.jobDefinition }} - jobDefinition: {{- toYaml $v.jobDefinition | trim | nindent 6 }} + {{- $jobDef := merge $v.jobDefinition (dict "ttlSecondsAfterFinished" 300) }} + jobDefinition: {{- toYaml $jobDef | trim | nindent 6 }} {{- end }} {{- end }} From 4fdbbb25e71ec3ade7fcb550db08d67d3751d44e Mon Sep 17 00:00:00 2001 From: i325261 Date: Mon, 27 Apr 2026 17:09:33 +0200 Subject: [PATCH 7/7] default ttlSecondsAfterFinished in configurable chart as well Co-authored-by: Copilot --- lib/util.js | 7 +++++-- .../templates/cap-operator-cros-ias.yaml | 3 +++ .../templates/cap-operator-cros-svc-ias.yaml | 2 ++ .../templates/cap-operator-cros-svc.yaml | 1 + .../templates/cap-operator-cros.yaml | 2 ++ 5 files changed, 13 insertions(+), 2 deletions(-) diff --git a/lib/util.js b/lib/util.js index a0cfc3a..26f73ab 100644 --- a/lib/util.js +++ b/lib/util.js @@ -462,6 +462,7 @@ function getConfigurableCapOpCroYaml(project) { yaml.push([ 'type: TenantOperation', 'image: {{ .Values.workloads.tenantJob.image }}', + `ttlSecondsAfterFinished: 300`, '{{- if .Values.hanaInstanceId }}', 'env:', '- name: CDS_CONFIG', @@ -485,7 +486,8 @@ function getConfigurableCapOpCroYaml(project) { yaml.block(['jobDefinition:'], () => { yaml.push([ 'type: Content', - 'image: {{ .Values.workloads.contentDeploy.image }}' + 'image: {{ .Values.workloads.contentDeploy.image }}', + 'ttlSecondsAfterFinished: 300' ]) }) }) @@ -502,7 +504,8 @@ function getConfigurableCapOpCroYaml(project) { yaml.block(['jobDefinition:'], () => { yaml.push([ 'type: Content', - 'image: {{ .Values.workloads.amsDeployer.image }}' + 'image: {{ .Values.workloads.amsDeployer.image }}', + 'ttlSecondsAfterFinished: 300' ]) }) }) diff --git a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-ias.yaml b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-ias.yaml index 203b923..b41eff6 100644 --- a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-ias.yaml +++ b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-ias.yaml @@ -105,6 +105,7 @@ spec: jobDefinition: type: TenantOperation image: {{ .Values.workloads.tenantJob.image }} + ttlSecondsAfterFinished: 300 {{- if .Values.hanaInstanceId }} env: - name: CDS_CONFIG @@ -119,6 +120,7 @@ spec: jobDefinition: type: Content image: {{ .Values.workloads.contentDeploy.image }} + ttlSecondsAfterFinished: 300 - name: ams-deployer labels: sme.sap.com/app-type: {{ include "appName" $ }} @@ -127,6 +129,7 @@ spec: jobDefinition: type: Content image: {{ .Values.workloads.amsDeployer.image }} + ttlSecondsAfterFinished: 300 contentJobs: - content-deploy - ams-deployer diff --git a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-svc-ias.yaml b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-svc-ias.yaml index 9c89e9f..e5f5ac1 100644 --- a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-svc-ias.yaml +++ b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-svc-ias.yaml @@ -86,6 +86,7 @@ spec: jobDefinition: type: Content image: {{ .Values.workloads.contentDeploy.image }} + ttlSecondsAfterFinished: 300 - name: ams-deployer labels: sme.sap.com/app-type: {{ include "appName" $ }} @@ -94,6 +95,7 @@ spec: jobDefinition: type: Content image: {{ .Values.workloads.amsDeployer.image }} + ttlSecondsAfterFinished: 300 contentJobs: - content-deploy - ams-deployer diff --git a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-svc.yaml b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-svc.yaml index 5c6fbca..2a99b6b 100644 --- a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-svc.yaml +++ b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-svc.yaml @@ -77,6 +77,7 @@ spec: jobDefinition: type: Content image: {{ .Values.workloads.contentDeploy.image }} + ttlSecondsAfterFinished: 300 serviceExposures: - subDomain: {{ include "appName" $ }} routes: diff --git a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros.yaml b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros.yaml index 347d6e9..f951f7d 100644 --- a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros.yaml +++ b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros.yaml @@ -96,6 +96,7 @@ spec: jobDefinition: type: TenantOperation image: {{ .Values.workloads.tenantJob.image }} + ttlSecondsAfterFinished: 300 {{- if .Values.hanaInstanceId }} env: - name: CDS_CONFIG @@ -110,3 +111,4 @@ spec: jobDefinition: type: Content image: {{ .Values.workloads.contentDeploy.image }} + ttlSecondsAfterFinished: 300