Skip to content
Snippets Groups Projects
Commit 84e075ed authored by Jan Zickermann's avatar Jan Zickermann
Browse files

OZG-4878 helm: Fix osiv2-postfach proxy config

parent f9401620
No related branches found
No related tags found
1 merge request!33OZG-4878 helm: Fix osiv2-postfach proxy config
...@@ -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 }}
......
...@@ -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:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment