diff options
| author |   Alexis de Talhouët <alexis.de_talhouet@bell.ca> | 2018-12-07 18:13:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-12-07 18:13:18 +0000 |
| commit | 36284a43dd0da905a1e033ffd381892e1feaffdc (patch) | |
| tree | feca1a4ff15f39a67af3fad26201ca6143fa9ae9 /templates | |
| parent | a3813832985a30642d56b4ae49fe45d4170ece0d (diff) | |
| parent | 97a8b0f8162138d048cc6f7b1f901f1787fa1b17 (diff) | |
Merge "Add Pluggable Security to aai-resources"
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/configmap.yaml | 4 | ||||
| -rw-r--r-- | templates/deployment.yaml | 8 |
2 files changed, 12 insertions, 0 deletions
diff --git a/templates/configmap.yaml b/templates/configmap.yaml index 212f9cd..a23ed5f 100644 --- a/templates/configmap.yaml +++ b/templates/configmap.yaml @@ -37,7 +37,11 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} data: +{{ if .Values.global.installSidecarSecurity }} +{{ tpl (.Files.Glob "resources/config/haproxy/haproxy-pluggable-security.cfg").AsConfig . | indent 2 }} +{{ else }} {{ tpl (.Files.Glob "resources/config/haproxy/haproxy.cfg").AsConfig . | indent 2 }} +{{ end }} --- apiVersion: v1 kind: Secret diff --git a/templates/deployment.yaml b/templates/deployment.yaml index 3f16e25..1f337e4 100644 --- a/templates/deployment.yaml +++ b/templates/deployment.yaml @@ -64,7 +64,11 @@ spec: - mountPath: /dev/log name: aai-service-log - mountPath: /usr/local/etc/haproxy/haproxy.cfg + {{ if .Values.global.installSidecarSecurity }} + subPath: haproxy-pluggable-security.cfg + {{ else }} subPath: haproxy.cfg + {{ end }} name: haproxy-cfg ports: - containerPort: {{ .Values.service.internalPort }} @@ -86,6 +90,10 @@ spec: httpHeaders: - name: X-FromAppId value: OOM_ReadinessCheck + {{ if .Values.global.installSidecarSecurity }} + - name: Authorization + value: Basic YWFpQGFhaS5vbmFwLm9yZzpkZW1vMTIzNDU2IQ== + {{ end }} - name: X-TransactionId value: {{ uuidv4 }} - name: Accept |