Skip to content
Snippets Groups Projects
Commit 51486287 authored by OZGCloud's avatar OZGCloud
Browse files

Merge pull request 'ozg-3938-enable-grpc-tls' (#128) from ozg-3938-enable-grpc-tls into master

parents a1696a14 7d46b5f5
Branches
Tags
No related merge requests found
......@@ -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
apiVersion: v1
kind: ConfigMap
metadata:
name: {{ .Release.Name }}-bindings-type
namespace: {{ include "app.namespace" . }}
data:
type: |
ca-certificates
\ No newline at end of file
......@@ -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 include "app.getCustomList" . }}
{{ . | 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: {{ .Release.Name }}-bindings-type
dnsConfig: {}
dnsPolicy: ClusterFirst
imagePullSecrets:
......
#
# Copyright (C) 2022 Das Land Schleswig-Holstein vertreten durch den
# Ministerpräsidenten des Landes Schleswig-Holstein
# Staatskanzlei
# Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
#
# Lizenziert unter der EUPL, Version 1.2 oder - sobald
# diese von der Europäischen Kommission genehmigt wurden -
# Folgeversionen der EUPL ("Lizenz");
# Sie dürfen dieses Werk ausschließlich gemäß
# dieser Lizenz nutzen.
# Eine Kopie der Lizenz finden Sie hier:
#
# https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
#
# Sofern nicht durch anwendbare Rechtsvorschriften
# gefordert oder in schriftlicher Form vereinbart, wird
# die unter der Lizenz verbreitete Software "so wie sie
# ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
# ausdrücklich oder stillschweigend - verbreitet.
# Die sprachspezifischen Genehmigungen und Beschränkungen
# unter der Lizenz sind dem Lizenztext zu entnehmen.
#
suite: test bindings type configmap
templates:
- templates/bindings_type_configmap.yaml
release:
name: eingang-manager
namespace: sh-helm-test
tests:
- it: xta bindings type
asserts:
- isKind:
of: ConfigMap
- isAPIVersion:
of: v1
- equal:
path: metadata.name
value: eingang-manager-bindings-type
- equal:
path: metadata.namespace
value: sh-helm-test
- equal:
path: data.type
value: ca-certificates
......@@ -25,6 +25,9 @@
suite: deployment bindings
templates:
- templates/deployment.yaml
release:
name: eingang-manager
namespace: sh-helm-test
set:
ozgcloud.environment: test
imagePullSecret: image-pull-secret
......@@ -45,3 +48,28 @@ tests:
name: temp-dir
emptyDir: {}
- it: should have projected namespace-ca-cert volume
asserts:
- contains:
path: spec.template.spec.volumes
content:
name: namespace-ca-cert
projected:
sources:
- secret:
name: sh-helm-test-ca-cert
optional: true
items:
- key: ca.crt
path: ca.crt
- configMap:
name: eingang-manager-bindings-type
- it: should have namespace-ca-cert volume mount
asserts:
- contains:
path: spec.template.spec.containers[0].volumeMounts
content:
name: namespace-ca-cert
mountPath: "/bindings/namespace-certificate"
readOnly: true
\ No newline at end of file
......@@ -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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment