diff --git a/chart/templates/elasticsearch-kibana/values.yaml b/chart/templates/elasticsearch-kibana/values.yaml index f121a0adc85db8a1d5699a17b9f988fc8d151c70..a47482324b4a38f3a3ce364c5de33dcd8c3e1503 100644 --- a/chart/templates/elasticsearch-kibana/values.yaml +++ b/chart/templates/elasticsearch-kibana/values.yaml @@ -14,6 +14,12 @@ imagePullPolicy: {{ .Values.imagePullPolicy }} istio: enabled: {{ .Values.istio.enabled }} + hardened: + {{- if or (dig "istio" "hardened" "enabled" .Values.loki.values) (dig "istio" "hardened" "enabled" .Values.elasticsearchKibana.values) }} + enabled: true + {{- else }} + enabled: false + {{- end }} kibana: gateways: - istio-system/{{ default "public" .Values.elasticsearchKibana.ingress.gateway }} diff --git a/chart/templates/loki/values.yaml b/chart/templates/loki/values.yaml index 634ecfe2442d5896706d7ea1aa84952e167d8ea1..38efec3710dfef5b5c44044c4fd04103a4b30d8a 100644 --- a/chart/templates/loki/values.yaml +++ b/chart/templates/loki/values.yaml @@ -9,6 +9,12 @@ openshift: {{ .Values.openshift }} istio: enabled: {{ .Values.istio.enabled }} + hardened: + {{- if or (dig "istio" "hardened" "enabled" .Values.loki.values) (dig "istio" "hardened" "enabled" .Values.elasticsearchKibana.values) }} + enabled: true + {{- else }} + enabled: false + {{- end }} imagePullSecrets: - name: private-registry diff --git a/chart/values.yaml b/chart/values.yaml index 001ffbcb8e8c133a2abfb0bff54eb41de66f7f39..726314e5815e9c9cb119f2485a3cb60a39c09a0a 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -571,11 +571,11 @@ elasticsearchKibana: git: repo: https://repo1.dso.mil/big-bang/product/packages/elasticsearch-kibana.git path: "./chart" - tag: "1.9.0-bb.0" + tag: "1.9.0-bb.1" helmRepo: repoName: "registry1" chartName: "elasticsearch-kibana" - tag: "1.9.0-bb.0" + tag: "1.9.0-bb.1" # -- Flux reconciliation overrides specifically for the Logging (EFK) Package flux: @@ -697,11 +697,11 @@ loki: git: repo: https://repo1.dso.mil/big-bang/product/packages/loki.git path: "./chart" - tag: "5.42.0-bb.1" + tag: "5.42.0-bb.2" helmRepo: repoName: "registry1" chartName: "loki" - tag: "5.42.0-bb.1" + tag: "5.42.0-bb.2" # -- Flux reconciliation overrides specifically for the Loki Package flux: {} diff --git a/tests/test-values.yaml b/tests/test-values.yaml index bb870734dc61e95fc6bbac3cbcd7594d9af1c091..d8df392dd8b782179ff3558afbc3ee67a6b01c2d 100644 --- a/tests/test-values.yaml +++ b/tests/test-values.yaml @@ -703,6 +703,9 @@ elasticsearchKibana: license: trial: false values: + istio: + hardened: + enabled: true elasticsearch: master: count: 1