summaryrefslogtreecommitdiffstats
path: root/kubernetes/aai/components/aai-search-data
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-12-07 15:34:15 +0100
committerSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-12-07 15:12:33 +0000
commit5b65132e0ad056bf96bc2a905576e309ef373e7b (patch)
treedf6c9d0ba24c8c7105518b35e9fbc454a437aff6 /kubernetes/aai/components/aai-search-data
parent2dce7527bc6a7c88934eb07f16e2b1b568fb29a6 (diff)
[AAI] Uses new tpls for repos / images
This commit makes AAI chart to use the new generator for repositories and images. Issue-ID: OOM-2364 Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com> Change-Id: I601be377556d16580f2eda6d00d144fb4a21b445
Diffstat (limited to 'kubernetes/aai/components/aai-search-data')
-rw-r--r--kubernetes/aai/components/aai-search-data/requirements.yaml26
-rw-r--r--kubernetes/aai/components/aai-search-data/templates/deployment.yaml13
-rw-r--r--kubernetes/aai/components/aai-search-data/values.yaml2
3 files changed, 34 insertions, 7 deletions
diff --git a/kubernetes/aai/components/aai-search-data/requirements.yaml b/kubernetes/aai/components/aai-search-data/requirements.yaml
new file mode 100644
index 0000000000..42641a2e5c
--- /dev/null
+++ b/kubernetes/aai/components/aai-search-data/requirements.yaml
@@ -0,0 +1,26 @@
+# Copyright © 2018 Amdocs, AT&T
+# Modifications Copyright © 2018 Bell Canada
+# 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+dependencies:
+ - name: common
+ version: ~7.x-0
+ # local reference to common chart, as it is
+ # a part of this chart's package and will not
+ # be published independently to a repo (at this point)
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~7.x-0
+ repository: '@local' \ No newline at end of file
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:
diff --git a/kubernetes/aai/components/aai-search-data/values.yaml b/kubernetes/aai/components/aai-search-data/values.yaml
index a8089d6c16..ae61dd761f 100644
--- a/kubernetes/aai/components/aai-search-data/values.yaml
+++ b/kubernetes/aai/components/aai-search-data/values.yaml
@@ -1,4 +1,5 @@
# Copyright © 2018 Amdocs, Bell Canada, 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.
@@ -20,7 +21,6 @@ global: # global defaults
# application image
-repository: nexus3.onap.org:10001
image: onap/search-data-service:1.6.2
pullPolicy: Always
restartPolicy: Always