summaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorBorislav Glozman <Borislav.Glozman@amdocs.com>2018-10-23 14:26:40 +0000
committerGerrit Code Review <gerrit@onap.org>2018-10-23 14:26:40 +0000
commit5ac2fa7fee5c4c36d683612840c5b1fad4eac7fb (patch)
tree8418eb92c5869d44aa5f6249a1d85caa3c7b9b35 /kubernetes
parentc4b032c4691f6fdd09bc795a20e48580700dcfda (diff)
parent8cd9447dfb6463f1f9229ce63a3f5aea30f6fe3b (diff)
Merge "Consistent naming for vid deployment"
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/vid/templates/deployment.yaml2
-rw-r--r--kubernetes/vid/templates/job.yaml (renamed from kubernetes/vid/templates/vid-galera-config-job.yaml)10
2 files changed, 6 insertions, 6 deletions
diff --git a/kubernetes/vid/templates/deployment.yaml b/kubernetes/vid/templates/deployment.yaml
index 46e86df473..a236754c75 100644
--- a/kubernetes/vid/templates/deployment.yaml
+++ b/kubernetes/vid/templates/deployment.yaml
@@ -35,7 +35,7 @@ spec:
- /root/job_complete.py
args:
- --job-name
- - vid-config-galera
+ - {{ include "common.fullname" . }}-galera-config
env:
- name: NAMESPACE
valueFrom:
diff --git a/kubernetes/vid/templates/vid-galera-config-job.yaml b/kubernetes/vid/templates/job.yaml
index 2bcf64749d..7d17e36f4e 100644
--- a/kubernetes/vid/templates/vid-galera-config-job.yaml
+++ b/kubernetes/vid/templates/job.yaml
@@ -15,21 +15,21 @@
apiVersion: batch/v1
kind: Job
metadata:
- name: vid-config-galera
+ name: {{ include "common.fullname" . }}-galera-config
namespace: {{ include "common.namespace" . }}
labels:
- app: vid-config-galera
+ app: {{ include "common.name" . }}-job
release: {{ .Release.Name }}
spec:
template:
metadata:
labels:
+ app: {{ include "common.name" . }}-job
release: {{ .Release.Name }}
- name: vid-galera-init
spec:
initContainers:
#This container checks that all galera instances are up before initializing it.
- - name: vid-init-galera-readiness
+ - name: {{ include "common.name" . }}-readiness
image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command:
@@ -46,7 +46,7 @@ spec:
apiVersion: v1
fieldPath: metadata.namespace
containers:
- - name: vid-config-galeradb
+ - name: {{ include "common.name" . }}-job
image: {{ .Values.mariadb_image }}
imagePullPolicy: "{{ .Values.pullPolicy }}"
volumeMounts: