Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[AAI] Fix Istio compatibility and add Job ServiceAccount
[oom.git]
/
kubernetes
/
aai
/
components
/
aai-traversal
/
templates
/
deployment.yaml
diff --git
a/kubernetes/aai/components/aai-traversal/templates/deployment.yaml
b/kubernetes/aai/components/aai-traversal/templates/deployment.yaml
index
f390b1c
..
bf9743b
100644
(file)
--- a/
kubernetes/aai/components/aai-traversal/templates/deployment.yaml
+++ b/
kubernetes/aai/components/aai-traversal/templates/deployment.yaml
@@
-25,6
+25,12
@@
metadata:
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
+ app.kubernetes.io/name: {{ include "common.name" . }}
+ {{- if .Chart.AppVersion }}
+ version: {{ .Chart.AppVersion | replace "+" "_" }}
+ {{- else }}
+ version: {{ .Chart.Version | replace "+" "_" }}
+ {{- end }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
@@
-44,6
+50,12
@@
spec:
labels:
app: {{ include "common.name" . }}
release: {{ include "common.release" . }}
labels:
app: {{ include "common.name" . }}
release: {{ include "common.release" . }}
+ app.kubernetes.io/name: {{ include "common.name" . }}
+ {{- if .Chart.AppVersion }}
+ version: {{ .Chart.AppVersion | replace "+" "_" }}
+ {{- else }}
+ version: {{ .Chart.Version | replace "+" "_" }}
+ {{- end }}
name: {{ include "common.name" . }}
annotations:
checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
name: {{ include "common.name" . }}
annotations:
checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
@@
-188,8
+200,11
@@
spec:
subPath: application-keycloak.properties
ports:
- containerPort: {{ .Values.service.internalPort }}
subPath: application-keycloak.properties
ports:
- containerPort: {{ .Values.service.internalPort }}
+ name: {{ .Values.service.portName }}
- containerPort: {{ .Values.service.internalPort2 }}
- containerPort: {{ .Values.service.internalPort2 }}
+ name: {{ .Values.service.portName2 }}
- containerPort: {{ .Values.service.internalPort3 }}
- containerPort: {{ .Values.service.internalPort3 }}
+ name: {{ .Values.service.portName3 }}
lifecycle:
# wait for active requests (long-running tasks) to be finished
# Before the SIGTERM is invoked, Kubernetes exposes a preStop hook in the Pod.
lifecycle:
# wait for active requests (long-running tasks) to be finished
# Before the SIGTERM is invoked, Kubernetes exposes a preStop hook in the Pod.