Merge branch 'update-elasticsearch-kibana-tag-1.18.0-bb.2' into 'master'

elasticsearchKibana update to 1.18.0-bb.2

Closes big-bang/product/packages/elasticsearch-kibana#200

See merge request !5039

chart/templates/elasticsearch-kibana/values.yaml

@@ -83,6 +83,12 @@ kibana:
   podAnnotations:
     {{ include "istioAnnotation" . }}
 {{- end }}
+  {{- if .Values.kiali.enabled }}
+  podLabels:
+    {{- include "kialiAppLabel" . | nindent 4 }}
+    {{- include "kialiVersionLabel" . | nindent 4 }}
+  {{- end }}
+
 {{- if not .Values.elasticsearchKibana.serviceAccountAnnotations.kibana }}
   serviceAccountAnnotations: {}
 {{- else }}
@@ -93,6 +99,10 @@ monitoring:
 
 metrics:
   enabled: {{ .Values.monitoring.enabled }}
+  {{- if .Values.kiali.enabled }}
+  podLabels:
+    {{- include "kialiVersionLabel" . | nindent 4 }}
+  {{- end }}
   {{- $istioInjection := (and (eq (dig "istio" "injection" "enabled" .Values.elasticsearchKibana) "enabled") .Values.istio.enabled) }}
   {{- if and (eq (dig "istio" "mtls" "mode" "STRICT" .Values.elasticsearchKibana.values) "STRICT") $istioInjection }}
   serviceMonitor:
@@ -108,6 +118,11 @@ elasticsearch:
   imagePullSecrets:
     - name: private-registry
   master:
+    {{- if .Values.kiali.enabled }}
+    podLabels:
+      {{- include "kialiAppLabel" . | nindent 6 }}
+      {{- include "kialiVersionLabel" . | nindent 6 }}
+    {{- end }}
     initContainers:
       - name: elastic-internal-init-filesystem
         securityContext:
@@ -134,6 +149,11 @@ elasticsearch:
       {{ include "istioAnnotation" . }}
     {{- end }}
   data:
+    {{- if .Values.kiali.enabled }}
+    podLabels:
+      {{- include "kialiAppLabel" . | nindent 6 }}
+      {{- include "kialiVersionLabel" . | nindent 6 }}
+    {{- end }}
     initContainers:
       - name: elastic-internal-init-filesystem
         securityContext:
@@ -160,6 +180,11 @@ elasticsearch:
       {{ include "istioAnnotation" . }}
     {{- end }}
   ingest:
+    {{- if .Values.kiali.enabled }}
+    podLabels:
+      {{- include "kialiAppLabel" . | nindent 6 }}
+      {{- include "kialiVersionLabel" . | nindent 6 }}
+    {{- end }}
     initContainers:
       - name: elastic-internal-init-filesystem
         securityContext:
@@ -186,6 +211,11 @@ elasticsearch:
       {{ include "istioAnnotation" . }}
     {{- end }}
   ml:
+    {{- if .Values.kiali.enabled }}
+    podLabels:
+      {{- include "kialiAppLabel" . | nindent 6 }}
+      {{- include "kialiVersionLabel" . | nindent 6 }}
+    {{- end }}
     initContainers:
       - name: elastic-internal-init-filesystem
         securityContext:
@@ -212,6 +242,11 @@ elasticsearch:
       {{ include "istioAnnotation" . }}
     {{- end }}
   coord:
+    {{- if .Values.kiali.enabled }}
+    podLabels:
+      {{- include "kialiAppLabel" . | nindent 6 }}
+      {{- include "kialiVersionLabel" . | nindent 6 }}
+    {{- end }}
     initContainers:
       - name: elastic-internal-init-filesystem
         securityContext:

chart/values.yaml

@@ -570,11 +570,11 @@ elasticsearchKibana:
   git:
     repo: https://repo1.dso.mil/big-bang/product/packages/elasticsearch-kibana.git
     path: "./chart"
-    tag: "1.18.0-bb.0"
+    tag: "1.18.0-bb.2"
   helmRepo:
     repoName: "registry1"
     chartName: "elasticsearch-kibana"
-    tag: "1.18.0-bb.0"
+    tag: "1.18.0-bb.2"
 
   # -- Flux reconciliation overrides specifically for the Logging (EFK) Package
   flux: