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
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor 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
84e075ed
Commit
84e075ed
authored
1 month ago
by
Jan Zickermann
Browse files
Options
Downloads
Patches
Plain Diff
OZG-4878 helm: Fix osiv2-postfach proxy config
parent
f9401620
No related branches found
No related tags found
1 merge request
!33
OZG-4878 helm: Fix osiv2-postfach proxy config
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/helm/templates/deployment.yaml
+3
-3
3 additions, 3 deletions
src/main/helm/templates/deployment.yaml
src/test/helm/deployment_osiv2_test.yaml
+6
-6
6 additions, 6 deletions
src/test/helm/deployment_osiv2_test.yaml
with
9 additions
and
9 deletions
src/main/helm/templates/deployment.yaml
+
3
−
3
View file @
84e075ed
...
@@ -123,11 +123,11 @@ spec:
...
@@ -123,11 +123,11 @@ spec:
-
name
:
ozgcloud_osiv2_api_name-identifier
-
name
:
ozgcloud_osiv2_api_name-identifier
value
:
{{
.Values.ozgcloud.osiv2.api.nameidentifier
}}
value
:
{{
.Values.ozgcloud.osiv2.api.nameidentifier
}}
{{
- if (.Values.ozgcloud.osiv2.httpproxy).enabled
}}
{{
- if (.Values.ozgcloud.osiv2.httpproxy).enabled
}}
-
name
:
ozgcloud_osiv2_
http-
proxy_enabled
-
name
:
ozgcloud_osiv2_proxy_enabled
value
:
"
{{
.Values.ozgcloud.osiv2.httpproxy.enabled
}}"
value
:
"
{{
.Values.ozgcloud.osiv2.httpproxy.enabled
}}"
-
name
:
ozgcloud_osiv2_
http-
proxy_host
-
name
:
ozgcloud_osiv2_proxy_host
value
:
{{
.Values.ozgcloud.osiv2.httpproxy.host
}}
value
:
{{
.Values.ozgcloud.osiv2.httpproxy.host
}}
-
name
:
ozgcloud_osiv2_
http-
proxy_port
-
name
:
ozgcloud_osiv2_proxy_port
value
:
"
{{
.Values.ozgcloud.osiv2.httpproxy.port
}}"
value
:
"
{{
.Values.ozgcloud.osiv2.httpproxy.port
}}"
{{
- end
}}
{{
- end
}}
{{
- end
}}
{{
- end
}}
...
...
This diff is collapsed.
Click to expand it.
src/test/helm/deployment_osiv2_test.yaml
+
6
−
6
View file @
84e075ed
...
@@ -108,7 +108,7 @@ tests:
...
@@ -108,7 +108,7 @@ tests:
-
notContains
:
-
notContains
:
path
:
spec.template.spec.containers[0].env
path
:
spec.template.spec.containers[0].env
content
:
content
:
name
:
ozgcloud_osiv2_
http-
proxy_enabled
name
:
ozgcloud_osiv2_proxy_enabled
any
:
true
any
:
true
-
it
:
should set osiv2 proxy values
-
it
:
should set osiv2 proxy values
set
:
set
:
...
@@ -117,23 +117,23 @@ tests:
...
@@ -117,23 +117,23 @@ tests:
enabled
:
true
enabled
:
true
httpproxy
:
httpproxy
:
enabled
:
true
enabled
:
true
host
:
"
http://proxy.host
"
host
:
"
10.0.0.1
"
port
:
8080
port
:
8080
asserts
:
asserts
:
-
contains
:
-
contains
:
path
:
spec.template.spec.containers[0].env
path
:
spec.template.spec.containers[0].env
content
:
content
:
name
:
ozgcloud_osiv2_
http-
proxy_enabled
name
:
ozgcloud_osiv2_proxy_enabled
value
:
"
true"
value
:
"
true"
-
contains
:
-
contains
:
path
:
spec.template.spec.containers[0].env
path
:
spec.template.spec.containers[0].env
content
:
content
:
name
:
ozgcloud_osiv2_
http-
proxy_host
name
:
ozgcloud_osiv2_proxy_host
value
:
"
http://proxy.host
"
value
:
"
10.0.0.1
"
-
contains
:
-
contains
:
path
:
spec.template.spec.containers[0].env
path
:
spec.template.spec.containers[0].env
content
:
content
:
name
:
ozgcloud_osiv2_
http-
proxy_port
name
:
ozgcloud_osiv2_proxy_port
value
:
"
8080"
value
:
"
8080"
-
it
:
should not by default set osiv2 values
-
it
:
should not by default set osiv2 values
asserts
:
asserts
:
...
...
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