From e81583ac3e0a8fba90a9142431bee8170b2146e6 Mon Sep 17 00:00:00 2001 From: Radhika Pai Date: Tue, 2 Jun 2020 15:27:02 -0500 Subject: [PATCH] [update] kibana : add install hook and dependencies The flush-kibana-metadata job was causing issue in loading the kibana dashboard due to conflict in order this is run. Adding dependencies to avoid running jobs simultaneously. Change-Id: If5a2564a8b6a16fb0dbd6a93f2e6e02d91f394dc --- kibana/templates/job-flush-kibana-metadata.yaml | 2 +- kibana/values.yaml | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/kibana/templates/job-flush-kibana-metadata.yaml b/kibana/templates/job-flush-kibana-metadata.yaml index e96a2c7cb..741234bf3 100644 --- a/kibana/templates/job-flush-kibana-metadata.yaml +++ b/kibana/templates/job-flush-kibana-metadata.yaml @@ -41,7 +41,7 @@ spec: labels: {{ tuple $envAll "kibana" "flush_kibana_metadata" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} annotations: - "helm.sh/hook": post-delete, pre-upgrade + "helm.sh/hook": pre-install, post-delete, pre-upgrade "helm.sh/hook-delete-policy": hook-succeeded {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }} configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} diff --git a/kibana/values.yaml b/kibana/values.yaml index 2d11c1d12..49f4ad3ff 100644 --- a/kibana/values.yaml +++ b/kibana/values.yaml @@ -161,17 +161,21 @@ dependencies: - endpoint: internal service: local_image_registry kibana: + jobs: + - flush-kibana-metadata services: - endpoint: internal service: elasticsearch register_kibana_indexes: + jobs: + - flush-kibana-metadata services: - endpoint: internal service: kibana flush_kibana_metadata: services: - endpoint: internal - service: kibana + service: elasticsearch jobs: flush_kibana_metadata: