diff options
| author |   Krzysztof Opasiak <k.opasiak@samsung.com> | 2020-12-08 19:51:16 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-12-08 19:51:16 +0000 |
| commit | 208c952967efcd791eb0ffc5432c92284bc5c881 (patch) | |
| tree | cc09fdf8c86c3f9960ff35714d7934940d43d065 /kubernetes/aai/components/aai-search-data/templates | |
| parent | 0643b421d71a9a28f01d2ea9971e172c8e41e76c (diff) | |
| parent | 5b65132e0ad056bf96bc2a905576e309ef373e7b (diff) | |
Merge "[AAI] Uses new tpls for repos / images"
Diffstat (limited to 'kubernetes/aai/components/aai-search-data/templates')
| -rw-r--r-- | kubernetes/aai/components/aai-search-data/templates/deployment.yaml | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/kubernetes/aai/components/aai-search-data/templates/deployment.yaml b/kubernetes/aai/components/aai-search-data/templates/deployment.yaml index 83e8f1fd15..25145ac434 100644 --- a/kubernetes/aai/components/aai-search-data/templates/deployment.yaml +++ b/kubernetes/aai/components/aai-search-data/templates/deployment.yaml @@ -1,5 +1,6 @@ # Copyright © 2017 Amdocs, Bell Canada # Modifications Copyright © 2018 AT&T +# Modifications Copyright © 2020 Orange # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -38,14 +39,14 @@ spec: {{ if .Values.global.installSidecarSecurity }} initContainers: - name: {{ .Values.global.tproxyConfig.name }} - image: "{{ include "common.repository" . }}/{{ .Values.global.tproxyConfig.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.global.tproxyConfig.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} securityContext: privileged: true {{ end }} containers: - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} env: - name: CONFIG_HOME @@ -113,7 +114,7 @@ spec: # side car containers - name: filebeat-onap - image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}" + image: {{ include "repositoryGenerator.image.logging" . }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} volumeMounts: - mountPath: /usr/share/filebeat/filebeat.yml @@ -126,7 +127,7 @@ spec: {{ if .Values.global.installSidecarSecurity }} - name: {{ .Values.global.rproxy.name }} - image: "{{ include "common.repository" . }}/{{ .Values.global.rproxy.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.global.rproxy.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} env: - name: CONFIG_HOME @@ -171,7 +172,7 @@ spec: - containerPort: {{ .Values.global.rproxy.port }} - name: {{ .Values.global.fproxy.name }} - image: "{{ include "common.repository" . }}/{{ .Values.global.fproxy.image }}" + image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.global.fproxy.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} env: - name: CONFIG_HOME @@ -224,7 +225,7 @@ spec: emptyDir: {} - name: {{ include "common.fullname" . }}-service-log-conf configMap: - name: {{ include "common.fullname" . }}-service-log + name: {{ include "common.fullname" . }}-service-log {{ if .Values.global.installSidecarSecurity }} - name: {{ include "common.fullname" . }}-rproxy-config configMap: |