aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/dmaap/components/dmaap-bc
diff options
context:
space:
mode:
authorefiacor <fiachra.corcoran@est.tech>2020-04-24 14:29:17 +0100
committerefiacor <fiachra.corcoran@est.tech>2020-05-14 22:02:37 +0100
commitc75eacbe1c686e635673fc2280003518303e43ac (patch)
tree4e04e0be29ecb019baabb9ec766eeb5c31dd6cb4 /kubernetes/dmaap/components/dmaap-bc
parentc32ee22a8436a184d710db9d06da85c4ca385efc (diff)
[DMAAP] Moving DMaaP post-install jobs to 1 BC job
Change-Id: I11fe412600d1061e5667a5531d36cecbecdd34e3 Signed-off-by: efiacor <fiachra.corcoran@est.tech> Issue-ID: OOM-2369
Diffstat (limited to 'kubernetes/dmaap/components/dmaap-bc')
-rw-r--r--kubernetes/dmaap/components/dmaap-bc/resources/dr_nodes/central.yaml6
-rw-r--r--kubernetes/dmaap/components/dmaap-bc/resources/dr_nodes/edge.yaml6
-rw-r--r--kubernetes/dmaap/components/dmaap-bc/resources/feeds/README3
-rw-r--r--kubernetes/dmaap/components/dmaap-bc/resources/topics/PNF_READY.json17
-rw-r--r--kubernetes/dmaap/components/dmaap-bc/resources/topics/PNF_REGISTRATION.json17
-rw-r--r--kubernetes/dmaap/components/dmaap-bc/resources/topics/README3
-rw-r--r--kubernetes/dmaap/components/dmaap-bc/resources/topics/mirrormakeragent.json37
-rw-r--r--kubernetes/dmaap/components/dmaap-bc/templates/configmap.yaml52
-rw-r--r--kubernetes/dmaap/components/dmaap-bc/templates/deployment.yaml12
-rw-r--r--kubernetes/dmaap/components/dmaap-bc/templates/dmaap-provisioning-job.yaml (renamed from kubernetes/dmaap/components/dmaap-bc/templates/post-install-job.yaml)57
10 files changed, 186 insertions, 24 deletions
diff --git a/kubernetes/dmaap/components/dmaap-bc/resources/dr_nodes/central.yaml b/kubernetes/dmaap/components/dmaap-bc/resources/dr_nodes/central.yaml
new file mode 100644
index 0000000000..7ef2dcdb8f
--- /dev/null
+++ b/kubernetes/dmaap/components/dmaap-bc/resources/dr_nodes/central.yaml
@@ -0,0 +1,6 @@
+{
+ "dcaeLocationName" : "san-francisco",
+ "fqdn" : "dmaap-dr-node.san-francisco",
+ "hostName" : "dmaap-dr-node.pod",
+ "version" : "1.0.1"
+}
diff --git a/kubernetes/dmaap/components/dmaap-bc/resources/dr_nodes/edge.yaml b/kubernetes/dmaap/components/dmaap-bc/resources/dr_nodes/edge.yaml
new file mode 100644
index 0000000000..272cd75e52
--- /dev/null
+++ b/kubernetes/dmaap/components/dmaap-bc/resources/dr_nodes/edge.yaml
@@ -0,0 +1,6 @@
+{
+ "dcaeLocationName" : "edge1",
+ "fqdn" : "dmaap-dr-node.edge1",
+ "hostName" : "dmaap-dr-node.pod.edge1",
+ "version" : "1.0.1"
+}
diff --git a/kubernetes/dmaap/components/dmaap-bc/resources/feeds/README b/kubernetes/dmaap/components/dmaap-bc/resources/feeds/README
new file mode 100644
index 0000000000..4f5eac5ba1
--- /dev/null
+++ b/kubernetes/dmaap/components/dmaap-bc/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/components/dmaap-bc/resources/topics/PNF_READY.json b/kubernetes/dmaap/components/dmaap-bc/resources/topics/PNF_READY.json
new file mode 100644
index 0000000000..8f4cf8bd64
--- /dev/null
+++ b/kubernetes/dmaap/components/dmaap-bc/resources/topics/PNF_READY.json
@@ -0,0 +1,17 @@
+{
+ "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,
+ "clients": [
+ {
+ "dcaeLocationName": "san-francisco",
+ "clientRole": "org.onap.dmaap.mr.PNF_READY.pub",
+ "action": [
+ "pub",
+ "view"
+ ]
+
+ }
+ ]
+}
diff --git a/kubernetes/dmaap/components/dmaap-bc/resources/topics/PNF_REGISTRATION.json b/kubernetes/dmaap/components/dmaap-bc/resources/topics/PNF_REGISTRATION.json
new file mode 100644
index 0000000000..f0dd2c7829
--- /dev/null
+++ b/kubernetes/dmaap/components/dmaap-bc/resources/topics/PNF_REGISTRATION.json
@@ -0,0 +1,17 @@
+{
+ "topicName": "PNF_REGISTRATION",
+ "topicDescription": "the VES collector will be publishing pnfRegistration events in this topic",
+ "owner": "VEScollector",
+ "txenabled": false,
+ "clients": [
+ {
+ "dcaeLocationName": "san-francisco",
+ "clientRole": "org.onap.dmaap.mr.PNF_REGISTRATION.sub",
+ "action": [
+ "sub",
+ "view"
+ ]
+
+ }
+ ]
+}
diff --git a/kubernetes/dmaap/components/dmaap-bc/resources/topics/README b/kubernetes/dmaap/components/dmaap-bc/resources/topics/README
new file mode 100644
index 0000000000..fbb88b97e6
--- /dev/null
+++ b/kubernetes/dmaap/components/dmaap-bc/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/components/dmaap-bc/resources/topics/mirrormakeragent.json b/kubernetes/dmaap/components/dmaap-bc/resources/topics/mirrormakeragent.json
new file mode 100644
index 0000000000..ff1a5732e2
--- /dev/null
+++ b/kubernetes/dmaap/components/dmaap-bc/resources/topics/mirrormakeragent.json
@@ -0,0 +1,37 @@
+{
+ "topicName": "mirrormakeragent",
+ "topicDescription": "the topic used to provision the MM agent whitelist",
+ "replicationCase": "REPLICATION_NONE",
+ "owner": "dmaap",
+ "txenabled": false,
+ "partitionCount": "1",
+ "clients": [
+ {
+ "dcaeLocationName": "san-francisco",
+ "clientIdentity": "dmaap-bc-mm-prov@dmaap-bc-mm-prov.onap.org",
+ "action": [
+ "pub",
+ "sub",
+ "view"
+ ]
+ },
+ {
+ "dcaeLocationName": "san-francisco",
+ "clientIdentity": "dmaap-bc-topic-mgr@dmaap-bc-topic-mgr.onap.org",
+ "action": [
+ "pub",
+ "sub",
+ "view"
+ ]
+ },
+ {
+ "dcaeLocationName": "san-francisco",
+ "clientIdentity": "demo@people.osaaf.org",
+ "action": [
+ "pub",
+ "sub",
+ "view"
+ ]
+ }
+ ]
+} \ No newline at end of file
diff --git a/kubernetes/dmaap/components/dmaap-bc/templates/configmap.yaml b/kubernetes/dmaap/components/dmaap-bc/templates/configmap.yaml
index 37d39effd6..bb68eb783e 100644
--- a/kubernetes/dmaap/components/dmaap-bc/templates/configmap.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/templates/configmap.yaml
@@ -51,3 +51,55 @@ metadata:
heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/dcaeLocations/*.json").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: {{ include "common.fullname" . }}-dr-nodes
+ namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ include "common.release" . }}
+ heritage: {{ .Release.Service }}
+data:
+{{ tpl (.Files.Glob "resources/dr_nodes/*.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: {{ include "common.release" . }}
+ heritage: {{ .Release.Service }}
+data:
+{{ tpl (.Files.Glob "resources/feeds/*.json").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: {{ include "common.fullname" . }}-mr-clusters
+ namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ include "common.release" . }}
+ 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: {{ include "common.release" . }}
+ heritage: {{ .Release.Service }}
+data:
+{{ tpl (.Files.Glob "resources/topics/*.json").AsConfig . | indent 2 }} \ No newline at end of file
diff --git a/kubernetes/dmaap/components/dmaap-bc/templates/deployment.yaml b/kubernetes/dmaap/components/dmaap-bc/templates/deployment.yaml
index 2cfa3738b2..3c6a23a470 100644
--- a/kubernetes/dmaap/components/dmaap-bc/templates/deployment.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/templates/deployment.yaml
@@ -41,11 +41,7 @@ spec:
image: "{{ .Values.global.envsubstImage }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-update-config
-
-{{- if .Values.global.aafEnabled }}
-
{{ include "common.certInitializer.initContainer" . | nindent 6 }}
-
- name: {{ include "common.name" . }}-permission-fixer
image: "{{ .Values.global.busyBoxRepository }}/{{ .Values.global.busyBoxImage }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
@@ -61,15 +57,16 @@ spec:
volumeMounts: {{ include "common.certInitializer.volumeMount" . | nindent 8 }}
command: ["/bin/sh"]
args: [ "-c", "sed -i -e '/cadi_keystore_password=/d' -e '/cadi_keystore_password_jks/p' -e 's/cadi_keystore_password_jks/cadi_keystore_password/' -e 's/dmaap-bc.p12/dmaap-bc.jks/' /opt/app/osaaf/local/org.onap.dmaap-bc.cred.props" ]
-
-{{- end }}
-{{- if .Values.PG.enabled }}
- name: {{ include "common.name" . }}-postgres-readiness
command:
- /root/ready.py
args:
- --container-name
- {{ .Values.postgres.nameOverride }}
+ - --container-name
+ - message-router
+ - --container-name
+ - dmaap-dr-node
env:
- name: NAMESPACE
valueFrom:
@@ -79,7 +76,6 @@ spec:
image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
{{- end }}
-{{- end }}
containers:
- name: {{ include "common.name" . }}
image: "{{ .Values.repository }}/{{ .Values.image }}"
diff --git a/kubernetes/dmaap/components/dmaap-bc/templates/post-install-job.yaml b/kubernetes/dmaap/components/dmaap-bc/templates/dmaap-provisioning-job.yaml
index c06d4e1130..5b22f06aa8 100644
--- a/kubernetes/dmaap/components/dmaap-bc/templates/post-install-job.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/templates/dmaap-provisioning-job.yaml
@@ -1,44 +1,49 @@
apiVersion: batch/v1
kind: Job
metadata:
- name: {{ include "common.fullname" . }}-post-install
+ name: {{ include "common.fullname" . }}-dmaap-provisioning
namespace: {{ include "common.namespace" . }}
labels: {{- include "common.labels" . | nindent 4 }}
- annotations:
- # This is what defines this resource as a hook. Without this line, the
- # job is considered part of the release.
- "helm.sh/hook": post-install
- "helm.sh/hook-weight": "-5"
- "helm.sh/hook-delete-policy": hook-succeeded
spec:
+ backoffLimit: 5
template:
metadata: {{- include "common.templateMetadata" . | nindent 6 }}
spec:
restartPolicy: Never
+ initContainers:
+ - name: {{ include "common.name" . }}-init-readiness
+ image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ command:
+ - /root/ready.py
+ args:
+ - --container-name
+ - dmaap-bc
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
containers:
- - name: post-install-job
+ - name: dmaap-provisioning-job
image: "{{ include "common.repository" . }}/{{ .Values.global.clientImage }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
env:
- name: DELAY
value: "0"
+ {{- if .Values.global.allow_http }}
- name: PROTO
-{{- if (include "common.needTLS" .) }}
- value: "https"
- - name: PORT
- value: "8443"
-{{- else }}
value: "http"
- name: PORT
value: "8080"
-{{- end }}
+ {{ end }}
- name: REQUESTID
- value: "{{.Chart.Name}}-post-install"
+ value: "{{.Chart.Name}}-dmaap-provisioning"
volumeMounts:
- mountPath: /etc/localtime
name: localtime
readOnly: true
-
# NOTE: on the following several configMaps, careful to include / at end
# since there may be more than one file in each mountPath
# NOTE: the basename of the subdirectory of mountPath is important - it matches the DBCL API URI
@@ -46,6 +51,14 @@ spec:
mountPath: /opt/app/config/dmaap/
- name: {{ include "common.fullname" . }}-dbc-dcaelocations
mountPath: /opt/app/config/dcaeLocations/
+ - name: {{ include "common.fullname" . }}-dr-nodes
+ mountPath: /opt/app/config/dr-nodes/
+ - name: {{ include "common.fullname" . }}-feeds
+ mountPath: /opt/app/config/feeds/
+ - name: {{ include "common.fullname" . }}-mr-clusters
+ mountPath: /opt/app/config/mr-clusters/
+ - name: {{ include "common.fullname" . }}-topics
+ mountPath: /opt/app/config/topics/
resources: {{ include "common.resources" . | nindent 10 }}
{{- if .Values.nodeSelector }}
nodeSelector: {{ toYaml .Values.nodeSelector | nindent 8 }}
@@ -63,5 +76,17 @@ spec:
- name: {{ include "common.fullname" . }}-dbc-dcaelocations
configMap:
name: {{ include "common.fullname" . }}-dbc-dcaelocations
+ - name: {{ include "common.fullname" . }}-dr-nodes
+ configMap:
+ name: {{ include "common.fullname" . }}-dr-nodes
+ - name: {{ include "common.fullname" . }}-feeds
+ configMap:
+ name: {{ include "common.fullname" . }}-feeds
+ - name: {{ include "common.fullname" . }}-mr-clusters
+ configMap:
+ name: {{ include "common.fullname" . }}-mr-clusters
+ - name: {{ include "common.fullname" . }}-topics
+ configMap:
+ name: {{ include "common.fullname" . }}-topics
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"