diff --git a/run_helm_test.sh b/run_helm_test.sh index b19a9bc7c3072044dff8f0fb54c04c29acc3fbf6..ccc03d0fb89a1d2eb4c637c7d5f68ffd283051e7 100755 --- a/run_helm_test.sh +++ b/run_helm_test.sh @@ -4,4 +4,4 @@ set -e helm template ./src/main/helm/ -f src/test/helm-linter-values.yaml helm lint -f src/test/helm-linter-values.yaml ./src/main/helm/ -cd src/main/helm && helm unittest -f '../../test/helm/**/*test.yaml' . \ No newline at end of file +cd src/main/helm && helm unittest -f '../../test/helm/**/*.yaml' . \ No newline at end of file diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml index 89c0a9277df86d7042b64ea75e4c2213e8a21331..51d9cccd3ec673ca0ce45105e58695766febbb30 100644 --- a/src/main/helm/templates/deployment.yaml +++ b/src/main/helm/templates/deployment.yaml @@ -59,6 +59,8 @@ spec: app.kubernetes.io/name: {{ .Release.Name }} containers: - env: + - name: SERVICE_BINDING_ROOT + value: "/bindings" {{- range (.Values.env).grpc }} - name: {{ .name }} value: {{ .value }} @@ -79,7 +81,7 @@ spec: - name: grpc_client_vorgang-manager-{{ (.Values.routing).targetVorgangManagerName}}_address value: 'vorgang-manager.{{ coalesce (.Values.routing).targetNamespace .Release.Namespace }}:9090' - name: grpc_client_vorgang-manager-{{ (.Values.routing).targetVorgangManagerName}}_negotiationType - value: {{ (.Values.routing).negotiationType | default "PLAINTEXT" }} + value: {{ (.Values.routing).negotiationType | default "TLS" }} {{- end }} {{- with (.Values.env).customList }} {{ toYaml . | indent 8 }} @@ -150,9 +152,23 @@ spec: volumeMounts: - name: temp-dir mountPath: "/tmp" + - name: namespace-ca-cert + mountPath: "/bindings/namespace-certificate" + readOnly: true volumes: - name: temp-dir emptyDir: {} + - name: namespace-ca-cert + projected: + sources: + - secret: + name: {{ include "app.namespace" . }}-ca-cert + optional: true + items: + - key: ca.crt + path: ca.crt + - configMap: + name: bindings-type dnsConfig: {} dnsPolicy: ClusterFirst imagePullSecrets: diff --git a/src/test/helm/deployment_routing_strategy_env.yaml b/src/test/helm/deployment_routing_strategy_env.yaml index dc9ae515b3ad4c3c4ae977d4700736ff1f6633dc..cd24633dbc3eed6ed59ccd58b70dbf4397b847a1 100644 --- a/src/test/helm/deployment_routing_strategy_env.yaml +++ b/src/test/helm/deployment_routing_strategy_env.yaml @@ -49,13 +49,13 @@ tests: path: spec.template.spec.containers[0].env content: name: grpc_client_vorgang-manager-vorgang-manager_negotiationType - value: PLAINTEXT + value: TLS - it: validate routing infos set: routing: routingStrategy: MULTI fallbackStrategy: FUNDSTELLE - negotiationType: TLS + negotiationType: PLAINTEXT asserts: - contains: path: spec.template.spec.containers[0].env @@ -71,4 +71,4 @@ tests: path: spec.template.spec.containers[0].env content: name: grpc_client_vorgang-manager-vorgang-manager_negotiationType - value: TLS \ No newline at end of file + value: PLAINTEXT \ No newline at end of file