Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[COMMON] Fix resources indent
[oom.git]
/
kubernetes
/
aaf
/
components
/
aaf-templates
/
templates
/
_deployment.tpl
diff --git
a/kubernetes/aaf/components/aaf-templates/templates/_deployment.tpl
b/kubernetes/aaf/components/aaf-templates/templates/_deployment.tpl
index
bf6931a
..
1fb7240
100644
(file)
--- a/
kubernetes/aaf/components/aaf-templates/templates/_deployment.tpl
+++ b/
kubernetes/aaf/components/aaf-templates/templates/_deployment.tpl
@@
-23,12
+23,16
@@
spec:
replicas: {{ .Values.replicaCount }}
template:
metadata: {{- include "common.templateMetadata" . | nindent 6 }}
replicas: {{ .Values.replicaCount }}
template:
metadata: {{- include "common.templateMetadata" . | nindent 6 }}
+ {{- if (include "common.onServiceMesh" .) }}
+ annotations:
+ sidecar.istio.io/inject: "false"
+ {{- end }}
spec: {{ include "aaf.initContainers" . | nindent 6 }}
containers:
- name: {{ include "common.name" . }}
workingDir: /opt/app/aaf
command: ["bin/{{ .Values.binary }}"]
spec: {{ include "aaf.initContainers" . | nindent 6 }}
containers:
- name: {{ include "common.name" . }}
workingDir: /opt/app/aaf
command: ["bin/{{ .Values.binary }}"]
- image: {{ include "
common
.repository" . }}/{{.Values.global.aaf.image}}
+ image: {{ include "
repositoryGenerator
.repository" . }}/{{.Values.global.aaf.image}}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports: {{ include "common.containerPorts" . | nindent 10 }}
volumeMounts:
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports: {{ include "common.containerPorts" . | nindent 10 }}
volumeMounts:
@@
-37,6
+41,11
@@
spec:
- mountPath: /etc/localtime
name: localtime
readOnly: true
- mountPath: /etc/localtime
name: localtime
readOnly: true
+ - mountPath: /opt/app/osaaf/etc/org.osaaf.aaf.log4j.props
+ name: aaf-log
+ subPath: org.osaaf.aaf.log4j.props
+ - mountPath: /opt/app/osaaf/data/
+ name: config-identity
{{- if eq .Values.liveness.enabled true }}
livenessProbe:
tcpSocket:
{{- if eq .Values.liveness.enabled true }}
livenessProbe:
tcpSocket:
@@
-49,7
+58,7
@@
spec:
port: {{ .Values.readiness.port }}
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
port: {{ .Values.readiness.port }}
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
- resources: {{ include "common.resources" . | nindent 1
2
}}
+ resources: {{ include "common.resources" . | nindent 1
0
}}
{{- if .Values.nodeSelector }}
nodeSelector: {{ toYaml .Values.nodeSelector | nindent 10 }}
{{- end -}}
{{- if .Values.nodeSelector }}
nodeSelector: {{ toYaml .Values.nodeSelector | nindent 10 }}
{{- end -}}
@@
-62,6
+71,14
@@
spec:
path: /etc/localtime
- name: aaf-config-vol
emptyDir: {}
path: /etc/localtime
- name: aaf-config-vol
emptyDir: {}
+ - name: aaf-log
+ configMap:
+ name: {{ include "common.release" . }}-aaf-log
+ - name: config-init-identity
+ configMap:
+ name: {{ include "common.release" . }}-aaf-identity
+ - name: config-identity
+ emptyDir: {}
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
{{- end -}}
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
{{- end -}}