Merge branch '224-upgrade-elasticsearch-kibana-package-to-7-10-x-versions' into 'master'

Resolve "Upgrade elasticsearch-kibana package to 7.10.X versions"

Closes #224

See merge request platform-one/big-bang/bigbang!342

chart/templates/logging/elasticsearch-kibana/values.yaml

@@ -42,12 +42,10 @@ sso:
 {{- end }}
 
 kibana:
-  version: 7.9.2
   imagePullSecrets:
     - name: private-registry
 
 elasticsearch:
-  version: 7.9.2
   imagePullSecrets:
     - name: private-registry
 {{- end -}}

chart/values.yaml

@@ -242,7 +242,7 @@ logging:
   git:
     repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/elasticsearch-kibana.git
     path: "./chart"
-    tag: "0.1.10-bb.2"
+    tag: "0.1.11-bb.0"
 
   # -- Flux reconciliation overrides specifically for the Logging (EFK) Package
   flux:

scripts/deploy/02_wait_for_helmreleases.sh

@@ -96,11 +96,17 @@ do
   fi
 done
 
+# Double check everything got waited on...
+kubectl wait --for=condition=Ready --timeout 600s helmrelease -n bigbang --all
+
 echo "Waiting on Secrets Kustomization"
 kubectl wait --for=condition=Ready --timeout 300s kustomizations.kustomize.toolkit.fluxcd.io -n bigbang secrets
 
 # In case some helm releases are marked as ready before all objects are live...
-echo "Waiting on all deployments, statefulsets, and daemonsets"
+echo "Waiting on all jobs, deployments, statefulsets, and daemonsets"
 kubectl wait --for=condition=available --timeout 600s -A deployment --all > /dev/null
 wait_sts
 wait_daemonset
+if kubectl get job -A -o jsonpath='{.items[].metadata.name}' &> /dev/null; then
+  kubectl wait --for=condition=complete --timeout 300s -A job --all > /dev/null
+fi

tests/ci/k3d/values.yaml

@@ -18,13 +18,15 @@ logging:
             cpu: .5
           limits: {}
       data:
-        count: 1
+        count: 2
         persistence:
           size: 5Gi
         resources:
           requests:
             cpu: .5
           limits: {}
+    kibana:
+      count: 1
 
 fluentbit:
   values: