From a9ae10bcbf57300b65fb0f39090034554c59270c Mon Sep 17 00:00:00 2001 From: Zhe Huang Date: Fri, 19 Jul 2019 15:30:30 -0400 Subject: [PATCH] Add DANM network support through annotations Signed-off-by: Zhe Huang Change-Id: Iccec55d30245fe50f8e69f429d81b7c122917bac --- .../50-RIC-Platform/helm/a1mediator/templates/deployment.yaml | 4 ++++ ric-platform/50-RIC-Platform/helm/a1mediator/values.yaml | 1 - ric-platform/50-RIC-Platform/helm/appmgr/templates/deployment.yaml | 4 ++++ ric-platform/50-RIC-Platform/helm/dbaas/templates/deployment.yaml | 4 ++++ ric-platform/50-RIC-Platform/helm/e2mgr/templates/deployment.yaml | 4 ++++ ric-platform/50-RIC-Platform/helm/e2term/templates/deployment.yaml | 4 ++++ ric-platform/50-RIC-Platform/helm/rtmgr/templates/deployment.yaml | 4 ++++ ric-platform/50-RIC-Platform/helm/submgr/templates/deployment.yaml | 6 +++++- 8 files changed, 29 insertions(+), 2 deletions(-) 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 ffa41a39..d6acd6e0 100644 --- 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 d07c0ab3..e92e4ed5 100644 --- 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 5620cd02..ce05589c 100644 --- 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 fb6ec819..7095b184 100644 --- 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 56932876..c10fa6b7 100644 --- 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 6c6d71d4..ed80b846 100644 --- 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 2cffaa90..592309eb 100644 --- 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 bb4808a0..2c66c7bf 100644 --- 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 -- 2.16.6