Code Review
/
it
/
dep.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Making static platform routes configurable"
[it/dep.git]
/
ric-platform
/
50-RIC-Platform
/
helm
/
e2mgr
/
templates
/
deployment.yaml
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
e62dfd4
..
446bb9e
100644
(file)
--- a/
ric-platform/50-RIC-Platform/helm/e2mgr/templates/deployment.yaml
+++ b/
ric-platform/50-RIC-Platform/helm/e2mgr/templates/deployment.yaml
@@
-19,9
+19,9
@@
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "common.deploymentname.e2mgr" .}}
kind: Deployment
metadata:
name: {{ include "common.deploymentname.e2mgr" .}}
- namespace: {{ include "common.namespace" . }}
+ namespace: {{ include "common.namespace
.platform
" . }}
labels:
labels:
- app: {{ include "common.namespace
" . }}-{{ include "common.name
" . }}
+ app: {{ include "common.namespace
.platform" . }}-{{ include "common.name.e2mgr
" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
@@
-29,40
+29,50
@@
spec:
replicas: {{ .Values.e2mgr.replicaCount }}
selector:
matchLabels:
replicas: {{ .Values.e2mgr.replicaCount }}
selector:
matchLabels:
- app: {{ include "common.namespace
" . }}-{{ include "common.name
" . }}
+ app: {{ include "common.namespace
.platform" . }}-{{ include "common.name.e2mgr
" . }}
release: {{ .Release.Name }}
template:
metadata:
release: {{ .Release.Name }}
template:
metadata:
+ {{- if .Values.e2mgr.annotations }}
+ annotations:
+ {{- .Values.e2mgr.annotations | nindent 8 -}}
+ {{ end }}
labels:
labels:
- app: {{ include "common.namespace
" . }}-{{ include "common.name
" . }}
+ app: {{ include "common.namespace
.platform" . }}-{{ include "common.name.e2mgr
" . }}
release: {{ .Release.Name }}
spec:
release: {{ .Release.Name }}
spec:
- hostname: {{
.Chart.Name
}}
+ hostname: {{
include "common.name.e2mgr" .
}}
imagePullSecrets:
- name: {{ include "common.repositoryCred" . }}
containers:
imagePullSecrets:
- name: {{ include "common.repositoryCred" . }}
containers:
- - name: {{ include "common.
namespace" . }}-{{ include "common.name
" . }}
+ - name: {{ include "common.
containername.e2mgr
" . }}
image: {{ include "common.repository" . }}/{{ .Values.e2mgr.image.name }}:{{ .Values.e2mgr.image.tag }}
imagePullPolicy: {{ include "common.pullPolicy" . }}
volumeMounts:
- mountPath: /opt/E2Manager/router.txt
name: local-router-file
subPath: router.txt
image: {{ include "common.repository" . }}/{{ .Values.e2mgr.image.name }}:{{ .Values.e2mgr.image.tag }}
imagePullPolicy: {{ include "common.pullPolicy" . }}
volumeMounts:
- mountPath: /opt/E2Manager/router.txt
name: local-router-file
subPath: router.txt
- env:
- - name: RMR_RTG_SVC
- value: "{{ .Values.e2mgr.env.RMR_RTG_SVC }}"
- - name: RIC_ID
- value: "{{ .Values.e2mgr.env.RIC_ID }}"
+ - mountPath: /opt/E2Manager/resources/configuration.yaml
+ name: local-configuration-file
+ subPath: configuration.yaml
+ envFrom:
+ - configMapRef:
+ name: {{ include "common.configmapname.e2mgr" . }}-env
ports:
- name: "http"
ports:
- name: "http"
- containerPort: {{ .Values.e2mgr.service.http.containerPort }}
- - name: "rmr"
- containerPort: {{ .Values.e2mgr.service.rmr.containerPort }}
+ containerPort: {{ include "common.serviceport.e2mgr.http" . }}
+ - name: "rmrroute"
+ containerPort: {{ include "common.serviceport.e2mgr.rmr.route" . }}
+ - name: "rmrdata"
+ containerPort: {{ include "common.serviceport.e2mgr.rmr.data" . }}
stdin: true
tty: true
securityContext:
stdin: true
tty: true
securityContext:
- privileged:
true
+ privileged:
{{ .Values.e2mgr.privilegedmode}}
volumes:
- name: local-router-file
configMap:
name: {{ include "common.configmapname.e2mgr" . }}-router-configmap
volumes:
- name: local-router-file
configMap:
name: {{ include "common.configmapname.e2mgr" . }}-router-configmap
+ - name: local-configuration-file
+ configMap:
+ name: {{ include "common.configmapname.e2mgr" . }}-configuration-configmap