OZG-7573 OZG-7987 adjust names of variables

src/main/helm/templates/deployment.yaml

@@ -164,9 +164,9 @@ spec:
             value: {{ (.Values.zufiManager).grpcClientNegotiationType | default "PLAINTEXT" }}
           {{- end}}
           - name: grpc_client_forwarder_address
-            value: {{ ((.Values.ozgcloud).forwarder).address }}
+            value: {{ (.Values.forwarder).address }}
           - name: grpc_client_forwarder_negotiationType
-            value: {{ ((.Values.ozgcloud).forwarder).grpcClientNegotiationType | default "TLS" }}
+            value: {{ (.Values.forwarder).grpcClientNegotiationType | default "TLS" }}
 
           {{- if not (.Values.database).useExternal }}
           - name: spring_data_mongodb_uri

src/test/helm/deployment_forwarder_env_test.yaml

@@ -37,7 +37,6 @@ set:
 tests:
   - it: should set the grpc forwarder client address
     set:
-      ozgcloud:
       forwarder:
         address: https://forwarder.my-wonderful-domain.local:9000
     asserts:
@@ -55,7 +54,6 @@ tests:
             value: TLS
   - it: should set the negotiation type
     set:
-      ozgcloud:
       forwarder:
         grpcClientNegotiationType: PLAINTEXT
     asserts: