Merge branch 'renovate/ironbank' into 'main'

Update Ironbank

See merge request platform-one/big-bang/apps/core/elasticsearch-kibana!101

CHANGELOG.md

@@ -3,6 +3,13 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ---
+## [0.9.0-bb.0] - 2022-07-15
+### Changed
+- Updated chart version to `0.9.0-bb.0`
+- Updated appVersion to `8.3.2`
+- Updated Kibana to `8.3.1`
+- Updated Elasticsearch to `8.3.2`
+
 ## [0.8.0-bb.1] - 2022-06-28
 ### Changed
 - Updated bb base image to 2.0.0

README.md

 # logging
 
-![Version: 0.8.0-bb.1](https://img.shields.io/badge/Version-0.8.0--bb.1-informational?style=flat-square) ![AppVersion: 8.2.3](https://img.shields.io/badge/AppVersion-8.2.3-informational?style=flat-square)
+![Version: 0.9.0-bb.0](https://img.shields.io/badge/Version-0.9.0--bb.0-informational?style=flat-square) ![AppVersion: 8.3.2](https://img.shields.io/badge/AppVersion-8.3.2-informational?style=flat-square)
 
 Configurable Deployment of Elasticsearch and Kibana Custom Resources Wrapped Inside a Helm Chart.
 

chart/Chart.yaml

 apiVersion: v2
 name: logging
 description: Configurable Deployment of Elasticsearch and Kibana Custom Resources Wrapped Inside a Helm Chart.
-version: 0.8.0-bb.1
-appVersion: 8.2.3
+version: 0.9.0-bb.0
+appVersion: 8.3.2
 dependencies:
   - name: gluon
     version: "0.2.10"
     repository: oci://registry.dso.mil/platform-one/big-bang/apps/library-charts/gluon
 annotations:
   bigbang.dev/applicationVersions: |
-    - Kibana: 8.2.3
-    - Elasticsearch: 8.2.3
+    - Kibana: 8.3.1
+    - Elasticsearch: 8.3.2

chart/templates/bigbang/upgrade-job.yaml

@@ -120,6 +120,9 @@ spec:
               elif [[ $(kubectl get elasticsearch {{ .Release.Name }} -n {{ .Release.Namespace }} -o jsonpath='{.status.version}') == 7.17.* ]] && [[ $(kubectl get elasticsearch {{ .Release.Name }} -n {{ .Release.Namespace }} -o jsonpath='{.spec.version}') == 8.2.* ]]; then
                 export ES_DESIRED_VERSION="8.2.*"
                 export ROLLING_UPGRADE="true"
+              elif [[ $(kubectl get elasticsearch {{ .Release.Name }} -n {{ .Release.Namespace }} -o jsonpath='{.status.version}') == 8.2.* ]] && [[ $(kubectl get elasticsearch {{ .Release.Name }} -n {{ .Release.Namespace }} -o jsonpath='{.spec.version}') == 8.3.* ]]; then
+                export ES_DESIRED_VERSION="8.3.*"
+                export ROLLING_UPGRADE="true"
               fi
 
               if [[ "$ROLLING_UPGRADE" == "true" ]]; then

chart/values.yaml

@@ -10,12 +10,12 @@ imagePullPolicy: IfNotPresent
 
 kibana:
   # -- Kibana version
-  version: 8.2.3
+  version: 8.3.1
   image:
     # -- Kibana image repository
     repository: registry1.dso.mil/ironbank/elastic/kibana/kibana
     # -- Kibana image tag
-    tag: 8.2.3
+    tag: 8.3.1
 
   # -- Kibana Ingress Host Value.
   # Only required if not using Istio for ingress.
@@ -100,12 +100,12 @@ kibana:
 
 elasticsearch:
   # -- Elasticsearch version
-  version: 8.2.3
+  version: 8.3.2
   image:
     # -- Elasticsearch image repository
     repository: registry1.dso.mil/ironbank/elastic/elasticsearch/elasticsearch
     # -- Elasticsearch image tag
-    tag: 8.2.3
+    tag: 8.3.2
 
   # -- Elasticsearch imagePullSecrets
   imagePullSecrets: []

tests/wait.sh

@@ -2,6 +2,7 @@
 wait_project() {
    timeElapsed=0
    while true; do
+      sleep 50
       elasticHealth=$(kubectl get elasticsearch -A -o jsonpath='{.items[0].status.health}' | xargs)
       kibanaHealth=$(kubectl get kibana -A -o jsonpath='{.items[0].status.health}' | xargs)
       if [[ $elasticHealth == "green" && $kibanaHealth == "green" ]]; then