aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/vid
diff options
context:
space:
mode:
authorBorislavG <Borislav.Glozman@amdocs.com>2018-02-27 15:04:26 +0000
committerAlexis de Talhouƫt <alexis.de_talhouet@bell.ca>2018-03-01 18:10:31 +0000
commit8bfc6cf8c3d338c84c48201f7a4f274958e721a9 (patch)
tree2e0e1a969afc6ae38f0a2f62cc1a36e184cb48e1 /kubernetes/vid
parentf0a34e22011b4323bbd6a51ad313d6e547808101 (diff)
Run all components in one namespace
Change-Id: I5fcd4d577c1fda4de27842807c7cf7a5d372756e Issue-ID: OOM-722 Signed-off-by: BorislavG <Borislav.Glozman@amdocs.com>
Diffstat (limited to 'kubernetes/vid')
-rw-r--r--kubernetes/vid/resources/config/log/filebeat/filebeat.yml2
-rw-r--r--kubernetes/vid/templates/all-services.yaml4
-rw-r--r--kubernetes/vid/templates/vid-lfconfig-configmap.yaml2
-rw-r--r--kubernetes/vid/templates/vid-log-configmap.yaml4
-rw-r--r--kubernetes/vid/templates/vid-mariadb-deployment.yaml2
-rw-r--r--kubernetes/vid/templates/vid-pv-pvc.yaml10
-rw-r--r--kubernetes/vid/templates/vid-server-deployment.yaml16
7 files changed, 20 insertions, 20 deletions
diff --git a/kubernetes/vid/resources/config/log/filebeat/filebeat.yml b/kubernetes/vid/resources/config/log/filebeat/filebeat.yml
index f316b866af..89c6932577 100644
--- a/kubernetes/vid/resources/config/log/filebeat/filebeat.yml
+++ b/kubernetes/vid/resources/config/log/filebeat/filebeat.yml
@@ -21,7 +21,7 @@ output.logstash:
#List of logstash server ip addresses with port number.
#But, in our case, this will be the loadbalancer IP address.
#For the below property to work the loadbalancer or logstash should expose 5044 port to listen the filebeat events or port in the property should be changed appropriately.
- hosts: ["logstash.onap-log:5044"]
+ hosts: ["logstash.{{.Values.nsPrefix}}:5044"]
#If enable will do load balancing among availabe Logstash, automatically.
loadbalance: true
diff --git a/kubernetes/vid/templates/all-services.yaml b/kubernetes/vid/templates/all-services.yaml
index 1aa2bb0a0b..cd22b7d095 100644
--- a/kubernetes/vid/templates/all-services.yaml
+++ b/kubernetes/vid/templates/all-services.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
kind: Service
metadata:
name: vid-mariadb
- namespace: "{{ .Values.nsPrefix }}-vid"
+ namespace: "{{ .Values.nsPrefix }}"
spec:
ports:
- name: vid-mariadb
@@ -20,7 +20,7 @@ metadata:
labels:
app: vid-server
name: vid-server
- namespace: "{{ .Values.nsPrefix }}-vid"
+ namespace: "{{ .Values.nsPrefix }}"
spec:
ports:
- name: vid-server
diff --git a/kubernetes/vid/templates/vid-lfconfig-configmap.yaml b/kubernetes/vid/templates/vid-lfconfig-configmap.yaml
index 1cc3f218b9..1743872ef8 100644
--- a/kubernetes/vid/templates/vid-lfconfig-configmap.yaml
+++ b/kubernetes/vid/templates/vid-lfconfig-configmap.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: vid-lfconfig-configmap
- namespace: {{ .Values.nsPrefix }}-vid
+ namespace: {{ .Values.nsPrefix }}
data:
{{ tpl (.Files.Glob "resources/config/lf_config/*").AsConfig . | indent 2 }}
#{{ end }}
diff --git a/kubernetes/vid/templates/vid-log-configmap.yaml b/kubernetes/vid/templates/vid-log-configmap.yaml
index 00481d259e..896f47dded 100644
--- a/kubernetes/vid/templates/vid-log-configmap.yaml
+++ b/kubernetes/vid/templates/vid-log-configmap.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: vid-log-configmap
- namespace: {{ .Values.nsPrefix }}-vid
+ namespace: {{ .Values.nsPrefix }}
data:
{{ tpl (.Files.Glob "resources/config/log/vid/*").AsConfig . | indent 2 }}
---
@@ -11,7 +11,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: vid-filebeat-configmap
- namespace: {{ .Values.nsPrefix }}-vid
+ namespace: {{ .Values.nsPrefix }}
data:
{{ tpl (.Files.Glob "resources/config/log/filebeat/*").AsConfig . | indent 2 }}
#{{ end }}
diff --git a/kubernetes/vid/templates/vid-mariadb-deployment.yaml b/kubernetes/vid/templates/vid-mariadb-deployment.yaml
index bf23c3f8b1..41bfb90b74 100644
--- a/kubernetes/vid/templates/vid-mariadb-deployment.yaml
+++ b/kubernetes/vid/templates/vid-mariadb-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
labels:
app: vid-mariadb
name: vid-mariadb
- namespace: "{{ .Values.nsPrefix }}-vid"
+ namespace: "{{ .Values.nsPrefix }}"
spec:
replicas: {{ .Values.vidMariaDbReplicas }}
selector:
diff --git a/kubernetes/vid/templates/vid-pv-pvc.yaml b/kubernetes/vid/templates/vid-pv-pvc.yaml
index 3315d093e3..df8d99764f 100644
--- a/kubernetes/vid/templates/vid-pv-pvc.yaml
+++ b/kubernetes/vid/templates/vid-pv-pvc.yaml
@@ -2,10 +2,10 @@
apiVersion: v1
kind: PersistentVolume
metadata:
- name: "{{ .Values.nsPrefix }}-vid-db"
- namespace: "{{ .Values.nsPrefix }}-vid"
+ name: "{{ .Values.nsPrefix }}-vid"
+ namespace: "{{ .Values.nsPrefix }}"
labels:
- name: "{{ .Values.nsPrefix }}-vid-db"
+ name: "{{ .Values.nsPrefix }}-vid"
spec:
capacity:
storage: 2Gi
@@ -19,7 +19,7 @@ kind: PersistentVolumeClaim
apiVersion: v1
metadata:
name: vid-db
- namespace: "{{ .Values.nsPrefix }}-vid"
+ namespace: "{{ .Values.nsPrefix }}"
spec:
accessModes:
- ReadWriteMany
@@ -28,5 +28,5 @@ spec:
storage: 2Gi
selector:
matchLabels:
- name: "{{ .Values.nsPrefix }}-vid-db"
+ name: "{{ .Values.nsPrefix }}-vid"
#{{ end }}
diff --git a/kubernetes/vid/templates/vid-server-deployment.yaml b/kubernetes/vid/templates/vid-server-deployment.yaml
index 7f9cb653b2..a0569abc93 100644
--- a/kubernetes/vid/templates/vid-server-deployment.yaml
+++ b/kubernetes/vid/templates/vid-server-deployment.yaml
@@ -5,7 +5,7 @@ metadata:
labels:
app: vid-server
name: vid-server
- namespace: "{{ .Values.nsPrefix }}-vid"
+ namespace: "{{ .Values.nsPrefix }}"
spec:
replicas: {{ .Values.vidServerReplicas }}
selector:
@@ -35,19 +35,19 @@ spec:
containers:
- env:
- name: ASDC_CLIENT_REST_HOST
- value: sdc-be.{{ .Values.nsPrefix }}-sdc
+ value: sdc-be.{{ .Values.nsPrefix }}
- name: ASDC_CLIENT_REST_AUTH
value: Basic dmlkOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU=
- name: ASDC_CLIENT_REST_PORT
value: "8080"
- name: VID_AAI_HOST
- value: aai-service.{{ .Values.nsPrefix }}-aai
+ value: aai-service.{{ .Values.nsPrefix }}
- name: VID_AAI_PORT
value: "8443"
- name: VID_ECOMP_SHARED_CONTEXT_REST_URL
- value: http://portalapps.{{ .Values.nsPrefix }}-portal:8989/ONAPPORTAL/context
+ value: http://portalapps.{{ .Values.nsPrefix }}:8989/ONAPPORTAL/context
- name: VID_MSO_SERVER_URL
- value: http://mso.{{ .Values.nsPrefix }}-mso:8080
+ value: http://mso.{{ .Values.nsPrefix }}:8080
- name: VID_MSO_PASS
value: OBF:1ih71i271vny1yf41ymf1ylz1yf21vn41hzj1icz
- name: MSO_DME2_SERVER_URL
@@ -55,13 +55,13 @@ spec:
- name: MSO_DME2_ENABLED
value: "false"
- name: VID_ECOMP_REDIRECT_URL
- value: http://portalapps.{{ .Values.nsPrefix }}-portal:8989/ONAPPORTAL/login.htm
+ value: http://portalapps.{{ .Values.nsPrefix }}:8989/ONAPPORTAL/login.htm
- name: VID_ECOMP_REST_URL
- value: http://portalapps.{{ .Values.nsPrefix }}-portal:8989/ONAPPORTAL/auxapi
+ value: http://portalapps.{{ .Values.nsPrefix }}:8989/ONAPPORTAL/auxapi
- name: VID_CONTACT_US_LINK
value: https://todo_contact_us_link.com
- name: VID_UEB_URL_LIST
- value: dmaap.{{ .Values.nsPrefix }}-message-router
+ value: dmaap.{{ .Values.nsPrefix }}
- name: VID_MYSQL_HOST
value: vid-mariadb
- name: VID_MYSQL_PORT