Merge branch 'renovate/ironbank' into 'main'

SKIP UPGRADE: Update Ironbank

See merge request !328

CHANGELOG.md

@@ -3,6 +3,14 @@
 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).
 
 ---
+## [1.25.0-bb.0] - 2025-01-22
+### Changed
+- gluon updated from 0.5.12 to 0.5.14
+- ironbank/elastic/elasticsearch/elasticsearch updated from 8.17.0 to 8.17.1
+- ironbank/elastic/kibana/kibana updated from 8.17.0 to 8.17.1
+- ironbank/opensource/kubernetes/kubectl updated from v1.30.8 to v1.30.9
+- update kibana init container name from eks-operator 2.16.1 update: https://github.com/elastic/cloud-on-k8s/issues/8426
+
 ## [1.24.0-bb.2] - 2024-12-23
 ### Changed
 

README.md

 <!-- Warning: Do not manually edit this file. See notes on gluon + helm-docs at the end of this file for more information. -->
 # elasticsearch-kibana
 
-![Version: 1.24.0-bb.2](https://img.shields.io/badge/Version-1.24.0--bb.2-informational?style=flat-square) ![AppVersion: 8.17.0](https://img.shields.io/badge/AppVersion-8.17.0-informational?style=flat-square) ![Maintenance Track: bb_integrated](https://img.shields.io/badge/Maintenance_Track-bb_integrated-green?style=flat-square)
+![Version: 1.25.0-bb.0](https://img.shields.io/badge/Version-1.25.0--bb.0-informational?style=flat-square) ![AppVersion: 8.17.1](https://img.shields.io/badge/AppVersion-8.17.1-informational?style=flat-square) ![Maintenance Track: bb_integrated](https://img.shields.io/badge/Maintenance_Track-bb_integrated-green?style=flat-square)
 
 Configurable Deployment of Elasticsearch and Kibana Custom Resources Wrapped Inside a Helm Chart.
 
@@ -46,9 +46,9 @@ helm install elasticsearch-kibana chart/
 | autoRollingUpgrade.enabled | bool | `true` | Enable BigBang specific autoRollingUpgrade support |
 | imagePullPolicy | string | `"IfNotPresent"` | Pull Policy for all non-init containers in this package. |
 | fluentbit | object | `{"enabled":false}` | Toggle for networkpolicies to allow fluentbit ingress |
-| kibana.version | string | `"8.17.0"` | Kibana version |
+| kibana.version | string | `"8.17.1"` | Kibana version |
 | kibana.image.repository | string | `"registry1.dso.mil/ironbank/elastic/kibana/kibana"` | Kibana image repository |
-| kibana.image.tag | string | `"8.17.0"` | Kibana image tag |
+| kibana.image.tag | string | `"8.17.1"` | Kibana image tag |
 | kibana.host | string | `""` | Kibana Ingress Host Value. Only required if not using Istio for ingress. |
 | kibana.count | int | `3` | Number of Kibana replicas |
 | kibana.serviceAccountName | string | `"logging-kibana"` | Name for serviceAccount to use, will be autocreated. |
@@ -66,9 +66,9 @@ helm install elasticsearch-kibana chart/
 | kibana.nodeSelector | object | `{}` | Kibana nodeSelector |
 | kibana.lifecycle | object | `{}` | Kibana lifecycle |
 | kibana.agents | object | `{}` | Kibana Elastic Agent / Fleet Server configuration https://www.elastic.co/guide/en/cloud-on-k8s/2.7/k8s-elastic-agent-fleet-quickstart.html |
-| elasticsearch.version | string | `"8.17.0"` | Elasticsearch version |
+| elasticsearch.version | string | `"8.17.1"` | Elasticsearch version |
 | elasticsearch.image.repository | string | `"registry1.dso.mil/ironbank/elastic/elasticsearch/elasticsearch"` | Elasticsearch image repository |
-| elasticsearch.image.tag | string | `"8.17.0"` | Elasticsearch image tag |
+| elasticsearch.image.tag | string | `"8.17.1"` | Elasticsearch image tag |
 | elasticsearch.imagePullSecrets | list | `[]` | Elasticsearch imagePullSecrets |
 | elasticsearch.serviceAccountName | string | `"logging-elasticsearch"` | Name for serviceAccount to use, will be autocreated. |
 | elasticsearch.serviceAccountAnnotations | object | `{}` | Annotations for the elasticsearch service account. |
@@ -242,7 +242,7 @@ helm install elasticsearch-kibana chart/
 | bbtests.scripts.envs | object | `{"desired_version":"{{ .Values.elasticsearch.version }}","elasticsearch_host":"https://{{ .Release.Name }}-es-http.{{ .Release.Namespace }}.svc.cluster.local:9200"}` | ENVs added to script test pods |
 | bbtests.scripts.secretEnvs | list | `[{"name":"ELASTIC_PASSWORD","valueFrom":{"secretKeyRef":{"key":"elastic","name":"logging-ek-es-elastic-user"}}}]` | ENVs added to script test pods from existing secrets |
 | waitJob.enabled | bool | `true` |  |
-| waitJob.scripts.image | string | `"registry1.dso.mil/ironbank/opensource/kubernetes/kubectl:v1.30.8"` |  |
+| waitJob.scripts.image | string | `"registry1.dso.mil/ironbank/opensource/kubernetes/kubectl:v1.30.9"` |  |
 | waitJob.permissions.resources[0] | string | `"elasticsearch-kibana"` |  |
 
 ## Contributing

chart/Chart.lock

 dependencies:
 - name: gluon
   repository: oci://registry1.dso.mil/bigbang
-  version: 0.5.12
+  version: 0.5.14
 - name: prometheus-elasticsearch-exporter
   repository: file://./deps/prometheus-elasticsearch-exporter
   version: 6.6.0
-digest: sha256:4953146c2b6fcc9f29d15268ca3fa425f22448b5ce9c8f6aeb924387a3e25b74
-generated: "2024-12-23T06:30:49.891161-06:00"
+digest: sha256:00b369d34eeb14eb24d7b8cbb5c2e64e075f589d0f7b2935bfcaa8b051adb297
+generated: "2025-01-22T07:18:00.031578739Z"

chart/Chart.yaml

 apiVersion: v2
 name: elasticsearch-kibana
 description: Configurable Deployment of Elasticsearch and Kibana Custom Resources Wrapped Inside a Helm Chart.
-version: 1.24.0-bb.2
-appVersion: 8.17.0
+version: 1.25.0-bb.0
+appVersion: 8.17.1
 dependencies:
   - name: gluon
-    version: 0.5.12
+    version: 0.5.14
     repository: oci://registry1.dso.mil/bigbang
   - name: prometheus-elasticsearch-exporter
     repository: file://./deps/prometheus-elasticsearch-exporter
@@ -15,8 +15,8 @@ dependencies:
 annotations:
   bigbang.dev/maintenanceTrack: bb_integrated
   bigbang.dev/applicationVersions: |
-    - Kibana: 8.17.0
-    - Elasticsearch: 8.17.0
+    - Kibana: 8.17.1
+    - Elasticsearch: 8.17.1
   bigbang.dev/upstreamReleaseNotesMarkdown: |
     This chart has no upstream and is maintained entirely by the Big Bang team. It is 
     (usually) updated any time new versions of elasticsearch and kibana are released
@@ -26,9 +26,9 @@ annotations:
     - [Kibana](https://www.elastic.co/guide/en/kibana/current/release-notes.html)
   helm.sh/images: |
     - name: kibana
-      image: registry1.dso.mil/ironbank/elastic/kibana/kibana:8.17.0
+      image: registry1.dso.mil/ironbank/elastic/kibana/kibana:8.17.1
     - name: elasticsearch
-      image: registry1.dso.mil/ironbank/elastic/elasticsearch/elasticsearch:8.17.0
+      image: registry1.dso.mil/ironbank/elastic/elasticsearch/elasticsearch:8.17.1
     - name: base
       image: registry1.dso.mil/ironbank/big-bang/base:2.1.0
     - name: script-tests
@@ -38,4 +38,4 @@ annotations:
       condition: metrics.enabled
       image: registry1.dso.mil/ironbank/opensource/bitnami/elasticsearch-exporter:1.8.0
     - name: kubectl
-      image: registry1.dso.mil/ironbank/opensource/kubernetes/kubectl:v1.30.8
+      image: registry1.dso.mil/ironbank/opensource/kubernetes/kubectl:v1.30.9

chart/templates/kibana.yaml

@@ -75,7 +75,7 @@ spec:
           {{- toYaml .updateStrategy | nindent 10 }}
         {{- end }}
       initContainers:
-        - name: elastic-internal-init-config
+        - name: elastic-internal-init
           securityContext:
             capabilities:
               drop:

chart/values.yaml

@@ -15,12 +15,12 @@ fluentbit:
 
 kibana:
   # -- Kibana version
-  version: 8.17.0
+  version: 8.17.1
   image:
     # -- Kibana image repository
     repository: registry1.dso.mil/ironbank/elastic/kibana/kibana
     # -- Kibana image tag
-    tag: 8.17.0
+    tag: 8.17.1
 
   # -- Kibana Ingress Host Value.
   # Only required if not using Istio for ingress.
@@ -156,12 +156,12 @@ kibana:
 
 elasticsearch:
   # -- Elasticsearch version
-  version: 8.17.0
+  version: 8.17.1
   image:
     # -- Elasticsearch image repository
     repository: registry1.dso.mil/ironbank/elastic/elasticsearch/elasticsearch
     # -- Elasticsearch image tag
-    tag: 8.17.0
+    tag: 8.17.1
 
   # -- Elasticsearch imagePullSecrets
   imagePullSecrets: []
@@ -933,7 +933,7 @@ bbtests:
 waitJob:
   enabled: true
   scripts:
-    image: registry1.dso.mil/ironbank/opensource/kubernetes/kubectl:v1.30.8
+    image: registry1.dso.mil/ironbank/opensource/kubernetes/kubectl:v1.30.9
   permissions:
     resources:
      - elasticsearch-kibana

docs/DEVELOPMENT_MAINTENANCE.md

@@ -5,12 +5,9 @@ Elasticsearch-Kibana is a Big Bang built/maintained chart, there is no upstream
 1. Ensure that newest elastic/kibana images are compatible. If possible the image tags should be the same, although patch version differences are OK.
 
 2. Checkout the `renovate/ironbank` branch.
-    - This branch should already have the updates you need for the images, `elasticsearch.version`, `kibana.version` and `appVersion` in `Chart.yaml`. Validate that the `version` values are equal to their respective `image.tag` value and that the `appVersion` is equal to the elasticsearch version.
+    - This branch should already have the updates you need for the images, `elasticsearch.version`, `kibana.version` as well as `version` and `appVersion` in `Chart.yaml`. Validate that the `version` values are equal to their respective `image.tag` value and that the `appVersion` is equal to the elasticsearch version.
 
-3. Modify the `version` in `Chart.yaml`.
-    - Since this is an upstream chart you should bump the versioning following semver, and append `-bb.0`. In general for new elastic/kibana versions this will mean bumping the minor version (i.e. `0.1.2-bb.0` to `0.2.0-bb.0`). This value is usually updated automatically by renovate bot.
-
-4. Update dependencies and binaries using `helm dependency update ./chart`
+3. Update dependencies and binaries using `helm dependency update ./chart`
     - Pull assets and commit the binaries as well as the Chart.lock file that was generated.
 
         ```shell
@@ -36,17 +33,14 @@ Chart.yaml](https://github.com/prometheus-community/helm-charts/blob/main/charts
 
         - Otherwise (if a new chart does not exist with the new image), skip this image update and continue to `Step 5.`
 
-5. Update `CHANGELOG.md` adding an entry for the new version and noting all changes (at minimum should include `Updated Elasticsearch-Kibana to x.x.x`).
-
-6. Generate the `README.md` updates by following the [guide in gluon](https://repo1.dso.mil/platform-one/big-bang/apps/library-charts/gluon/-/blob/master/docs/bb-package-readme.md).
-    - Renovate bot may have already performed this step for you as well! 🤖
+4. Enusure that `CHANGELOG.md` has been updated by verifying or updating the entry for the new version and noting all changes (at minimum should include `Updated Elasticsearch-Kibana to x.x.x`).
 
-7. Push up your changes, add upgrade notices if applicable, validate that CI passes.
+5. Push up your changes, add upgrade notices if applicable, validate that CI passes.
     - If there are any failures, follow the information in the pipeline to make the necessary updates.
     - Add the `debug` label to the MR for more detailed information.
     - Reach out to the CODEOWNERS if needed.
 
-8. As part of your MR that modifies bigbang packages, you should modify the bigbang  [bigbang/tests/test-values.yaml](https://repo1.dso.mil/big-bang/bigbang/-/blob/master/tests/test-values.yaml?ref_type=heads) against your branch for the CI/CD MR testing by enabling your packages.
+6. As part of your MR that modifies bigbang packages, you should modify the bigbang  [bigbang/tests/test-values.yaml](https://repo1.dso.mil/big-bang/bigbang/-/blob/master/tests/test-values.yaml?ref_type=heads) against your branch for the CI/CD MR testing by enabling your packages.
 
     - To do this, at a minimum, you will need to follow the instructions at [bigbang/docs/developer/test-package-against-bb.md](https://repo1.dso.mil/big-bang/bigbang/-/blob/master/docs/developer/test-package-against-bb.md?ref_type=heads) with changes for Elasticsearch-Kibana enabled (the below is a reference, actual changes could be more depending on what changes where made to Elasticsearch-Kibana in the pakcage MR).
 
@@ -70,9 +64,9 @@ Chart.yaml](https://github.com/prometheus-community/helm-charts/blob/main/charts
       ### Additional compononents of Elasticsearch-Kibana should be changed to reflect testing changes introduced in the package MR
     ```
 
-10. Follow the `Testing a new Elasticsearch-Kibana version` section of this document for manual testing.
+6. Follow the `Testing a new Elasticsearch-Kibana version` section of this document for manual testing.
 
-# Testing a new Elasticsearch-Kibana version
+## Testing a new Elasticsearch-Kibana version
 
 - Run Helm Unittests
   - Make sure that you have helm unitests installed