From 2f8ec313a4459e2279955f471c891609f34a4157 Mon Sep 17 00:00:00 2001
From: Krzysztof <krzysztof.witukiewicz@mgm-tp.com>
Date: Wed, 30 Apr 2025 14:22:40 +0200
Subject: [PATCH] Revert "OZG-7811 OZG-8114 Support mandant-value in
helm-template"
This reverts commit 3a0d2ee0b5971f60b278596afb1067d7ce8011b1.
---
.../src/main/helm/templates/cronjob.yaml | 4 ----
.../src/test/helm/cronjob_env_test.yaml | 22 -------------------
2 files changed, 26 deletions(-)
diff --git a/aggregation-manager-job/src/main/helm/templates/cronjob.yaml b/aggregation-manager-job/src/main/helm/templates/cronjob.yaml
index e11eafe..f241604 100644
--- a/aggregation-manager-job/src/main/helm/templates/cronjob.yaml
+++ b/aggregation-manager-job/src/main/helm/templates/cronjob.yaml
@@ -75,10 +75,6 @@ spec:
- name: ozgcloud_administration_address
value: {{ include "app.getOzgcloudAdministrationAddress" . }}
{{- end }}
- {{- if .Values.mandant }}
- - name: ozgcloud_mandant
- value: {{ .Values.mandant }}
- {{- end }}
{{- with include "app.getCustomList" . }}
{{ . | indent 14 }}
{{- end }}
diff --git a/aggregation-manager-job/src/test/helm/cronjob_env_test.yaml b/aggregation-manager-job/src/test/helm/cronjob_env_test.yaml
index a7aab06..14aad4d 100644
--- a/aggregation-manager-job/src/test/helm/cronjob_env_test.yaml
+++ b/aggregation-manager-job/src/test/helm/cronjob_env_test.yaml
@@ -129,28 +129,6 @@ tests:
name: ozgcloud_administration_address
value: http://test-administration:8080
- - it: should not set mandant per default
- set:
- ozgcloud:
- environment: dev
- asserts:
- - notContains:
- path: spec.jobTemplate.spec.template.spec.containers[0].env
- content:
- name: ozgcloud_mandant
- any: true
- - it: should set mandant
- set:
- mandant: dummy mandant value
- ozgcloud:
- environment: dev
- asserts:
- - contains:
- path: spec.jobTemplate.spec.template.spec.containers[0].env
- content:
- name: ozgcloud_mandant
- value: "dummy mandant value"
-
- it: should fail template when env not set
set:
asserts:
--
GitLab