summaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorDominic Lunanuova <dgl@research.att.com>2018-04-30 19:01:31 +0000
committerBorislavG <Borislav.Glozman@amdocs.com>2018-05-08 08:56:15 +0000
commit1ba2b2560856dae9f921745ca1298bb19ea57a96 (patch)
tree4012c4e36173f81569df2bd88d549c6e4a07d079 /kubernetes
parent5550c20ed2dda8648c2bc5fec6b4e0d4b2b18add (diff)
Merge message-router chart under dmaap
Borislav: Fixed Makefile and renamed charts. Also cosmetic fixes. Includes corrections for the service name of MR used by dbc to be "message-router", which matches the message-router chart Patchset 2: standardize abbreviation for bus-controller to be "dbc" Patchset 3: correct references in README to match what is deployed Patchset 4: blew previous commit. Also added dmaap/Makefile lint step Change-Id: I36c07c7c1200f8e23ae12bd7357a5626346dcccd Signed-off-by: Dominic Lunanuova <dgl@research.att.com> Issue-ID: DMAAP-386 Signed-off-by: Dominic Lunanuova <dgl@research.att.com>
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/dmaap/Chart.yaml2
-rw-r--r--kubernetes/dmaap/Makefile12
-rw-r--r--kubernetes/dmaap/README.md18
-rw-r--r--kubernetes/dmaap/charts/dmaap-bus-controller/templates/NOTES.txt14
-rw-r--r--kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml26
-rw-r--r--kubernetes/dmaap/charts/message-router/.helmignore (renamed from kubernetes/message-router/.helmignore)0
-rw-r--r--kubernetes/dmaap/charts/message-router/Chart.yaml (renamed from kubernetes/message-router/Chart.yaml)1
-rw-r--r--kubernetes/dmaap/charts/message-router/charts/message-router-kafka/.helmignore (renamed from kubernetes/message-router/charts/kafka/.helmignore)0
-rw-r--r--kubernetes/dmaap/charts/message-router/charts/message-router-kafka/Chart.yaml (renamed from kubernetes/message-router/charts/kafka/Chart.yaml)4
-rw-r--r--kubernetes/dmaap/charts/message-router/charts/message-router-kafka/templates/NOTES.txt (renamed from kubernetes/message-router/templates/NOTES.txt)14
-rw-r--r--kubernetes/dmaap/charts/message-router/charts/message-router-kafka/templates/deployment.yaml (renamed from kubernetes/message-router/charts/kafka/templates/deployment.yaml)4
-rw-r--r--kubernetes/dmaap/charts/message-router/charts/message-router-kafka/templates/pv.yaml (renamed from kubernetes/message-router/charts/kafka/templates/pv.yaml)0
-rw-r--r--kubernetes/dmaap/charts/message-router/charts/message-router-kafka/templates/pvc.yaml (renamed from kubernetes/message-router/charts/kafka/templates/pvc.yaml)0
-rw-r--r--kubernetes/dmaap/charts/message-router/charts/message-router-kafka/templates/service.yaml (renamed from kubernetes/message-router/charts/kafka/templates/service.yaml)2
-rw-r--r--kubernetes/dmaap/charts/message-router/charts/message-router-kafka/values.yaml (renamed from kubernetes/message-router/charts/kafka/values.yaml)11
-rw-r--r--kubernetes/dmaap/charts/message-router/charts/message-router-zookeeper/.helmignore (renamed from kubernetes/message-router/charts/zookeeper/.helmignore)0
-rw-r--r--kubernetes/dmaap/charts/message-router/charts/message-router-zookeeper/Chart.yaml (renamed from kubernetes/message-router/charts/zookeeper/Chart.yaml)4
-rw-r--r--kubernetes/dmaap/charts/message-router/charts/message-router-zookeeper/templates/NOTES.txt (renamed from kubernetes/message-router/charts/zookeeper/templates/NOTES.txt)14
-rw-r--r--kubernetes/dmaap/charts/message-router/charts/message-router-zookeeper/templates/deployment.yaml (renamed from kubernetes/message-router/charts/zookeeper/templates/deployment.yaml)0
-rw-r--r--kubernetes/dmaap/charts/message-router/charts/message-router-zookeeper/templates/pv.yaml (renamed from kubernetes/message-router/charts/zookeeper/templates/pv.yaml)0
-rw-r--r--kubernetes/dmaap/charts/message-router/charts/message-router-zookeeper/templates/pvc.yaml (renamed from kubernetes/message-router/charts/zookeeper/templates/pvc.yaml)0
-rw-r--r--kubernetes/dmaap/charts/message-router/charts/message-router-zookeeper/templates/service.yaml (renamed from kubernetes/message-router/charts/zookeeper/templates/service.yaml)0
-rw-r--r--kubernetes/dmaap/charts/message-router/charts/message-router-zookeeper/values.yaml (renamed from kubernetes/message-router/charts/zookeeper/values.yaml)3
-rw-r--r--kubernetes/dmaap/charts/message-router/requirements.yaml (renamed from kubernetes/message-router/requirements.yaml)0
-rwxr-xr-xkubernetes/dmaap/charts/message-router/resources/config/dmaap/MsgRtrApi.properties (renamed from kubernetes/message-router/resources/config/dmaap/MsgRtrApi.properties)12
-rwxr-xr-xkubernetes/dmaap/charts/message-router/resources/config/dmaap/cadi.properties (renamed from kubernetes/message-router/resources/config/dmaap/cadi.properties)0
-rwxr-xr-xkubernetes/dmaap/charts/message-router/resources/config/dmaap/mykey (renamed from kubernetes/message-router/resources/config/dmaap/mykey)0
-rw-r--r--kubernetes/dmaap/charts/message-router/templates/NOTES.txt (renamed from kubernetes/message-router/charts/kafka/templates/NOTES.txt)14
-rw-r--r--kubernetes/dmaap/charts/message-router/templates/configmap.yaml29
-rw-r--r--kubernetes/dmaap/charts/message-router/templates/deployment.yaml (renamed from kubernetes/message-router/templates/deployment.yaml)4
-rw-r--r--kubernetes/dmaap/charts/message-router/templates/secrets.yaml (renamed from kubernetes/message-router/templates/secrets.yaml)0
-rw-r--r--kubernetes/dmaap/charts/message-router/templates/service.yaml (renamed from kubernetes/message-router/templates/service.yaml)0
-rw-r--r--kubernetes/dmaap/charts/message-router/values.yaml (renamed from kubernetes/message-router/values.yaml)12
-rw-r--r--kubernetes/dmaap/values.yaml3
-rw-r--r--kubernetes/message-router/templates/configmap.yaml15
-rw-r--r--kubernetes/onap/requirements.yaml4
-rw-r--r--kubernetes/onap/resources/environments/dev.yaml4
-rw-r--r--kubernetes/onap/resources/environments/disable-allcharts.yaml4
-rw-r--r--kubernetes/onap/values.yaml2
39 files changed, 158 insertions, 74 deletions
diff --git a/kubernetes/dmaap/Chart.yaml b/kubernetes/dmaap/Chart.yaml
index a83b50b2d3..b18e59d785 100644
--- a/kubernetes/dmaap/Chart.yaml
+++ b/kubernetes/dmaap/Chart.yaml
@@ -13,6 +13,6 @@
# limitations under the License.
apiVersion: v1
-description: a Helm chart to deploy ONAP DMaaP componetns in Kubernetes
+description: ONAP DMaaP components
name: dmaap
version: 2.0.0
diff --git a/kubernetes/dmaap/Makefile b/kubernetes/dmaap/Makefile
index 36ca4f5a9f..d80a9213d0 100644
--- a/kubernetes/dmaap/Makefile
+++ b/kubernetes/dmaap/Makefile
@@ -12,5 +12,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-make-dmaap:
- cd charts && helm dep up dmaap-bus-controller
+make-dmaap: make-bus-controller make-message-router
+
+make-bus-controller:
+ cd charts && helm dep up dmaap-bus-controller && helm lint dmaap-bus-controller
+
+make-message-router:
+ cd charts && helm dep up message-router && helm lint message-router
+
+clean:
+ @find . -type f -name '*.tgz' -delete
diff --git a/kubernetes/dmaap/README.md b/kubernetes/dmaap/README.md
index e185fdc6a7..ad81b2f6e6 100644
--- a/kubernetes/dmaap/README.md
+++ b/kubernetes/dmaap/README.md
@@ -1,11 +1,25 @@
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
+#
+# 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.
+
# Helm Chart for ONAP DMaaP Applications
ONAP includes the following Kubernetes services:
1) message-router - a message bus for applications
-2) dmaap-prov - an API to provision DMaaP resources
+2) dbc-api - an API to provision DMaaP resources
# Service Dependencies
message-router depends on AAF
-dmaap-prov depends on AAF and Postgresql. NOTE: until Postgresql is available as a common service in ONAP, this chart deploys a private instance based on kubernetes/stable chart
+dbc-api depends on AAF and Postgresql. \ No newline at end of file
diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/templates/NOTES.txt b/kubernetes/dmaap/charts/dmaap-bus-controller/templates/NOTES.txt
index fbab5a3758..254c6bf2a2 100644
--- a/kubernetes/dmaap/charts/dmaap-bus-controller/templates/NOTES.txt
+++ b/kubernetes/dmaap/charts/dmaap-bus-controller/templates/NOTES.txt
@@ -1,3 +1,17 @@
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
+#
+# 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.
+
1. Get the application URL by running these commands:
{{- if .Values.ingress.enabled }}
{{- range .Values.ingress.hosts }}
diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml b/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml
index 14b23e5084..2b4067d886 100644
--- a/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml
+++ b/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml
@@ -36,8 +36,8 @@ image: onap/dmaap/buscontroller:1.0.8
# application configuration
-dmaapMessageRouterService: dmaap
-aafURL: https://onap-aaf:8905/proxy/
+dmaapMessageRouterService: message-router
+aafURL: https://aaf-authz/
topicMgrUser: m23456@dmaapbc.onap.org
topicMgrPwd: onapdemo
adminUser: m12345@dmaapbc.onap.org
@@ -61,32 +61,38 @@ readiness:
service:
- type: ClusterIP
+ type: NodePort
name: dmaap-bc
+ portName: dmaap-bc
+ portName2: dmaap-bc
externalPort: 8080
internalPort: 8080
externalPort2: 8443
internalPort2: 8443
+ nodePort: 41
+ nodePort2: 42
# application configuration override for postgres
postgres:
- nameOverride: dbcl-db
+ nameOverride: dbc-pg
service:
- name: dbcl-postgres
- name2: dbcl-pg-primary
- name3: dbcl-pg-replica
+ name: dbc-postgres
+ name2: dbc-pg-primary
+ name3: dbc-pg-replica
container:
name:
- primary: dbcl-pg-primary
- replica: dbcl-pg-replica
+ primary: dbc-pg-primary
+ replica: dbc-pg-replica
config:
pgUserName: dmaap_admin
pgDatabase: dmaap
pgPrimaryPassword: onapdemodb
pgUserPassword: onapdemodb
pgRootPassword: onapdemodb
-
+ persistence:
+ mountSubPath: dbc/data
+ mountInitPath: dbc
ingress:
enabled: false
diff --git a/kubernetes/message-router/.helmignore b/kubernetes/dmaap/charts/message-router/.helmignore
index f0c1319444..f0c1319444 100644
--- a/kubernetes/message-router/.helmignore
+++ b/kubernetes/dmaap/charts/message-router/.helmignore
diff --git a/kubernetes/message-router/Chart.yaml b/kubernetes/dmaap/charts/message-router/Chart.yaml
index b3a7491d78..dd7371cde4 100644
--- a/kubernetes/message-router/Chart.yaml
+++ b/kubernetes/dmaap/charts/message-router/Chart.yaml
@@ -13,7 +13,6 @@
# limitations under the License.
apiVersion: v1
-appVersion: "1.0"
description: ONAP Message Router
name: message-router
version: 2.0.0
diff --git a/kubernetes/message-router/charts/kafka/.helmignore b/kubernetes/dmaap/charts/message-router/charts/message-router-kafka/.helmignore
index f0c1319444..f0c1319444 100644
--- a/kubernetes/message-router/charts/kafka/.helmignore
+++ b/kubernetes/dmaap/charts/message-router/charts/message-router-kafka/.helmignore
diff --git a/kubernetes/message-router/charts/kafka/Chart.yaml b/kubernetes/dmaap/charts/message-router/charts/message-router-kafka/Chart.yaml
index b26f91a04e..1457fa89b4 100644
--- a/kubernetes/message-router/charts/kafka/Chart.yaml
+++ b/kubernetes/dmaap/charts/message-router/charts/message-router-kafka/Chart.yaml
@@ -13,7 +13,7 @@
# limitations under the License.
apiVersion: v1
-description: ONAP Global Kafka Service
-name: kafka
+description: ONAP Message Router Kafka Service
+name: message-router-kafka
version: 2.0.0
diff --git a/kubernetes/message-router/templates/NOTES.txt b/kubernetes/dmaap/charts/message-router/charts/message-router-kafka/templates/NOTES.txt
index c60c745ca3..f6e6e930b3 100644
--- a/kubernetes/message-router/templates/NOTES.txt
+++ b/kubernetes/dmaap/charts/message-router/charts/message-router-kafka/templates/NOTES.txt
@@ -1,3 +1,17 @@
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
+#
+# 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.
+
1. Get the application URL by running these commands:
{{- if .Values.ingress.enabled }}
{{- range .Values.ingress.hosts }}
diff --git a/kubernetes/message-router/charts/kafka/templates/deployment.yaml b/kubernetes/dmaap/charts/message-router/charts/message-router-kafka/templates/deployment.yaml
index a4e13cdab6..25ab2101cf 100644
--- a/kubernetes/message-router/charts/kafka/templates/deployment.yaml
+++ b/kubernetes/dmaap/charts/message-router/charts/message-router-kafka/templates/deployment.yaml
@@ -46,7 +46,7 @@ spec:
- /root/ready.py
args:
- --container-name
- - {{ .Values.zookeeper.nameOverride }}
+ - {{ .Values.zookeeper.name }}
env:
- name: NAMESPACE
valueFrom:
@@ -78,7 +78,7 @@ spec:
periodSeconds: {{ .Values.readiness.periodSeconds }}
env:
- name: KAFKA_ZOOKEEPER_CONNECT
- value: "{{.Values.zookeeper.nameOverride}}:{{.Values.config.zookeeperPort}}"
+ value: "{{.Values.zookeeper.name}}:{{.Values.zookeeper.port}}"
- name: KAFKA_ADVERTISED_HOST_NAME
value: "{{ include "common.servicename" . }}"
- name: KAFKA_BROKER_ID
diff --git a/kubernetes/message-router/charts/kafka/templates/pv.yaml b/kubernetes/dmaap/charts/message-router/charts/message-router-kafka/templates/pv.yaml
index da117f4919..da117f4919 100644
--- a/kubernetes/message-router/charts/kafka/templates/pv.yaml
+++ b/kubernetes/dmaap/charts/message-router/charts/message-router-kafka/templates/pv.yaml
diff --git a/kubernetes/message-router/charts/kafka/templates/pvc.yaml b/kubernetes/dmaap/charts/message-router/charts/message-router-kafka/templates/pvc.yaml
index e27c3311e9..e27c3311e9 100644
--- a/kubernetes/message-router/charts/kafka/templates/pvc.yaml
+++ b/kubernetes/dmaap/charts/message-router/charts/message-router-kafka/templates/pvc.yaml
diff --git a/kubernetes/message-router/charts/kafka/templates/service.yaml b/kubernetes/dmaap/charts/message-router/charts/message-router-kafka/templates/service.yaml
index c57d190bb9..117a8a9714 100644
--- a/kubernetes/message-router/charts/kafka/templates/service.yaml
+++ b/kubernetes/dmaap/charts/message-router/charts/message-router-kafka/templates/service.yaml
@@ -26,7 +26,7 @@ spec:
ports:
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
- name: {{ .Values.service.name }}
+ name: {{ .Values.service.portName }}
selector:
app: {{ include "common.name" . }}
release: {{ .Release.Name }}
diff --git a/kubernetes/message-router/charts/kafka/values.yaml b/kubernetes/dmaap/charts/message-router/charts/message-router-kafka/values.yaml
index 7675ee80b7..0e7c2b72f7 100644
--- a/kubernetes/message-router/charts/kafka/values.yaml
+++ b/kubernetes/dmaap/charts/message-router/charts/message-router-kafka/values.yaml
@@ -31,18 +31,18 @@ global:
#################################################################
# application image
repository: docker.io
-image: wurstmeister/kafka:latest
+image: wurstmeister/kafka:1.1.0
pullPolicy: Always
zookeeper:
- nameOverride: zookeeper
+ name: message-router-zookeeper
+ port: 2181
# flag to enable debugging - application support required
debugEnabled: false
# application configuration
-config:
- zookeeperPort: 2181
+config: {}
# default number of instances
replicaCount: 1
@@ -88,7 +88,8 @@ persistence:
service:
type: NodePort
- name: global-kafka
+ name: message-router-kafka
+ portName: message-router-kafka
internalPort: 9092
externalPort: 9092
diff --git a/kubernetes/message-router/charts/zookeeper/.helmignore b/kubernetes/dmaap/charts/message-router/charts/message-router-zookeeper/.helmignore
index f0c1319444..f0c1319444 100644
--- a/kubernetes/message-router/charts/zookeeper/.helmignore
+++ b/kubernetes/dmaap/charts/message-router/charts/message-router-zookeeper/.helmignore
diff --git a/kubernetes/message-router/charts/zookeeper/Chart.yaml b/kubernetes/dmaap/charts/message-router/charts/message-router-zookeeper/Chart.yaml
index dd999e5314..49ac35beff 100644
--- a/kubernetes/message-router/charts/zookeeper/Chart.yaml
+++ b/kubernetes/dmaap/charts/message-router/charts/message-router-zookeeper/Chart.yaml
@@ -13,7 +13,7 @@
# limitations under the License.
apiVersion: v1
-description: ONAP Dmaap Zookeeper Service
-name: zookeeper
+description: ONAP Dmaap Message Router Zookeeper Service
+name: message-router-zookeeper
version: 2.0.0
diff --git a/kubernetes/message-router/charts/zookeeper/templates/NOTES.txt b/kubernetes/dmaap/charts/message-router/charts/message-router-zookeeper/templates/NOTES.txt
index c60c745ca3..f6e6e930b3 100644
--- a/kubernetes/message-router/charts/zookeeper/templates/NOTES.txt
+++ b/kubernetes/dmaap/charts/message-router/charts/message-router-zookeeper/templates/NOTES.txt
@@ -1,3 +1,17 @@
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
+#
+# 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.
+
1. Get the application URL by running these commands:
{{- if .Values.ingress.enabled }}
{{- range .Values.ingress.hosts }}
diff --git a/kubernetes/message-router/charts/zookeeper/templates/deployment.yaml b/kubernetes/dmaap/charts/message-router/charts/message-router-zookeeper/templates/deployment.yaml
index 678b83e3bd..678b83e3bd 100644
--- a/kubernetes/message-router/charts/zookeeper/templates/deployment.yaml
+++ b/kubernetes/dmaap/charts/message-router/charts/message-router-zookeeper/templates/deployment.yaml
diff --git a/kubernetes/message-router/charts/zookeeper/templates/pv.yaml b/kubernetes/dmaap/charts/message-router/charts/message-router-zookeeper/templates/pv.yaml
index da117f4919..da117f4919 100644
--- a/kubernetes/message-router/charts/zookeeper/templates/pv.yaml
+++ b/kubernetes/dmaap/charts/message-router/charts/message-router-zookeeper/templates/pv.yaml
diff --git a/kubernetes/message-router/charts/zookeeper/templates/pvc.yaml b/kubernetes/dmaap/charts/message-router/charts/message-router-zookeeper/templates/pvc.yaml
index e27c3311e9..e27c3311e9 100644
--- a/kubernetes/message-router/charts/zookeeper/templates/pvc.yaml
+++ b/kubernetes/dmaap/charts/message-router/charts/message-router-zookeeper/templates/pvc.yaml
diff --git a/kubernetes/message-router/charts/zookeeper/templates/service.yaml b/kubernetes/dmaap/charts/message-router/charts/message-router-zookeeper/templates/service.yaml
index 2386125587..2386125587 100644
--- a/kubernetes/message-router/charts/zookeeper/templates/service.yaml
+++ b/kubernetes/dmaap/charts/message-router/charts/message-router-zookeeper/templates/service.yaml
diff --git a/kubernetes/message-router/charts/zookeeper/values.yaml b/kubernetes/dmaap/charts/message-router/charts/message-router-zookeeper/values.yaml
index 8a419704c8..517a7c993d 100644
--- a/kubernetes/message-router/charts/zookeeper/values.yaml
+++ b/kubernetes/dmaap/charts/message-router/charts/message-router-zookeeper/values.yaml
@@ -84,7 +84,8 @@ persistence:
service:
type: NodePort
- name: zookeeper
+ name: message-router-zookeeper
+ portName: message-router-zookeeper
internalPort: 2181
ingress:
diff --git a/kubernetes/message-router/requirements.yaml b/kubernetes/dmaap/charts/message-router/requirements.yaml
index 7beecb385c..7beecb385c 100644
--- a/kubernetes/message-router/requirements.yaml
+++ b/kubernetes/dmaap/charts/message-router/requirements.yaml
diff --git a/kubernetes/message-router/resources/config/dmaap/MsgRtrApi.properties b/kubernetes/dmaap/charts/message-router/resources/config/dmaap/MsgRtrApi.properties
index ed3999d36e..4015e941a6 100755
--- a/kubernetes/message-router/resources/config/dmaap/MsgRtrApi.properties
+++ b/kubernetes/dmaap/charts/message-router/resources/config/dmaap/MsgRtrApi.properties
@@ -29,11 +29,7 @@
##
## Both Cambria and Kafka make use of Zookeeper.
##
-config.zk.servers={{.Values.zookeeper.nameOverride}}:{{.Values.config.zookeeperPort}}
-#config.zk.servers=172.17.0.1:2181
-#dmaap.onap-message-router:2181
-#10.208.128.229:2181
-#config.zk.root=/fe3c/cambria/config
+config.zk.servers={{.Values.zookeeper.name}}:{{.Values.zookeeper.port}}
###############################################################################
@@ -43,11 +39,7 @@ config.zk.servers={{.Values.zookeeper.nameOverride}}:{{.Values.config.zookeeperP
## Items below are passed through to Kafka's producer and consumer
## configurations (after removing "kafka.")
## if you want to change request.required.acks it can take this one value
-#kafka.metadata.broker.list=localhost:9092,localhost:9093
-kafka.metadata.broker.list={{.Values.kafka.nameOverride}}:{{.Values.config.kafkaPort}}
-#kafka.metadata.broker.list=172.17.0.1:9092
-#dmaap.onap-message-router:9092
-#10.208.128.229:9092
+kafka.metadata.broker.list={{.Values.kafka.name}}:{{.Values.kafka.port}}
##kafka.request.required.acks=-1
#kafka.client.zookeeper=${config.zk.servers}
consumer.timeout.ms=100
diff --git a/kubernetes/message-router/resources/config/dmaap/cadi.properties b/kubernetes/dmaap/charts/message-router/resources/config/dmaap/cadi.properties
index 9079794517..9079794517 100755
--- a/kubernetes/message-router/resources/config/dmaap/cadi.properties
+++ b/kubernetes/dmaap/charts/message-router/resources/config/dmaap/cadi.properties
diff --git a/kubernetes/message-router/resources/config/dmaap/mykey b/kubernetes/dmaap/charts/message-router/resources/config/dmaap/mykey
index c2b8b8779b..c2b8b8779b 100755
--- a/kubernetes/message-router/resources/config/dmaap/mykey
+++ b/kubernetes/dmaap/charts/message-router/resources/config/dmaap/mykey
diff --git a/kubernetes/message-router/charts/kafka/templates/NOTES.txt b/kubernetes/dmaap/charts/message-router/templates/NOTES.txt
index c60c745ca3..f6e6e930b3 100644
--- a/kubernetes/message-router/charts/kafka/templates/NOTES.txt
+++ b/kubernetes/dmaap/charts/message-router/templates/NOTES.txt
@@ -1,3 +1,17 @@
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
+#
+# 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.
+
1. Get the application URL by running these commands:
{{- if .Values.ingress.enabled }}
{{- range .Values.ingress.hosts }}
diff --git a/kubernetes/dmaap/charts/message-router/templates/configmap.yaml b/kubernetes/dmaap/charts/message-router/templates/configmap.yaml
new file mode 100644
index 0000000000..9816bd9ca6
--- /dev/null
+++ b/kubernetes/dmaap/charts/message-router/templates/configmap.yaml
@@ -0,0 +1,29 @@
+# Copyright © 2017 Amdocs, Bell Canada
+#
+# 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.
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: {{ include "common.fullname" . }}-msgrtrapi-prop-configmap
+ namespace: {{ include "common.namespace" . }}
+data:
+{{ tpl (.Files.Glob "resources/config/dmaap/MsgRtrApi.properties").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: {{ include "common.fullname" . }}-cadi-prop-configmap
+ namespace: {{ include "common.namespace" . }}
+data:
+{{ tpl (.Files.Glob "resources/config/dmaap/cadi.properties").AsConfig . | indent 2 }}
diff --git a/kubernetes/message-router/templates/deployment.yaml b/kubernetes/dmaap/charts/message-router/templates/deployment.yaml
index ed3c4ebb7a..379fc24594 100644
--- a/kubernetes/message-router/templates/deployment.yaml
+++ b/kubernetes/dmaap/charts/message-router/templates/deployment.yaml
@@ -34,9 +34,9 @@ spec:
- /root/ready.py
args:
- --container-name
- - {{ .Values.kafka.nameOverride }}
+ - {{ .Values.kafka.name }}
- --container-name
- - {{ .Values.zookeeper.nameOverride }}
+ - {{ .Values.zookeeper.name }}
env:
- name: NAMESPACE
valueFrom:
diff --git a/kubernetes/message-router/templates/secrets.yaml b/kubernetes/dmaap/charts/message-router/templates/secrets.yaml
index a7f6e18b39..a7f6e18b39 100644
--- a/kubernetes/message-router/templates/secrets.yaml
+++ b/kubernetes/dmaap/charts/message-router/templates/secrets.yaml
diff --git a/kubernetes/message-router/templates/service.yaml b/kubernetes/dmaap/charts/message-router/templates/service.yaml
index 45c2616ec9..45c2616ec9 100644
--- a/kubernetes/message-router/templates/service.yaml
+++ b/kubernetes/dmaap/charts/message-router/templates/service.yaml
diff --git a/kubernetes/message-router/values.yaml b/kubernetes/dmaap/charts/message-router/values.yaml
index 181368d885..c69fe53cb2 100644
--- a/kubernetes/message-router/values.yaml
+++ b/kubernetes/dmaap/charts/message-router/values.yaml
@@ -31,20 +31,18 @@ repository: nexus3.onap.org:10001
image: onap/dmaap/dmaap-mr:1.1.4
pullPolicy: Always
-nameOverride: dmaap
-
kafka:
- nameOverride: global-kafka
+ name: message-router-kafka
+ port: 9092
zookeeper:
- nameOverride: zookeeper
+ name: message-router-zookeeper
+ port: 2181
# flag to enable debugging - application support required
debugEnabled: false
# application configuration
-config:
- zookeeperPort: 2181
- kafkaPort: 9092
+config: {}
# default number of instances
replicaCount: 1
diff --git a/kubernetes/dmaap/values.yaml b/kubernetes/dmaap/values.yaml
index 76f0383f2e..6cf26ff10c 100644
--- a/kubernetes/dmaap/values.yaml
+++ b/kubernetes/dmaap/values.yaml
@@ -22,6 +22,3 @@ global:
readinessImage: readiness-check:2.0.0
loggingRepository: docker.elastic.co
loggingImage: beats/filebeat:5.5.0
- postgresDatabase: dmaap
- postgresUser: dmaap_admin
- postgresPassword: onapdemodb \ No newline at end of file
diff --git a/kubernetes/message-router/templates/configmap.yaml b/kubernetes/message-router/templates/configmap.yaml
deleted file mode 100644
index 911d2e9c0e..0000000000
--- a/kubernetes/message-router/templates/configmap.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: {{ include "common.fullname" . }}-msgrtrapi-prop-configmap
- namespace: {{ include "common.namespace" . }}
-data:
-{{ tpl (.Files.Glob "resources/config/dmaap/MsgRtrApi.properties").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: {{ include "common.fullname" . }}-cadi-prop-configmap
- namespace: {{ include "common.namespace" . }}
-data:
-{{ tpl (.Files.Glob "resources/config/dmaap/cadi.properties").AsConfig . | indent 2 }}
diff --git a/kubernetes/onap/requirements.yaml b/kubernetes/onap/requirements.yaml
index 98a6e2fa2e..03ee94db6e 100644
--- a/kubernetes/onap/requirements.yaml
+++ b/kubernetes/onap/requirements.yaml
@@ -60,10 +60,6 @@ dependencies:
version: ~2.0.0
repository: '@local'
condition: log.enabled
- - name: message-router
- version: ~2.0.0
- repository: '@local'
- condition: message-router.enabled
- name: mock
version: ~0.1.0
repository: '@local'
diff --git a/kubernetes/onap/resources/environments/dev.yaml b/kubernetes/onap/resources/environments/dev.yaml
index 42f8c2fabf..4379f64d55 100644
--- a/kubernetes/onap/resources/environments/dev.yaml
+++ b/kubernetes/onap/resources/environments/dev.yaml
@@ -65,12 +65,12 @@ consul:
enabled: false
dcaegen2:
enabled: false
+dmaap:
+ enabled: false
esr:
enabled: false
log:
enabled: false
-message-router:
- enabled: false
mock:
enabled: false
oof:
diff --git a/kubernetes/onap/resources/environments/disable-allcharts.yaml b/kubernetes/onap/resources/environments/disable-allcharts.yaml
index 09a8e5ed02..819cc7a2ab 100644
--- a/kubernetes/onap/resources/environments/disable-allcharts.yaml
+++ b/kubernetes/onap/resources/environments/disable-allcharts.yaml
@@ -39,12 +39,12 @@ consul:
enabled: false
dcaegen2:
enabled: false
+dmaap:
+ enabled: false
esr:
enabled: false
log:
enabled: false
-message-router:
- enabled: false
mock:
enabled: false
msb:
diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index 95e38b93c0..28b33fcc6d 100644
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -74,6 +74,8 @@ consul:
enabled: true
dcaegen2:
enabled: true
+dmaap:
+ enabled: true
esr:
enabled: true
log: