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 "Using common template port numbers"
[it/dep.git]
/
ric-platform
/
50-RIC-Platform
/
helm
/
e2term
/
templates
/
deployment.yaml
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
bf048b5
..
03d6603
100644
(file)
--- a/
ric-platform/50-RIC-Platform/helm/e2term/templates/deployment.yaml
+++ b/
ric-platform/50-RIC-Platform/helm/e2term/templates/deployment.yaml
@@
-18,53
+18,55
@@
apiVersion: apps/v1
kind: Deployment
metadata:
apiVersion: apps/v1
kind: Deployment
metadata:
- name: {{ include "
e2term.fullname
" . }}
- namespace: {{ include "common.namespace" . }}
+ name: {{ include "
common.deploymentname.e2term
" . }}
+ namespace: {{ include "common.namespace
.platform
" . }}
labels:
labels:
- app: {{ include "common.namespace
" . }}-{{ include "common.name
" . }}
+ app: {{ include "common.namespace
.platform" . }}-{{ include "common.name.e2term
" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
spec:
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
spec:
- replicas: {{ .Values.replicaCount }}
+ replicas: {{ .Values.
e2term.
replicaCount }}
selector:
matchLabels:
selector:
matchLabels:
- app: {{ include "common.namespace
" . }}-{{ include "common.name
" . }}
+ app: {{ include "common.namespace
.platform" . }}-{{ include "common.name.e2term
" . }}
release: {{ .Release.Name }}
template:
metadata:
release: {{ .Release.Name }}
template:
metadata:
+ {{- if .Values.e2term.annotations }}
+ annotations:
+ {{- .Values.e2term.annotations | nindent 8 -}}
+ {{ end }}
labels:
labels:
- app: {{ include "common.namespace
" . }}-{{ include "common.name
" . }}
+ app: {{ include "common.namespace
.platform" . }}-{{ include "common.name.e2term
" . }}
release: {{ .Release.Name }}
spec:
release: {{ .Release.Name }}
spec:
- hostname: {{ .Chart.Name }}
+ hostname: {{ include "common.name.e2term" . }}
+ hostNetwork: {{ .Values.e2term.hostnetworkmode }}
+ dnsPolicy: ClusterFirstWithHostNet
imagePullSecrets:
- name: {{ include "common.repositoryCred" . }}
containers:
imagePullSecrets:
- name: {{ include "common.repositoryCred" . }}
containers:
- - name: {{
.Chart.Name
}}
- image: {{ include "common.repository" . }}/{{ .Values.
image.name }}:{{ .Values
.image.tag }}
+ - name: {{
include "common.containername.e2term" .
}}
+ image: {{ include "common.repository" . }}/{{ .Values.
e2term.image.name }}:{{ .Values.e2term
.image.tag }}
imagePullPolicy: {{ include "common.pullPolicy" . }}
volumeMounts:
- mountPath: /opt/e2/router.txt
name: local-router-file
subPath: router.txt
imagePullPolicy: {{ include "common.pullPolicy" . }}
volumeMounts:
- mountPath: /opt/e2/router.txt
name: local-router-file
subPath: router.txt
- env:
- - name: sctp
- value: "5577"
- - name: nano
- value: "{{ .Values.service.nano.port }}"
- - name: print
- value: "{{ .Values.env.print }}"
- - name: RMR_RTG_SVC
- value: "{{ .Values.env.RMR_RTG_SVC }}"
+ envFrom:
+ - configMapRef:
+ name: {{ include "common.configmapname.e2term" . }}-env
ports:
ports:
- - name: {{ .Values.service.nano.name }}
- containerPort: {{ .Values.service.nano.port }}
+ - name: "rmrroute"
+ containerPort: {{ include "common.serviceport.e2term.rmr.route" . }}
+ - name: "rmrdata"
+ containerPort: {{ include "common.serviceport.e2term.rmr.data" . }}
stdin: true
tty: true
securityContext:
stdin: true
tty: true
securityContext:
- privileged:
true
+ privileged:
{{ .Values.e2term.privilegedmode }}
volumes:
- name: local-router-file
configMap:
volumes:
- name: local-router-file
configMap:
- name: {{ include "
e2term.fullname
" . }}-router-configmap
+ name: {{ include "
common.configmapname.e2term
" . }}-router-configmap