Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
aggregation-manager
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OZG-Cloud
app
aggregation-manager
Commits
3a0d2ee0
Commit
3a0d2ee0
authored
2 weeks ago
by
Krzysztof Witukiewicz
Browse files
Options
Downloads
Patches
Plain Diff
OZG-7811 OZG-8114 Support mandant-value in helm-template
parent
df71333b
No related branches found
No related tags found
1 merge request
!23
Ozg 7811 vorgaenge zur landesebene schicken
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
aggregation-manager-job/src/main/helm/templates/cronjob.yaml
+4
-0
4 additions, 0 deletions
aggregation-manager-job/src/main/helm/templates/cronjob.yaml
aggregation-manager-job/src/test/helm/cronjob_env_test.yaml
+22
-0
22 additions, 0 deletions
aggregation-manager-job/src/test/helm/cronjob_env_test.yaml
with
26 additions
and
0 deletions
aggregation-manager-job/src/main/helm/templates/cronjob.yaml
+
4
−
0
View file @
3a0d2ee0
...
...
@@ -75,6 +75,10 @@ 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
}}
...
...
This diff is collapsed.
Click to expand it.
aggregation-manager-job/src/test/helm/cronjob_env_test.yaml
+
22
−
0
View file @
3a0d2ee0
...
...
@@ -129,6 +129,28 @@ 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
:
...
...
This diff is collapsed.
Click to expand it.
Krzysztof Witukiewicz
@krzysztof
mentioned in commit
2f8ec313
·
2 weeks ago
mentioned in commit
2f8ec313
mentioned in commit 2f8ec313a4459e2279955f471c891609f34a4157
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment