[MISC] Workload definition type fix in defaults (#11)

cap-js · May 13, 2024 · dca344a · dca344a
1 parent 1cdd0b9
commit dca344a
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 27 deletions.
diff --git a/files/chart/values.yaml b/files/chart/values.yaml
@@ -28,9 +28,3 @@ imagePullSecrets: []
 
 workloads:
 
-tenantOperations:
-  provisioning: []
-  upgrade: []
-  deprovisioning: []
-
-contentJobs: []
diff --git a/files/workloads.yaml.hbs b/files/workloads.yaml.hbs
@@ -32,7 +32,7 @@ workloads:
         {{#hasHtml5Repo}}
         - {{appName}}-html5-repo-host-bind
         {{/hasHtml5Repo}}
-        deploymentDefinition:
+        jobDefinition:
             type: Content
             image:
 
@@ -48,7 +48,7 @@ workloads:
         - {{appName}}-saas-registry-bind
         - {{appName}}-service-manager-bind
         {{/hasMultitenancy}}
-        deploymentDefinition:
+        jobDefinition:
             env:
             - name: CDS_CONFIG
               value:

diff --git a/test/files/expectedChart/values.yaml b/test/files/expectedChart/values.yaml
@@ -134,7 +134,7 @@ workloads:
       - bookshop-uaa-bind
       - bookshop-saas-registry-bind
       - bookshop-html5-repo-host-bind
-    deploymentDefinition:
+    jobDefinition:
       type: Content
       image: null
   tenant-job:
@@ -145,14 +145,9 @@ workloads:
       - bookshop-uaa-bind
       - bookshop-saas-registry-bind
       - bookshop-service-manager-bind
-    deploymentDefinition:
+    jobDefinition:
       env:
         - name: CDS_CONFIG
           value: null
       type: TenantOperation
       image: null
-tenantOperations:
-  provisioning: []
-  upgrade: []
-  deprovisioning: []
-contentJobs: []
diff --git a/test/files/expectedChart/valuesWithDestination.yaml b/test/files/expectedChart/valuesWithDestination.yaml
@@ -134,7 +134,7 @@ workloads:
       - bookshop-uaa-bind
       - bookshop-saas-registry-bind
       - bookshop-html5-repo-host-bind
-    deploymentDefinition:
+    jobDefinition:
       type: Content
       image: null
   tenant-job:
@@ -145,14 +145,9 @@ workloads:
       - bookshop-uaa-bind
       - bookshop-saas-registry-bind
       - bookshop-service-manager-bind
-    deploymentDefinition:
+    jobDefinition:
       env:
         - name: CDS_CONFIG
           value: null
       type: TenantOperation
       image: null
-tenantOperations:
-  provisioning: []
-  upgrade: []
-  deprovisioning: []
-contentJobs: []
diff --git a/test/files/expectedChart/valuesWithMTA.yaml b/test/files/expectedChart/valuesWithMTA.yaml
@@ -205,8 +205,3 @@ workloads:
       env:
         - name: TENANT_HOST_PATTERN
           value: ^(.*)-${default-uri}
-tenantOperations:
-  provisioning: []
-  upgrade: []
-  deprovisioning: []
-contentJobs: []