From dca344ab14b7b30474c81e92183a534be6506494 Mon Sep 17 00:00:00 2001 From: anirudhprasad-sap <126493692+anirudhprasad-sap@users.noreply.github.com> Date: Mon, 13 May 2024 11:02:53 +0200 Subject: [PATCH] [MISC] Workload definition type fix in defaults (#11) --- files/chart/values.yaml | 6 ------ files/workloads.yaml.hbs | 4 ++-- test/files/expectedChart/values.yaml | 9 ++------- test/files/expectedChart/valuesWithDestination.yaml | 9 ++------- test/files/expectedChart/valuesWithMTA.yaml | 5 ----- 5 files changed, 6 insertions(+), 27 deletions(-) diff --git a/files/chart/values.yaml b/files/chart/values.yaml index 550138a..2674b71 100644 --- 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 index 52a0bf4..af3ea4b 100644 --- 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 index 0500032..55314f6 100644 --- 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 index 0500032..55314f6 100644 --- 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 index 3f00256..01ecce7 100644 --- 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: []