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
Integrate appmgr with common template. Add ingress controller entries in the common...
[it/dep.git]
/
ric-platform
/
50-RIC-Platform
/
helm
/
appmgr
/
templates
/
deployment.yaml
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
b671152
..
dbcd315
100644
(file)
--- a/
ric-platform/50-RIC-Platform/helm/appmgr/templates/deployment.yaml
+++ b/
ric-platform/50-RIC-Platform/helm/appmgr/templates/deployment.yaml
@@
-18,7
+18,7
@@
apiVersion: apps/v1
kind: Deployment
metadata:
apiVersion: apps/v1
kind: Deployment
metadata:
- name: {{ include "
appmgr.fullname
" . }}
+ name: {{ include "
common.deploymentname.appmgr
" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.namespace" . }}-{{ include "common.name" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.namespace" . }}-{{ include "common.name" . }}
@@
-31,8
+31,6
@@
spec:
matchLabels:
app: {{ include "common.namespace" . }}-{{ include "common.name" . }}
release: {{ .Release.Name }}
matchLabels:
app: {{ include "common.namespace" . }}-{{ include "common.name" . }}
release: {{ .Release.Name }}
- #app.kubernetes.io/name: {{ include "appmgr.name" . }}
- #app.kubernetes.io/instance: {{ .Release.Name }}
template:
metadata:
labels:
template:
metadata:
labels:
@@
-40,10
+38,6
@@
spec:
release: {{ .Release.Name }}
spec:
hostname: {{ .Chart.Name }}
release: {{ .Release.Name }}
spec:
hostname: {{ .Chart.Name }}
- hostAliases:
- - ip: "135.207.143.86"
- hostnames:
- - "helm.ricinfra.local"
imagePullSecrets:
- name: {{ include "common.repositoryCred" . }}
containers:
imagePullSecrets:
- name: {{ include "common.repositoryCred" . }}
containers:
@@
-64,7
+58,7
@@
spec:
mountPath: {{ .Values.appmgr.appcertpath }}
envFrom:
- configMapRef:
mountPath: {{ .Values.appmgr.appcertpath }}
envFrom:
- configMapRef:
- name: {{ include "
appmgr.fullname
" . }}-appenv
+ name: {{ include "
common.configmapname.appmgr
" . }}-appenv
livenessProbe:
#exec:
# command:
livenessProbe:
#exec:
# command:
@@
-85,7
+79,7
@@
spec:
volumes:
- name: config-volume
configMap:
volumes:
- name: config-volume
configMap:
- name: {{ include "
appmgr.fullname
" . }}-appconfig
+ name: {{ include "
common.configmapname.appmgr
" . }}-appconfig
- name: secret-volume
secret:
secretName: {{ include "common.helmrepositorycred" . }}
- name: secret-volume
secret:
secretName: {{ include "common.helmrepositorycred" . }}