From fa2c1e0b55de2a0e8b4b0e35b4178ff4ce14cbe2 Mon Sep 17 00:00:00 2001
From: Chi Lo <cl566n@att.com>
Date: Thu, 21 Oct 2021 22:23:00 +0000
Subject: [PATCH] Revert "Remove Kibana indices before pod start up"

This reverts commit 122dcef6295e1b62c113476737c29b8b031fbe85.
https://review.opendev.org/c/openstack/openstack-helm-infra/+/805246

The changes from the above patchset is a result of upgrading
Elasticsearch and Kibana images to v7.14.  This image has been
reverted back to v7.9.2.  As such, these changes are no longer
correct.

Change-Id: I44e9993002cbf1d2c4f5cb23d340b01bad521427
---
 kibana/Chart.yaml                             |  2 +-
 .../bin/_create_kibana_index_patterns.sh.tpl  | 17 -----------
 kibana/templates/bin/_kibana.sh.tpl           |  4 ---
 .../job-register-kibana-indexes.yaml          | 29 ------------------
 kibana/values.yaml                            | 30 ++++++++++++++++++-
 releasenotes/notes/kibana.yaml                |  1 +
 6 files changed, 31 insertions(+), 52 deletions(-)

diff --git a/kibana/Chart.yaml b/kibana/Chart.yaml
index ffd818339..d8aafb822 100644
--- a/kibana/Chart.yaml
+++ b/kibana/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v7.1.0
 description: OpenStack-Helm Kibana
 name: kibana
-version: 0.1.8
+version: 0.1.9
 home: https://www.elastic.co/products/kibana
 sources:
   - https://github.com/elastic/kibana
diff --git a/kibana/templates/bin/_create_kibana_index_patterns.sh.tpl b/kibana/templates/bin/_create_kibana_index_patterns.sh.tpl
index 59c0616e9..2520b939b 100644
--- a/kibana/templates/bin/_create_kibana_index_patterns.sh.tpl
+++ b/kibana/templates/bin/_create_kibana_index_patterns.sh.tpl
@@ -14,23 +14,6 @@ limitations under the License.
 */}}
 set -ex
 
-{{- if .Values.manifests.wait_for_kibana_pods_readiness }}
-echo "Waiting for all Kibana pods to become Ready"
-count=1
-# Wait up to 30 minutes for all Kibana pods to become Ready.  This does not necessarily mean
-# Kibana pods will take up to 30 minutes to come up.  This script will wait up to 30 minutes
-# instead of going into an infinite loop to wait.  This timed out value should be reduced once
-# Kibana startup is enhanced.
-while [[ $(kubectl get pods -n {{ .Release.Namespace }} -l application=kibana,component=dashboard -o 'jsonpath={..status.conditions[?(@.type=="Ready")].status}') =~ "False" ]]; do
-  sleep 30
-  if [[ $count -eq 60 ]]; then
-    echo "Timed out waiting for all Kibana pods to become Ready, proceed to create index patterns."
-    break
-  fi
-  ((count++))
-done
-{{- end }}
-
 {{- range $objectType, $indices := .Values.conf.create_kibana_indexes.indexes }}
 {{- range $indices }}
 curl -K- <<< "--user ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD}" \
diff --git a/kibana/templates/bin/_kibana.sh.tpl b/kibana/templates/bin/_kibana.sh.tpl
index 90f7f8e3a..1172813cf 100644
--- a/kibana/templates/bin/_kibana.sh.tpl
+++ b/kibana/templates/bin/_kibana.sh.tpl
@@ -17,10 +17,6 @@ set -e
 COMMAND="${@:-start}"
 
 function start () {
-
-  curl --cacert /etc/elasticsearch/certs/ca.crt -K- <<< "--user ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD}" \
-      -XDELETE "${ELASTICSEARCH_HOSTS}/.kibana*"
-
   exec /usr/share/kibana/bin/kibana \
     --elasticsearch.hosts="${ELASTICSEARCH_HOSTS}" \
     --elasticsearch.username="${ELASTICSEARCH_USERNAME}" \
diff --git a/kibana/templates/job-register-kibana-indexes.yaml b/kibana/templates/job-register-kibana-indexes.yaml
index f8522c689..9e64b31f3 100644
--- a/kibana/templates/job-register-kibana-indexes.yaml
+++ b/kibana/templates/job-register-kibana-indexes.yaml
@@ -24,9 +24,6 @@ metadata:
   name: register-kibana-indexes
   labels:
 {{ tuple $envAll "kibana" "register_kibana_indexes" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
-  annotations:
-    "helm.sh/hook": post-install,post-upgrade
-    "helm.sh/hook-delete-policy": before-hook-creation
 spec:
   template:
     metadata:
@@ -86,30 +83,4 @@ spec:
           configMap:
             name: kibana-bin
             defaultMode: 0755
----
-kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: {{ $serviceAccountName }}
-rules:
-  - apiGroups:
-      - ''
-    resources:
-      - pods
-    verbs:
-      - get
-      - list
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: {{ $serviceAccountName }}
-subjects:
-  - kind: ServiceAccount
-    name: {{ $serviceAccountName }}
-    namespace: {{ $envAll.Release.Namespace }}
-roleRef:
-  kind: ClusterRole
-  name: {{ $serviceAccountName }}
-  apiGroup: rbac.authorization.k8s.io
 {{- end }}
diff --git a/kibana/values.yaml b/kibana/values.yaml
index 2f9a47b1a..779850943 100644
--- a/kibana/values.yaml
+++ b/kibana/values.yaml
@@ -26,6 +26,7 @@ images:
     dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
     image_repo_sync: docker.io/library/docker:17.07.0
     register_kibana_indexes: docker.io/openstackhelm/heat:newton-ubuntu_xenial
+    flush_kibana_metadata: docker.io/openstackhelm/heat:newton-ubuntu_xenial
   pull_policy: IfNotPresent
   local_registry:
     active: false
@@ -53,6 +54,13 @@ pod:
         register_kibana_indexes:
           allowPrivilegeEscalation: false
           readOnlyRootFilesystem: true
+    flush_kibana_metadata:
+      pod:
+        runAsUser: 1000
+      container:
+        flush_kibana_metadata:
+          allowPrivilegeEscalation: false
+          readOnlyRootFilesystem: true
   affinity:
     anti:
       type:
@@ -102,6 +110,13 @@ pod:
         limits:
           memory: "1024Mi"
           cpu: "2000m"
+      flush_kibana_metadata:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
   probes:
     kibana:
       kibana:
@@ -145,13 +160,26 @@ 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: elasticsearch
+
+jobs:
+  flush_kibana_metadata:
+    backoffLimit: 6
+    activeDeadlineSeconds: 600
 
 conf:
   httpd: |
@@ -396,5 +424,5 @@ manifests:
   service: true
   service_ingress: true
   job_register_kibana_indexes: true
-  wait_for_kibana_pods_readiness: false
+  job_flush_kibana_metadata: true
 ...
diff --git a/releasenotes/notes/kibana.yaml b/releasenotes/notes/kibana.yaml
index a6d9e2b73..dd3ea8073 100644
--- a/releasenotes/notes/kibana.yaml
+++ b/releasenotes/notes/kibana.yaml
@@ -9,4 +9,5 @@ kibana:
   - 0.1.6 Remove Kibana indices before pod start up
   - 0.1.7 Helm 3 - Fix Job labels
   - 0.1.8 Update htk requirements
+  - 0.1.9 Revert removing Kibana indices before pod start up
 ...