Add DANM network support through annotations

Signed-off-by: Zhe Huang <zhehuang@research.att.com>
Change-Id: Iccec55d30245fe50f8e69f429d81b7c122917bac

diff --git a/ric-platform/50-RIC-Platform/helm/a1mediator/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/a1mediator/templates/deployment.yaml
index ffa41a3..d6acd6e 100644 (file)
--- a/ric-platform/50-RIC-Platform/helm/a1mediator/templates/deployment.yaml
+++ b/ric-platform/50-RIC-Platform/helm/a1mediator/templates/deployment.yaml
@@ -34,6 +34,10 @@ spec:
       release: {{ .Release.Name }}
   template:
     metadata:
+      {{- if .Values.a1mediator.annotations }}
+      annotations:
+        {{- .Values.a1mediator.annotations | nindent 8 -}}
+      {{ end }}
       labels:
         app: {{ include "common.namespace.platform" . }}-{{ include "common.name.a1mediator" . }}
         release: {{ .Release.Name }}

diff --git a/ric-platform/50-RIC-Platform/helm/a1mediator/values.yaml b/ric-platform/50-RIC-Platform/helm/a1mediator/values.yaml
index d07c0ab..e92e4ed 100644 (file)
--- a/ric-platform/50-RIC-Platform/helm/a1mediator/values.yaml
+++ b/ric-platform/50-RIC-Platform/helm/a1mediator/values.yaml
@@ -40,4 +40,3 @@ a1mediator:
   rmr_timeout_config:
     rcv_retry_interval_ms: 500
     rcv_retry_times: 20
-

diff --git a/ric-platform/50-RIC-Platform/helm/appmgr/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/appmgr/templates/deployment.yaml
index 5620cd0..ce05589 100644 (file)
--- a/ric-platform/50-RIC-Platform/helm/appmgr/templates/deployment.yaml
+++ b/ric-platform/50-RIC-Platform/helm/appmgr/templates/deployment.yaml
@@ -33,6 +33,10 @@ spec:
       release: {{ .Release.Name }}
   template:
     metadata:
+      {{- if .Values.appmgr.annotations }}
+      annotations:
+        {{- .Values.appmgr.annotations | nindent 8 -}}
+      {{ end }}
       labels:
         app: {{ include "common.namespace.platform" . }}-{{ include "common.name.appmgr" . }}
         release: {{ .Release.Name }}

diff --git a/ric-platform/50-RIC-Platform/helm/dbaas/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/dbaas/templates/deployment.yaml
index fb6ec81..7095b18 100644 (file)
--- a/ric-platform/50-RIC-Platform/helm/dbaas/templates/deployment.yaml
+++ b/ric-platform/50-RIC-Platform/helm/dbaas/templates/deployment.yaml
@@ -33,6 +33,10 @@ spec:
       release: {{ .Release.Name }}
   template:
     metadata:
+      {{- if .Values.dbaas.annotations }}
+      annotations:
+        {{- .Values.dbaas.annotations | nindent 8 -}}
+      {{ end }}
       labels:
         app: {{ include "common.namespace.platform" . }}-{{ include "common.name.dbaas" . }}
         release: {{ .Release.Name }}

diff --git a/ric-platform/50-RIC-Platform/helm/e2mgr/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/e2mgr/templates/deployment.yaml
index 5693287..c10fa6b 100644 (file)
--- a/ric-platform/50-RIC-Platform/helm/e2mgr/templates/deployment.yaml
+++ b/ric-platform/50-RIC-Platform/helm/e2mgr/templates/deployment.yaml
@@ -33,6 +33,10 @@ spec:
       release: {{ .Release.Name }}
   template:
     metadata:
+      {{- if .Values.e2mgr.annotations }}
+      annotations:
+        {{- .Values.e2mgr.annotations | nindent 8 -}}
+      {{ end }}
       labels:
         app: {{ include "common.namespace.platform" . }}-{{ include "common.name.e2mgr" . }}
         release: {{ .Release.Name }}

diff --git a/ric-platform/50-RIC-Platform/helm/e2term/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/e2term/templates/deployment.yaml
index 6c6d71d..ed80b84 100644 (file)
--- a/ric-platform/50-RIC-Platform/helm/e2term/templates/deployment.yaml
+++ b/ric-platform/50-RIC-Platform/helm/e2term/templates/deployment.yaml
@@ -33,6 +33,10 @@ spec:
       release: {{ .Release.Name }}
   template:
     metadata:
+      {{- if .Values.e2term.annotations }}
+      annotations:
+        {{- .Values.e2term.annotations | nindent 8 -}}
+      {{ end }}
       labels:
         app: {{ include "common.namespace.platform" . }}-{{ include "common.name.e2term" . }}
         release: {{ .Release.Name }}

diff --git a/ric-platform/50-RIC-Platform/helm/rtmgr/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/rtmgr/templates/deployment.yaml
index 2cffaa9..592309e 100644 (file)
--- a/ric-platform/50-RIC-Platform/helm/rtmgr/templates/deployment.yaml
+++ b/ric-platform/50-RIC-Platform/helm/rtmgr/templates/deployment.yaml
@@ -33,6 +33,10 @@ spec:
       release: {{ .Release.Name }}
   template:
     metadata:
+      {{- if .Values.rtmgr.annotations }}
+      annotations:
+        {{- .Values.rtmgr.annotations | nindent 8 -}}
+      {{ end }}
       labels:
         app: {{ include "common.namespace.platform" . }}-{{ include "common.name.rtmgr" . }}
         release: {{ .Release.Name }}

diff --git a/ric-platform/50-RIC-Platform/helm/submgr/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/submgr/templates/deployment.yaml
index bb4808a..2c66c7b 100644 (file)
--- a/ric-platform/50-RIC-Platform/helm/submgr/templates/deployment.yaml
+++ b/ric-platform/50-RIC-Platform/helm/submgr/templates/deployment.yaml
@@ -38,6 +38,10 @@ spec:
       release: {{ .Release.Name }}
   template:
     metadata:
+      {{- if .Values.submgr.annotations }}
+      annotations:
+        {{- .Values.submgr.annotations | nindent 8 -}}
+      {{ end }}
       labels:
         app: {{ include "common.namespace.platform" . }}-{{ include "common.name.submgr" . }}
         release: {{ .Release.Name }}
@@ -62,4 +66,4 @@ spec:
               protocol: TCP
             - name: rmrdata
               containerPort: {{ include "common.serviceport.submgr.rmr.data" . }}
-              protocol: TCP
\ No newline at end of file
+              protocol: TCP