Run all components in one namespace
Change-Id: I5fcd4d577c1fda4de27842807c7cf7a5d372756e
Issue-ID: OOM-722
Signed-off-by: BorislavG <Borislav.Glozman@amdocs.com>
diff --git a/kubernetes/aai/templates/data-router-deployment.yaml b/kubernetes/aai/templates/data-router-deployment.yaml
index 6fb1751..610ecb6 100644
--- a/kubernetes/aai/templates/data-router-deployment.yaml
+++ b/kubernetes/aai/templates/data-router-deployment.yaml
@@ -2,18 +2,18 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
- name: data-router
- namespace: "{{ .Values.nsPrefix }}-aai"
+ name: aai-data-router
+ namespace: "{{ .Values.nsPrefix }}"
spec:
replicas: {{ .Values.dataRouterReplicas }}
selector:
matchLabels:
- app: data-router
+ app: aai-data-router
template:
metadata:
labels:
- app: data-router
- name: data-router
+ app: aai-data-router
+ name: aai-data-router
spec:
initContainers:
- command:
@@ -35,10 +35,10 @@
imagePullPolicy: {{ .Values.pullPolicy }}
name: init-sysctl
volumeMounts:
- - name: data-router-logs
+ - name: aai-data-router-logs
mountPath: /logroot/
containers:
- - name: data-router
+ - name: aai-data-router
image: "{{ .Values.image.dataRouterImage }}:{{ .Values.image.dataRouterVersion }}"
imagePullPolicy: {{ .Values.pullPolicy }}
env:
@@ -62,29 +62,29 @@
readOnly: true
- mountPath: /opt/app/data-router/config/model/aai_oxm_v8.xml
subPath: aai_oxm_v8.xml
- name: data-router-model-v8
+ name: aai-data-router-model-v8
- mountPath: /opt/app/data-router/config/model/aai_oxm_v9.xml
subPath: aai_oxm_v9.xml
- name: data-router-model-v9
+ name: aai-data-router-model-v9
- mountPath: /opt/app/data-router/config/model/aai_oxm_v10.xml
subPath: aai_oxm_v10.xml
- name: data-router-model-v10
+ name: aai-data-router-model-v10
- mountPath: /opt/app/data-router/config/model/aai_oxm_v11.xml
subPath: aai_oxm_v11.xml
- name: data-router-model-v11
+ name: aai-data-router-model-v11
- mountPath: /opt/app/data-router/config/auth
- name: data-router-auth
+ name: aai-data-router-auth
- mountPath: /opt/app/data-router/config/data-router.properties
- name: data-router-properties
+ name: aai-data-router-properties
subPath: data-router.properties
- mountPath: /opt/app/data-router/dynamic/routes/entity-event.route
subPath: entity-event.route
- name: data-router-dynamic-route
+ name: aai-data-router-dynamic-route
- mountPath: /opt/app/data-router/dynamic/conf/entity-event-policy.xml
subPath: entity-event-policy.xml
- name: data-router-dynamic-policy
+ name: aai-data-router-dynamic-policy
- mountPath: /logs/
- name: data-router-logs
+ name: aai-data-router-logs
ports:
- containerPort: 9502
readinessProbe:
@@ -96,31 +96,31 @@
- name: localtime
hostPath:
path: /etc/localtime
- - name: data-router-model-v8
+ - name: aai-data-router-model-v8
configMap:
- name: data-router-model-v8-configmap
- - name: data-router-model-v9
+ name: aai-data-router-model-v8-configmap
+ - name: aai-data-router-model-v9
configMap:
- name: data-router-model-v9-configmap
- - name: data-router-model-v10
+ name: aai-data-router-model-v9-configmap
+ - name: aai-data-router-model-v10
configMap:
- name: data-router-model-v10-configmap
- - name: data-router-model-v11
+ name: aai-data-router-model-v10-configmap
+ - name: aai-data-router-model-v11
configMap:
- name: data-router-model-v11-configmap
- - name: data-router-auth
+ name: aai-data-router-model-v11-configmap
+ - name: aai-data-router-auth
secret:
- secretName: data-router-secret
- - name: data-router-properties
+ secretName: aai-data-router-secret
+ - name: aai-data-router-properties
configMap:
- name: data-router-prop-configmap
- - name: data-router-dynamic-route
+ name: aai-data-router-prop-configmap
+ - name: aai-data-router-dynamic-route
configMap:
- name: data-router-dynamic-configmap
- - name: data-router-dynamic-policy
+ name: aai-data-router-dynamic-configmap
+ - name: aai-data-router-dynamic-policy
configMap:
- name: data-router-dynamic-configmap
- - name: data-router-logs
+ name: aai-data-router-dynamic-configmap
+ - name: aai-data-router-logs
hostPath:
path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/data-router/logs"
restartPolicy: Always