Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
vorgang-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
vorgang-manager
Commits
cf8feb23
Commit
cf8feb23
authored
4 months ago
by
OZGCloud
Browse files
Options
Downloads
Patches
Plain Diff
OZG-7131 remove fachstelle host default value
parent
39b86cf3
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/helm/templates/_helpers.tpl
+1
-5
1 addition, 5 deletions
src/main/helm/templates/_helpers.tpl
src/test/helm/deployment_fachstelle_host_test.yaml
+5
-19
5 additions, 19 deletions
src/test/helm/deployment_fachstelle_host_test.yaml
with
6 additions
and
24 deletions
src/main/helm/templates/_helpers.tpl
+
1
−
5
View file @
cf8feb23
...
...
@@ -166,11 +166,7 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
{{- define "app.fachstelleHost" -}}
{{- if (.Values.fachstelle).enabled -}}
{{- if (.Values.fachstelle).host -}}
{{ (.Values.fachstelle).host | quote }}
{{- else -}}
{{ printf "https://fachstelle.%s" (include "app.baseUrl" .) }}
{{- end -}}
{{- required "fachstelle.host must be set" .Values.fachstelle.host | quote }}
{{- end -}}
{{- end -}}
...
...
This diff is collapsed.
Click to expand it.
src/test/helm/deployment_fachstelle_host_test.yaml
+
5
−
19
View file @
cf8feb23
...
...
@@ -29,26 +29,14 @@ release:
templates
:
-
templates/deployment.yaml
set
:
baseUrl
:
test.sh.ozg-cloud.de
ozgcloud
:
environment
:
dev
bezeichner
:
helm
imagePullSecret
:
test-image-pull-secret
tests
:
-
it
:
should set
the
fachstelle host
-
it
:
should set fachstelle host
set
:
baseUrl
:
test.sh.ozg-cloud.de
fachstelle
:
enabled
:
true
asserts
:
-
contains
:
path
:
spec.template.spec.containers[0].env
content
:
name
:
ozgcloud_fachstelle_host
value
:
https://fachstelle.test.sh.ozg-cloud.de
-
it
:
should use fachstelle host from values
set
:
baseUrl
:
test.sh.ozg-cloud.de
fachstelle
:
enabled
:
true
host
:
https://hamburg.mein-kreis.de
...
...
@@ -58,16 +46,14 @@ tests:
content
:
name
:
ozgcloud_fachstelle_host
value
:
https://hamburg.mein-kreis.de
-
it
:
should fail if
base
url is not set
-
it
:
should fail if
host
url is not set
set
:
fachstelle
:
enabled
:
true
asserts
:
-
failedTemplate
:
errorMessage
:
"
baseUrl
must
be
set"
-
it
:
should not fail if fachstelle is not enabled and base url is not set
set
:
alfaHost
:
alfa.de
errorMessage
:
"
fachstelle.host
must
be
set"
-
it
:
should not fail if fachstelle is not enabled and host is not set
asserts
:
-
notContains
:
path
:
spec.template.spec.containers[0].env
...
...
This diff is collapsed.
Click to expand it.
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