cap-js · anirudhprasad-sap · Apr 28, 2026 · Apr 24, 2026 · Apr 24, 2026 · Apr 24, 2026
diff --git 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/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.schema.json b/files/configurableTemplatesChart/values.schema.json
@@ -130,6 +130,9 @@
                 },
                 "version": {
                     "type": "string"
+                },
+                "enableCleanupMonitoring": {
+                    "type": "boolean"
                 }
             },
             "required": [

diff --git 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/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
@@ -251,9 +251,14 @@
           'sme.sap.com/vs-route-request-header-set: |',
           '  {',
           '    "x-forwarded-client-cert": "%DOWNSTREAM_PEER_CERT%"',
-          '  }'
+          '  }',
+          'sme.sap.com/enable-cleanup-monitoring: "{{ .Values.app.enableCleanupMonitoring }}"'
         ])
       })
+    } else {
+      yaml.block(['annotations:'], () => {
+        yaml.push('sme.sap.com/enable-cleanup-monitoring: "{{ .Values.app.enableCleanupMonitoring }}"')
+      })
     }
   })
 
@@ -457,6 +462,7 @@
           yaml.push([
             'type: TenantOperation',
             'image: {{ .Values.workloads.tenantJob.image }}',
+            `ttlSecondsAfterFinished: 300`,
             '{{- if .Values.hanaInstanceId }}',
             'env:',
             '- name: CDS_CONFIG',
@@ -480,7 +486,8 @@
       yaml.block(['jobDefinition:'], () => {
         yaml.push([
           'type: Content',
-          'image: {{ .Values.workloads.contentDeploy.image }}'
+          'image: {{ .Values.workloads.contentDeploy.image }}',
+          'ttlSecondsAfterFinished: 300'
         ])
       })
     })
@@ -497,14 +504,25 @@
         yaml.block(['jobDefinition:'], () => {
           yaml.push([
             'type: Content',
-            'image: {{ .Values.workloads.amsDeployer.image }}'
+            'image: {{ .Values.workloads.amsDeployer.image }}',
+            'ttlSecondsAfterFinished: 300'
           ])
         })
       })
   }
 
   yaml.dec() // unindent workloads
 
+  // -- Content Jobs ---
+  if (hasAms) {
+    yaml.block(['  contentJobs:'], () => {
+      yaml.push([
+        '- content-deploy',
+        '- ams-deployer'
+      ])
+    })
+  }
+
   // --- Service Exposure ---
   if (isService) {
     yaml.block(['  serviceExposures:'], () => {
@@ -519,16 +537,6 @@
     })
   }
 
-  // -- Content Jobs ---
-  if (hasAms) {
-    yaml.block(['  contentJobs:'], () => {
-      yaml.push([
-        '- content-deploy',
-        '- ams-deployer'
-      ])
-    })
-  }
-
   return yaml.toString()
 }
 
@@ -580,7 +588,8 @@
       '  {{- 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 }}'
     ])
@@ -603,14 +612,12 @@
   ])
 
   // --- 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
@@ -8,6 +8,7 @@ metadata:
       {
         "x-forwarded-client-cert": "%DOWNSTREAM_PEER_CERT%"
       }
+    sme.sap.com/enable-cleanup-monitoring: "{{ .Values.app.enableCleanupMonitoring }}"
 spec:
   domainRefs:
   - kind: Domain
@@ -92,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 }}
 
@@ -103,3 +105,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-svc-ias.yaml b/test/files/expectedChart/templates/cap-operator-cros-svc-ias.yaml
@@ -8,6 +8,7 @@ metadata:
       {
         "x-forwarded-client-cert": "%DOWNSTREAM_PEER_CERT%"
       }
+    sme.sap.com/enable-cleanup-monitoring: "{{ .Values.app.enableCleanupMonitoring }}"
 spec:
   domainRefs:
   - kind: Domain
@@ -89,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
@@ -3,6 +3,8 @@ apiVersion: sme.sap.com/v1alpha1
 kind: CAPApplication
 metadata:
   name: {{ include "appName" $ }}
+  annotations:
+    sme.sap.com/enable-cleanup-monitoring: "{{ .Values.app.enableCleanupMonitoring }}"
 spec:
   domainRefs:
   - kind: Domain
@@ -84,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
@@ -3,6 +3,8 @@ apiVersion: sme.sap.com/v1alpha1
 kind: CAPApplication
 metadata:
   name: {{ include "appName" $ }}
+  annotations:
+    sme.sap.com/enable-cleanup-monitoring: "{{ .Values.app.enableCleanupMonitoring }}"
 spec:
   domainRefs:
   - kind: Domain
@@ -87,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 }}
 
@@ -98,3 +101,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/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
@@ -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
@@ -58,6 +58,7 @@ app:
   istioIngressGatewayLabels:
     istio: ingressgateway
     app: istio-ingressgateway
+  enableCleanupMonitoring: true
 btp:
   providerSubaccountId: null
 imagePullSecrets: []

diff --git 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/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
@@ -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
@@ -8,6 +8,7 @@ metadata:
       {
         "x-forwarded-client-cert": "%DOWNSTREAM_PEER_CERT%"
       }
+    sme.sap.com/enable-cleanup-monitoring: "{{ .Values.app.enableCleanupMonitoring }}"
 spec:
   domainRefs:
   - kind: Domain
@@ -104,6 +105,7 @@ spec:
     jobDefinition:
       type: TenantOperation
       image: {{ .Values.workloads.tenantJob.image }}
+      ttlSecondsAfterFinished: 300
       {{- if .Values.hanaInstanceId }}
       env:
       - name: CDS_CONFIG
@@ -118,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" $ }}
@@ -126,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-modified-svc.yaml b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-modified-svc.yaml
@@ -3,6 +3,8 @@ apiVersion: sme.sap.com/v1alpha1
 kind: CAPApplication
 metadata:
   name: {{ include "appName" $ }}
+  annotations:
+    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
@@ -3,6 +3,8 @@ apiVersion: sme.sap.com/v1alpha1
 kind: CAPApplication
 metadata:
   name: {{ include "appName" $ }}
+  annotations:
+    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
@@ -3,6 +3,8 @@ apiVersion: sme.sap.com/v1alpha1
 kind: CAPApplication
 metadata:
   name: {{ include "appName" $ }}
+  annotations:
+    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
@@ -8,6 +8,7 @@ metadata:
       {
         "x-forwarded-client-cert": "%DOWNSTREAM_PEER_CERT%"
       }
+    sme.sap.com/enable-cleanup-monitoring: "{{ .Values.app.enableCleanupMonitoring }}"
 spec:
   domainRefs:
   - kind: Domain
@@ -85,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" $ }}
@@ -93,11 +95,12 @@ spec:
     jobDefinition:
       type: Content
       image: {{ .Values.workloads.amsDeployer.image }}
+      ttlSecondsAfterFinished: 300
+  contentJobs:
+  - content-deploy
+  - ams-deployer
   serviceExposures:
   - subDomain: {{ include "appName" $ }}
     routes:
     - workloadName: server
       port: 4004
-  contentJobs:
-  - content-deploy
-  - ams-deployer