diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml index d39c08c77eccc29604fe19c79e9de5c81b731665..21cff757be06a9dd65ffb19d3a95dcd2ebd855aa 100644 --- a/src/main/helm/templates/deployment.yaml +++ b/src/main/helm/templates/deployment.yaml @@ -146,7 +146,8 @@ spec: value: {{ (.Values.userManager).grpcClientNegotiationType | default "TLS" }} - name: grpc_client_info-manager_address value: {{ ((.Values.ozgcloud).infoManager).address }} - + - name: grpc_client_info-manager_negotiationType + value: {{ ((.Values.ozgcloud).infoManager).grpcClientNegotiationType | default "TLS" }} - name: ozgcloud_user-manager_url value: {{ include "app.ozgcloud_migration_user-manager_address" . }} - name: ozgcloud_zufi-manager_address @@ -222,6 +223,16 @@ spec: {{- if .Values.disableGrpcTls }} - name: grpc_server_security_enabled value: "false" + - name: grpc_client_pluto_negotiationType + value: PLAINTEXT + - name: grpc_client_vorgang-manager_negotiationType + value: PLAINTEXT + - name: grpc_client_email_negotiationType + value: PLAINTEXT + - name: grpc_client_nachrichten-manager_negotiationType + value: PLAINTEXT + - name: grpc_client_command-manager_negotiationType + value: PLAINTEXT {{- end }} {{- if or (.Values.database).useExternal (.Values.ozgcloudProxyApi).apikey }} diff --git a/src/test/helm/deployment_grpc_info_manager_address_test.yaml b/src/test/helm/deployment_grpc_info_manager_address_test.yaml index 763578ba556ba1c456cdfa7f9d5969b818d13119..a04833c32169e96f6aa5fc3c38e6335e723b4cad 100644 --- a/src/test/helm/deployment_grpc_info_manager_address_test.yaml +++ b/src/test/helm/deployment_grpc_info_manager_address_test.yaml @@ -28,17 +28,37 @@ release: namespace: sh-helm-test templates: - templates/deployment.yaml +set: + ozgcloud: + environment: dev + imagePullSecret: test-image-pull-secret tests: - it: should set the grpc info-manager client address set: ozgcloud: - environment: dev infoManager: address: https://info-manager.my-wonderful-domain.local:9000 - imagePullSecret: test-image-pull-secret asserts: - contains: path: spec.template.spec.containers[0].env content: name: grpc_client_info-manager_address value: https://info-manager.my-wonderful-domain.local:9000 + - it: check default info-manager negotiationType + asserts: + - contains: + path: spec.template.spec.containers[0].env + content: + name: grpc_client_info-manager_negotiationType + value: TLS + - it: should set info-manager negotiationType + set: + ozgcloud: + infoManager: + grpcClientNegotiationType: PLAINTEXT + asserts: + - contains: + path: spec.template.spec.containers[0].env + content: + name: grpc_client_info-manager_negotiationType + value: PLAINTEXT \ No newline at end of file diff --git a/src/test/helm/deployment_grpc_tls_test.yaml b/src/test/helm/deployment_grpc_tls_test.yaml index 120c32436acb99bf04891c2911f0804077b7b862..abdf517b653235f95f8fbafaaa2b931ce35dd8a1 100644 --- a/src/test/helm/deployment_grpc_tls_test.yaml +++ b/src/test/helm/deployment_grpc_tls_test.yaml @@ -93,4 +93,33 @@ tests: path: spec.template.spec.containers[0].env content: name: grpc_server_security_enabled - value: "false" \ No newline at end of file + value: "false" + - it: should set grpc negotiationType Plaintext + set: + disableGrpcTls: true + asserts: + - contains: + path: spec.template.spec.containers[0].env + content: + name: grpc_client_pluto_negotiationType + value: PLAINTEXT + - contains: + path: spec.template.spec.containers[0].env + content: + name: grpc_client_vorgang-manager_negotiationType + value: PLAINTEXT + - contains: + path: spec.template.spec.containers[0].env + content: + name: grpc_client_email_negotiationType + value: PLAINTEXT + - contains: + path: spec.template.spec.containers[0].env + content: + name: grpc_client_nachrichten-manager_negotiationType + value: PLAINTEXT + - contains: + path: spec.template.spec.containers[0].env + content: + name: grpc_client_command-manager_negotiationType + value: PLAINTEXT \ No newline at end of file