From 84e075ed1c9d352920211354aa7e612495182356 Mon Sep 17 00:00:00 2001
From: Jan Zickermann <jan.zickermann@dataport.de>
Date: Tue, 6 May 2025 16:36:08 +0200
Subject: [PATCH] OZG-4878 helm: Fix osiv2-postfach proxy config
---
src/main/helm/templates/deployment.yaml | 6 +++---
src/test/helm/deployment_osiv2_test.yaml | 12 ++++++------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index 6061a25cd..66103d27b 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -123,11 +123,11 @@ spec:
- name: ozgcloud_osiv2_api_name-identifier
value: {{ .Values.ozgcloud.osiv2.api.nameidentifier}}
{{- if (.Values.ozgcloud.osiv2.httpproxy).enabled}}
- - name: ozgcloud_osiv2_http-proxy_enabled
+ - name: ozgcloud_osiv2_proxy_enabled
value: "{{ .Values.ozgcloud.osiv2.httpproxy.enabled }}"
- - name: ozgcloud_osiv2_http-proxy_host
+ - name: ozgcloud_osiv2_proxy_host
value: {{ .Values.ozgcloud.osiv2.httpproxy.host }}
- - name: ozgcloud_osiv2_http-proxy_port
+ - name: ozgcloud_osiv2_proxy_port
value: "{{ .Values.ozgcloud.osiv2.httpproxy.port }}"
{{- end }}
{{- end }}
diff --git a/src/test/helm/deployment_osiv2_test.yaml b/src/test/helm/deployment_osiv2_test.yaml
index b5e43e66f..3dacf85f0 100644
--- a/src/test/helm/deployment_osiv2_test.yaml
+++ b/src/test/helm/deployment_osiv2_test.yaml
@@ -108,7 +108,7 @@ tests:
- notContains:
path: spec.template.spec.containers[0].env
content:
- name: ozgcloud_osiv2_http-proxy_enabled
+ name: ozgcloud_osiv2_proxy_enabled
any: true
- it: should set osiv2 proxy values
set:
@@ -117,23 +117,23 @@ tests:
enabled: true
httpproxy:
enabled: true
- host: "http://proxy.host"
+ host: "10.0.0.1"
port: 8080
asserts:
- contains:
path: spec.template.spec.containers[0].env
content:
- name: ozgcloud_osiv2_http-proxy_enabled
+ name: ozgcloud_osiv2_proxy_enabled
value: "true"
- contains:
path: spec.template.spec.containers[0].env
content:
- name: ozgcloud_osiv2_http-proxy_host
- value: "http://proxy.host"
+ name: ozgcloud_osiv2_proxy_host
+ value: "10.0.0.1"
- contains:
path: spec.template.spec.containers[0].env
content:
- name: ozgcloud_osiv2_http-proxy_port
+ name: ozgcloud_osiv2_proxy_port
value: "8080"
- it: should not by default set osiv2 values
asserts:
--
GitLab