summaryrefslogtreecommitdiffstats
path: root/kubernetes/sdc
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes/sdc')
-rwxr-xr-xkubernetes/sdc/resources/config/environments/AUTO.json24
-rwxr-xr-xkubernetes/sdc/resources/config/environments/Template.json8
-rw-r--r--kubernetes/sdc/resources/config/log/filebeat/filebeat.yml2
-rwxr-xr-xkubernetes/sdc/resources/config/sdc-fe/FE_2_setup_configuration.rb2
-rw-r--r--kubernetes/sdc/templates/all-services.yaml10
-rw-r--r--kubernetes/sdc/templates/sdc-be.yaml4
-rw-r--r--kubernetes/sdc/templates/sdc-cs.yaml2
-rw-r--r--kubernetes/sdc/templates/sdc-environments-configmap.yaml2
-rw-r--r--kubernetes/sdc/templates/sdc-es.yaml2
-rw-r--r--kubernetes/sdc/templates/sdc-fe-configmap.yaml2
-rw-r--r--kubernetes/sdc/templates/sdc-fe.yaml2
-rw-r--r--kubernetes/sdc/templates/sdc-kb.yaml2
-rw-r--r--kubernetes/sdc/templates/sdc-log-configmap.yaml6
-rw-r--r--kubernetes/sdc/templates/sdc-pv-pvc.yaml10
14 files changed, 39 insertions, 39 deletions
diff --git a/kubernetes/sdc/resources/config/environments/AUTO.json b/kubernetes/sdc/resources/config/environments/AUTO.json
index 5d6eaef94e..d35590ec67 100755
--- a/kubernetes/sdc/resources/config/environments/AUTO.json
+++ b/kubernetes/sdc/resources/config/environments/AUTO.json
@@ -8,34 +8,34 @@
"chef_type": "environment",
"default_attributes": {
- "CS_VIP": "sdc-cs.onap-sdc",
- "BE_VIP": "sdc-be.onap-sdc",
- "FE_VIP": "sdc-fe.onap-sdc",
- "ES_VIP": "sdc-es.onap-sdc",
+ "CS_VIP": "sdc-cs.{{.Values.nsPrefix}}",
+ "BE_VIP": "sdc-be.{{.Values.nsPrefix}}",
+ "FE_VIP": "sdc-fe.{{.Values.nsPrefix}}",
+ "ES_VIP": "sdc-es.{{.Values.nsPrefix}}",
"interfaces": {
"application": "eth0",
"private": "eth0"
},
"ECompP": {
- "ecomp_rest_url": "http://portalapps.onap-portal:8989/ONAPPORTAL/auxapi",
- "ueb_url_list": "dmaap.onap-message-router, dmaap.onap-message-router",
+ "ecomp_rest_url": "http://portalapps.{{.Values.nsPrefix}}:8989/ONAPPORTAL/auxapi",
+ "ueb_url_list": "dmaap.{{.Values.nsPrefix}}, dmaap.{{.Values.nsPrefix}}",
"app_secret": "XftIATw9Jr3VzAcPqt3NnJOu",
"app_key": "x9UfO7JsDn8BESVX",
"inbox_name": "ECOMP-PORTAL-INBOX",
- "ecomp_redirect_url": "http://portalapps.onap-portal:8989/ONAPPORTAL/login.htm",
+ "ecomp_redirect_url": "http://portalapps.{{.Values.nsPrefix}}:8989/ONAPPORTAL/login.htm",
"app_topic_name": "ECOMP-PORTAL-OUTBOX-SDC1",
"decryption_key": "AGLDdG4D04BKm2IxIWEr8o=="
},
"UEB": {
"PublicKey": "iPIxkpAMI8qTcQj8",
"SecretKey": "Ehq3WyT4bkif4zwgEbvshGal",
- "fqdn": ["dmaap.onap-message-router", "dmaap.onap-message-router"]
+ "fqdn": ["dmaap.{{.Values.nsPrefix}}", "dmaap.{{.Values.nsPrefix}}"]
},
"Nodes": {
- "CS": "sdc-cs.onap-sdc",
- "BE": "sdc-be.onap-sdc",
- "FE": "sdc-fe.onap-sdc",
- "ES": "sdc-es.onap-sdc"
+ "CS": "sdc-cs.{{.Values.nsPrefix}}",
+ "BE": "sdc-be.{{.Values.nsPrefix}}",
+ "FE": "sdc-fe.{{.Values.nsPrefix}}",
+ "ES": "sdc-es.{{.Values.nsPrefix}}"
}
},
"override_attributes": {
diff --git a/kubernetes/sdc/resources/config/environments/Template.json b/kubernetes/sdc/resources/config/environments/Template.json
index ddddc78e2b..247e990f31 100755
--- a/kubernetes/sdc/resources/config/environments/Template.json
+++ b/kubernetes/sdc/resources/config/environments/Template.json
@@ -17,19 +17,19 @@
"private": "eth1"
},
"ECompP": {
- "ecomp_rest_url": "http://portalapps.onap-portal:8989/ONAPPORTAL/auxapi",
- "ueb_url_list": "dmaap.onap-message-router,dmaap.onap-message-router",
+ "ecomp_rest_url": "http://portalapps.{{.Values.nsPrefix}}:8989/ONAPPORTAL/auxapi",
+ "ueb_url_list": "dmaap.{{.Values.nsPrefix}},dmaap.{{.Values.nsPrefix}}",
"app_secret": "XftIATw9Jr3VzAcPqt3NnJOu",
"app_key": "x9UfO7JsDn8BESVX",
"inbox_name": "ECOMP-PORTAL-INBOX",
- "ecomp_redirect_url": "http://portalapps.onap-portal:8989/ONAPPORTAL/login.htm",
+ "ecomp_redirect_url": "http://portalapps.{{.Values.nsPrefix}}:8989/ONAPPORTAL/login.htm",
"app_topic_name": "ECOMP-PORTAL-OUTBOX-SDC1",
"decryption_key": "AGLDdG4D04BKm2IxIWEr8o=="
},
"UEB": {
"PublicKey": "iPIxkpAMI8qTcQj8",
"SecretKey": "Ehq3WyT4bkif4zwgEbvshGal",
- "fqdn": ["dmaap.onap-message-router", "dmaap.onap-message-router"]
+ "fqdn": ["dmaap.{{.Values.nsPrefix}}", "dmaap.{{.Values.nsPrefix}}"]
},
"Nodes": {
"CS": "yyy",
diff --git a/kubernetes/sdc/resources/config/log/filebeat/filebeat.yml b/kubernetes/sdc/resources/config/log/filebeat/filebeat.yml
index f316b866af..89c6932577 100644
--- a/kubernetes/sdc/resources/config/log/filebeat/filebeat.yml
+++ b/kubernetes/sdc/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/sdc/resources/config/sdc-fe/FE_2_setup_configuration.rb b/kubernetes/sdc/resources/config/sdc-fe/FE_2_setup_configuration.rb
index 9fc662ee0a..5c233a2207 100755
--- a/kubernetes/sdc/resources/config/sdc-fe/FE_2_setup_configuration.rb
+++ b/kubernetes/sdc/resources/config/sdc-fe/FE_2_setup_configuration.rb
@@ -7,7 +7,7 @@ template "catalog-fe-config" do
mode "0755"
variables({
:fe_host_ip => node['HOST_IP'],
- :be_host_ip => "sdc-be.onap-sdc",
+ :be_host_ip => "sdc-be.{{.Values.nsPrefix}}",
:catalog_port => node['BE'][:http_port],
:ssl_port => node['BE'][:https_port]
})
diff --git a/kubernetes/sdc/templates/all-services.yaml b/kubernetes/sdc/templates/all-services.yaml
index 4100dc24a4..247ee034a8 100644
--- a/kubernetes/sdc/templates/all-services.yaml
+++ b/kubernetes/sdc/templates/all-services.yaml
@@ -5,7 +5,7 @@ metadata:
labels:
app: sdc-es
name: sdc-es
- namespace: "{{ .Values.nsPrefix }}-sdc"
+ namespace: "{{ .Values.nsPrefix }}"
spec:
ports:
- name: sdc-es-port-9200
@@ -24,7 +24,7 @@ metadata:
labels:
app: sdc-cs
name: sdc-cs
- namespace: "{{ .Values.nsPrefix }}-sdc"
+ namespace: "{{ .Values.nsPrefix }}"
spec:
ports:
- name: sdc-cs-port-9042
@@ -43,7 +43,7 @@ metadata:
labels:
app: sdc-kb
name: sdc-kb
- namespace: "{{ .Values.nsPrefix }}-sdc"
+ namespace: "{{ .Values.nsPrefix }}"
spec:
ports:
- name: sdc-kb-port-5601
@@ -60,7 +60,7 @@ metadata:
labels:
app: sdc-be
name: sdc-be
- namespace: "{{ .Values.nsPrefix }}-sdc"
+ namespace: "{{ .Values.nsPrefix }}"
annotations:
msb.onap.org/service-info: '[
{
@@ -101,7 +101,7 @@ metadata:
labels:
app: sdc-fe
name: sdc-fe
- namespace: "{{ .Values.nsPrefix }}-sdc"
+ namespace: "{{ .Values.nsPrefix }}"
annotations:
msb.onap.org/service-info: '[
{
diff --git a/kubernetes/sdc/templates/sdc-be.yaml b/kubernetes/sdc/templates/sdc-be.yaml
index 3b72071099..d075277d91 100644
--- a/kubernetes/sdc/templates/sdc-be.yaml
+++ b/kubernetes/sdc/templates/sdc-be.yaml
@@ -5,7 +5,7 @@ metadata:
labels:
app: sdc-be
name: sdc-be
- namespace: "{{ .Values.nsPrefix }}-sdc"
+ namespace: "{{ .Values.nsPrefix }}"
spec:
selector:
matchLabels:
@@ -42,7 +42,7 @@ spec:
- dmaap
env:
- name: NAMESPACE
- value: {{ .Values.nsPrefix }}-message-router
+ value: {{ .Values.nsPrefix }}
image: {{ .Values.image.readiness }}
imagePullPolicy: {{ .Values.pullPolicy }}
name: sdc-dmaap-readiness
diff --git a/kubernetes/sdc/templates/sdc-cs.yaml b/kubernetes/sdc/templates/sdc-cs.yaml
index 32aba467b3..bf86de6fe2 100644
--- a/kubernetes/sdc/templates/sdc-cs.yaml
+++ b/kubernetes/sdc/templates/sdc-cs.yaml
@@ -5,7 +5,7 @@ metadata:
labels:
app: sdc-cs
name: sdc-cs
- namespace: "{{ .Values.nsPrefix }}-sdc"
+ namespace: "{{ .Values.nsPrefix }}"
spec:
selector:
matchLabels:
diff --git a/kubernetes/sdc/templates/sdc-environments-configmap.yaml b/kubernetes/sdc/templates/sdc-environments-configmap.yaml
index f8456b0efe..e1ff5581fd 100644
--- a/kubernetes/sdc/templates/sdc-environments-configmap.yaml
+++ b/kubernetes/sdc/templates/sdc-environments-configmap.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: sdc-environments-configmap
- namespace: {{ .Values.nsPrefix }}-sdc
+ namespace: {{ .Values.nsPrefix }}
data:
{{ tpl (.Files.Glob "resources/config/environments/*").AsConfig . | indent 2 }}
#{{ end }}
diff --git a/kubernetes/sdc/templates/sdc-es.yaml b/kubernetes/sdc/templates/sdc-es.yaml
index 1a2f70d77e..979c70df5b 100644
--- a/kubernetes/sdc/templates/sdc-es.yaml
+++ b/kubernetes/sdc/templates/sdc-es.yaml
@@ -5,7 +5,7 @@ metadata:
labels:
app: sdc-es
name: sdc-es
- namespace: "{{ .Values.nsPrefix }}-sdc"
+ namespace: "{{ .Values.nsPrefix }}"
spec:
selector:
matchLabels:
diff --git a/kubernetes/sdc/templates/sdc-fe-configmap.yaml b/kubernetes/sdc/templates/sdc-fe-configmap.yaml
index 2f60ef88e3..05c0a1645c 100644
--- a/kubernetes/sdc/templates/sdc-fe-configmap.yaml
+++ b/kubernetes/sdc/templates/sdc-fe-configmap.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: sdc-fe-configmap
- namespace: {{ .Values.nsPrefix }}-sdc
+ namespace: {{ .Values.nsPrefix }}
data:
{{ tpl (.Files.Glob "resources/config/sdc-fe/*").AsConfig . | indent 2 }}
#{{ end }}
diff --git a/kubernetes/sdc/templates/sdc-fe.yaml b/kubernetes/sdc/templates/sdc-fe.yaml
index d1144d999e..adcec19ffe 100644
--- a/kubernetes/sdc/templates/sdc-fe.yaml
+++ b/kubernetes/sdc/templates/sdc-fe.yaml
@@ -5,7 +5,7 @@ metadata:
labels:
app: sdc-fe
name: sdc-fe
- namespace: "{{ .Values.nsPrefix }}-sdc"
+ namespace: "{{ .Values.nsPrefix }}"
spec:
selector:
matchLabels:
diff --git a/kubernetes/sdc/templates/sdc-kb.yaml b/kubernetes/sdc/templates/sdc-kb.yaml
index a0a00a0d39..90fc6f2a21 100644
--- a/kubernetes/sdc/templates/sdc-kb.yaml
+++ b/kubernetes/sdc/templates/sdc-kb.yaml
@@ -5,7 +5,7 @@ metadata:
labels:
app: sdc-kb
name: sdc-kb
- namespace: "{{ .Values.nsPrefix }}-sdc"
+ namespace: "{{ .Values.nsPrefix }}"
spec:
selector:
matchLabels:
diff --git a/kubernetes/sdc/templates/sdc-log-configmap.yaml b/kubernetes/sdc/templates/sdc-log-configmap.yaml
index c79f9e064c..f2b5c09d0b 100644
--- a/kubernetes/sdc/templates/sdc-log-configmap.yaml
+++ b/kubernetes/sdc/templates/sdc-log-configmap.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: sdc-log-be-configmap
- namespace: {{ .Values.nsPrefix }}-sdc
+ namespace: {{ .Values.nsPrefix }}
data:
{{ tpl (.Files.Glob "resources/config/log/be/*").AsConfig . | indent 2 }}
---
@@ -11,7 +11,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: sdc-filebeat-configmap
- namespace: {{ .Values.nsPrefix }}-sdc
+ namespace: {{ .Values.nsPrefix }}
data:
{{ tpl (.Files.Glob "resources/config/log/filebeat/*").AsConfig . | indent 2 }}
#{{ end }}
@@ -21,7 +21,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: sdc-log-fe-configmap
- namespace: {{ .Values.nsPrefix }}-sdc
+ namespace: {{ .Values.nsPrefix }}
data:
{{ tpl (.Files.Glob "resources/config/log/fe/*").AsConfig . | indent 2 }}
#{{ end }}
diff --git a/kubernetes/sdc/templates/sdc-pv-pvc.yaml b/kubernetes/sdc/templates/sdc-pv-pvc.yaml
index 254e55132b..8d9becf2d5 100644
--- a/kubernetes/sdc/templates/sdc-pv-pvc.yaml
+++ b/kubernetes/sdc/templates/sdc-pv-pvc.yaml
@@ -2,10 +2,10 @@
apiVersion: v1
kind: PersistentVolume
metadata:
- name: "{{ .Values.nsPrefix }}-sdc-cs-db"
- namespace: "{{ .Values.nsPrefix }}-sdc"
+ name: "{{ .Values.nsPrefix }}-sdc"
+ namespace: "{{ .Values.nsPrefix }}"
labels:
- name: "{{ .Values.nsPrefix }}-sdc-cs-db"
+ name: "{{ .Values.nsPrefix }}-sdc"
spec:
capacity:
storage: 2Gi
@@ -19,7 +19,7 @@ kind: PersistentVolumeClaim
apiVersion: v1
metadata:
name: sdc-cs-db
- namespace: "{{ .Values.nsPrefix }}-sdc"
+ namespace: "{{ .Values.nsPrefix }}"
spec:
accessModes:
- ReadWriteMany
@@ -28,5 +28,5 @@ spec:
storage: 2Gi
selector:
matchLabels:
- name: "{{ .Values.nsPrefix }}-sdc-cs-db"
+ name: "{{ .Values.nsPrefix }}-sdc"
#{{ end }}