diff options
author | Fiete Ostkamp <Fiete.Ostkamp@telekom.de> | 2024-09-04 16:55:56 +0200 |
---|---|---|
committer | Fiete Ostkamp <fiete.ostkamp@telekom.de> | 2024-09-19 13:50:44 +0000 |
commit | a6889979459185d6873695ab9c4c74dbeed6daee (patch) | |
tree | c7c97a0071c7115793f7ddb72f7b8c875d1894df /kubernetes/aai/components/aai-babel/templates | |
parent | 0765a2124569cfa38a2828f2c9d88cf8cca8eedc (diff) |
[AAI] 14.0.3 Oslo release with Java 11
- [resources,traversal,graphadmin] use 1.14.7 release images that are based on Java 11
- [babel] add metrics and tracing
- [babel] allow remote profiling and debugging
- [graphadmin] make graphadmin chart Kyverno compliant
- [graphadmin] replace fixed initialDelaySeconds wait invertal with dynamic startup probe
- [graphadmin] use actuator endpoint for liveness and readiness probe. Actuator still uses the old echo probe in the background
- [graphadmin] remove janusgraph-cached.properties since it effectively cannot be used
- [graphadmin] clean up janusgraph-realtime.properties
- [graphadmin] use common functions for readiness probe
- [graphadmin] remove LOCAL_USER_ID and LOCAL_GROUP_ID environment variables since they are not used (anymore)
- [modelloader] add metrics monitoring via prometheus
- [modelloader] allow remote profiling and debugging
- [sparky-be] use latest release image (2.0.5)
Other
- [sdc-be] declare ServiceMonitor to enable metrics monitoring via Prometheus
Issue-ID: AAI-3986
Change-Id: Ifbd52d0d019d34596f6f824aa940e9b7993336ab
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
Diffstat (limited to 'kubernetes/aai/components/aai-babel/templates')
-rw-r--r-- | kubernetes/aai/components/aai-babel/templates/deployment.yaml | 29 | ||||
-rw-r--r-- | kubernetes/aai/components/aai-babel/templates/servicemonitor.yaml | 3 |
2 files changed, 28 insertions, 4 deletions
diff --git a/kubernetes/aai/components/aai-babel/templates/deployment.yaml b/kubernetes/aai/components/aai-babel/templates/deployment.yaml index cb40883365..f3fc04c00c 100644 --- a/kubernetes/aai/components/aai-babel/templates/deployment.yaml +++ b/kubernetes/aai/components/aai-babel/templates/deployment.yaml @@ -22,7 +22,11 @@ kind: Deployment metadata: {{- include "common.resourceMetadata" . | nindent 2 }} spec: selector: {{- include "common.selectors" . | nindent 4 }} + {{- if .Values.debug.enabled }} + replicas: 1 + {{- else }} replicas: {{ .Values.replicaCount }} + {{- end }} revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} strategy: type: {{ .Values.updateStrategy.type }} @@ -38,10 +42,19 @@ spec: - name: {{ include "common.name" . }} image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - ports: {{ include "common.containerPorts" . | nindent 12 }} - # disable liveness probe when breakpoints set in debugger - # so K8s doesn't restart unresponsive container - {{ if .Values.liveness.enabled }} + ports: + {{- if .Values.debug.enabled }} + - containerPort: {{ .Values.debug.port }} + name: {{ .Values.debug.portName }} + {{- end }} + {{- if .Values.profiling.enabled }} + - containerPort: {{ .Values.profiling.port }} + name: {{ .Values.profiling.portName }} + {{- end }} + {{ include "common.containerPorts" . | nindent 12 }} + # disable liveness probe when + # debugging.enabled=true or profiling.enabled=true + {{- if and .Values.liveness.enabled (not (or .Values.debug.enabled .Values.profiling.enabled)) }} livenessProbe: tcpSocket: port: {{ .Values.service.internalPort }} @@ -58,6 +71,14 @@ spec: value: NotUsed - name: CONFIG_HOME value: /opt/app/babel/config + {{- if .Values.profiling.enabled }} + - name: JVM_OPTS + value: '{{ join " " .Values.profiling.args }}' + {{- end }} + {{- if .Values.debug.enabled }} + - name: JVM_OPTS + value: {{ .Values.debug.args | quote }} + {{- end }} volumeMounts: - mountPath: /opt/app/babel/config/application.properties name: config diff --git a/kubernetes/aai/components/aai-babel/templates/servicemonitor.yaml b/kubernetes/aai/components/aai-babel/templates/servicemonitor.yaml new file mode 100644 index 0000000000..dc706029bf --- /dev/null +++ b/kubernetes/aai/components/aai-babel/templates/servicemonitor.yaml @@ -0,0 +1,3 @@ +{{- if .Values.metrics.serviceMonitor.enabled }} +{{ include "common.serviceMonitor" . }} +{{- end }} |