summaryrefslogtreecommitdiffstats
path: root/kubernetes/dmaap/charts/dmaap-bus-controller
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes/dmaap/charts/dmaap-bus-controller')
-rw-r--r--kubernetes/dmaap/charts/dmaap-bus-controller/resources/dcaeLocations/san-francisco.json5
-rw-r--r--kubernetes/dmaap/charts/dmaap-bus-controller/resources/dmaap/onap.json7
-rw-r--r--kubernetes/dmaap/charts/dmaap-bus-controller/resources/feeds/DefaultPM.json8
-rw-r--r--kubernetes/dmaap/charts/dmaap-bus-controller/resources/feeds/README3
-rw-r--r--kubernetes/dmaap/charts/dmaap-bus-controller/resources/mr_clusters/san-francisco.json6
-rw-r--r--kubernetes/dmaap/charts/dmaap-bus-controller/resources/topics/PNF_READY.json6
-rw-r--r--kubernetes/dmaap/charts/dmaap-bus-controller/resources/topics/PNF_REGISTRATION.json6
-rw-r--r--kubernetes/dmaap/charts/dmaap-bus-controller/resources/topics/README3
-rw-r--r--kubernetes/dmaap/charts/dmaap-bus-controller/templates/configmap.yaml70
-rw-r--r--kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml27
-rw-r--r--kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml2
11 files changed, 142 insertions, 1 deletions
diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/resources/dcaeLocations/san-francisco.json b/kubernetes/dmaap/charts/dmaap-bus-controller/resources/dcaeLocations/san-francisco.json
new file mode 100644
index 0000000000..ca1e740dd8
--- /dev/null
+++ b/kubernetes/dmaap/charts/dmaap-bus-controller/resources/dcaeLocations/san-francisco.json
@@ -0,0 +1,5 @@
+{
+
+ "dcaeLayer": "kubernetes-central",
+ "dcaeLocationName": "san-francisco"
+}
diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/resources/dmaap/onap.json b/kubernetes/dmaap/charts/dmaap-bus-controller/resources/dmaap/onap.json
new file mode 100644
index 0000000000..27411c64d2
--- /dev/null
+++ b/kubernetes/dmaap/charts/dmaap-bus-controller/resources/dmaap/onap.json
@@ -0,0 +1,7 @@
+{
+ "dmaapName": "{{ include "common.namespace" . }}",
+ "drProvUrl": "https://dmaap-dr-prov:8443",
+ "version": "1",
+ "topicNsRoot": "org.onap.dmaap",
+ "bridgeAdminTopic": "DCAE_MM_AGENT"
+}
diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/resources/feeds/DefaultPM.json b/kubernetes/dmaap/charts/dmaap-bus-controller/resources/feeds/DefaultPM.json
new file mode 100644
index 0000000000..e8073474b1
--- /dev/null
+++ b/kubernetes/dmaap/charts/dmaap-bus-controller/resources/feeds/DefaultPM.json
@@ -0,0 +1,8 @@
+{
+ "feedName": "Default PM Feed",
+ "feedVersion": "m1.1",
+ "feedDescription": "Default feed provisioned for PM File collector",
+ "asprClassification" : "unclassified",
+ "owner": "onap"
+}
+
diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/resources/feeds/README b/kubernetes/dmaap/charts/dmaap-bus-controller/resources/feeds/README
new file mode 100644
index 0000000000..4f5eac5ba1
--- /dev/null
+++ b/kubernetes/dmaap/charts/dmaap-bus-controller/resources/feeds/README
@@ -0,0 +1,3 @@
+#
+# Intent of this directory is for it to contain a file for each feed that needs to be provisioned in DR.
+# So, app teams can add files to this directory as needed without impacting each other's code.
diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/resources/mr_clusters/san-francisco.json b/kubernetes/dmaap/charts/dmaap-bus-controller/resources/mr_clusters/san-francisco.json
new file mode 100644
index 0000000000..9e732d2af8
--- /dev/null
+++ b/kubernetes/dmaap/charts/dmaap-bus-controller/resources/mr_clusters/san-francisco.json
@@ -0,0 +1,6 @@
+{
+ "dcaeLocationName": "san-francisco",
+ "fqdn": "message-router",
+ "topicProtocol": "http",
+ "topicPort": "3904"
+}
diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/resources/topics/PNF_READY.json b/kubernetes/dmaap/charts/dmaap-bus-controller/resources/topics/PNF_READY.json
new file mode 100644
index 0000000000..0010f22cb4
--- /dev/null
+++ b/kubernetes/dmaap/charts/dmaap-bus-controller/resources/topics/PNF_READY.json
@@ -0,0 +1,6 @@
+{
+ "topicName": "PNF_READY",
+ "topicDescription": "This topic will be used to publish the PNF_READY events generated by the PNF REgistration Handler service in the DCAE platform.",
+ "owner": "PNFRegistrationHandler",
+ "txenabled": false
+}
diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/resources/topics/PNF_REGISTRATION.json b/kubernetes/dmaap/charts/dmaap-bus-controller/resources/topics/PNF_REGISTRATION.json
new file mode 100644
index 0000000000..2b5c8a523d
--- /dev/null
+++ b/kubernetes/dmaap/charts/dmaap-bus-controller/resources/topics/PNF_REGISTRATION.json
@@ -0,0 +1,6 @@
+{
+ "topicName": "PNF_REGISTRATION",
+ "topicDescription": "the VES collector will be publishing pnfRegistration events in this topic",
+ "owner": "VEScollector",
+ "txenabled": false
+}
diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/resources/topics/README b/kubernetes/dmaap/charts/dmaap-bus-controller/resources/topics/README
new file mode 100644
index 0000000000..fbb88b97e6
--- /dev/null
+++ b/kubernetes/dmaap/charts/dmaap-bus-controller/resources/topics/README
@@ -0,0 +1,3 @@
+#
+# Intent of this directory is for it to contain a file for each topic that needs to be provisioned in MR.
+# So, app teams can add files to this directory as needed without impacting each other's code.
diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/templates/configmap.yaml b/kubernetes/dmaap/charts/dmaap-bus-controller/templates/configmap.yaml
index ef50157a00..ead7562a59 100644
--- a/kubernetes/dmaap/charts/dmaap-bus-controller/templates/configmap.yaml
+++ b/kubernetes/dmaap/charts/dmaap-bus-controller/templates/configmap.yaml
@@ -18,5 +18,75 @@ kind: ConfigMap
metadata:
name: {{ include "common.fullname" . }}-config
namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: {{ include "common.fullname" . }}-dmaap
+ namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+data:
+{{ tpl (.Files.Glob "resources/dmaap/*.json").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: {{ include "common.fullname" . }}-dcaelocations
+ namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+data:
+{{ tpl (.Files.Glob "resources/dcaeLocations/*.json").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: {{ include "common.fullname" . }}-mrclusters
+ namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+data:
+{{ tpl (.Files.Glob "resources/mr_clusters/*.json").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: {{ include "common.fullname" . }}-topics
+ namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+data:
+{{ tpl (.Files.Glob "resources/topics/*.json").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: {{ include "common.fullname" . }}-feeds
+ namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+data:
+{{ tpl (.Files.Glob "resources/feeds/*.json").AsConfig . | indent 2 }}
diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml b/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml
index c1935b2e3e..ae90a9f2eb 100644
--- a/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml
+++ b/kubernetes/dmaap/charts/dmaap-bus-controller/templates/deployment.yaml
@@ -74,6 +74,18 @@ spec:
- name: {{ include "common.name" . }}-config
mountPath: /opt/app/config/conf
subPath: buscontroller.env
+
+# NOTE: the basename of the subdirectory is important - it matches the DBCL API URI
+ - name: {{ include "common.name" . }}-dmaap
+ mountPath: /opt/app/config/dmaap/
+ - name: {{ include "common.name" . }}-dcaelocations
+ mountPath: /opt/app/config/dcaeLocations/
+ - name: {{ include "common.name" . }}-mrclusters
+ mountPath: /opt/app/config/mr_clusters/
+ - name: {{ include "common.name" . }}-topics
+ mountPath: /opt/app/config/topics/
+ - name: {{ include "common.name" . }}-feeds
+ mountPath: /opt/app/config/feeds/
resources:
{{ toYaml .Values.resources | indent 12 }}
{{- if .Values.nodeSelector }}
@@ -91,5 +103,20 @@ spec:
- name: {{ include "common.name" . }}-config
configMap:
name: {{ include "common.fullname" . }}-config
+ - name: {{ include "common.name" . }}-dmaap
+ configMap:
+ name: {{ include "common.fullname" . }}-dmaap
+ - name: {{ include "common.name" . }}-dcaelocations
+ configMap:
+ name: {{ include "common.fullname" . }}-dcaelocations
+ - name: {{ include "common.name" . }}-mrclusters
+ configMap:
+ name: {{ include "common.fullname" . }}-mrclusters
+ - name: {{ include "common.name" . }}-topics
+ configMap:
+ name: {{ include "common.fullname" . }}-topics
+ - name: {{ include "common.name" . }}-feeds
+ configMap:
+ name: {{ include "common.fullname" . }}-feeds
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml b/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml
index 56e178b188..85361d88f6 100644
--- a/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml
+++ b/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml
@@ -31,7 +31,7 @@ pullPolicy: Always
# application images
repository: nexus3.onap.org:10001
-image: onap/dmaap/buscontroller:1.0.12
+image: onap/dmaap/buscontroller:1.0.17
# application configuration