ci(stability): merge the release/2.10 branch

Author: datacore-bolt-ci

chart/Chart.yaml

@@ -49,7 +49,7 @@ dependencies:
     repository: https://nats-io.github.io/k8s/helm/charts/
     condition: eventing.enabled
   - name: localpv-provisioner
-    version: 4.3.0
+    version: 4.4.0
     repository: https://openebs.github.io/dynamic-localpv-provisioner
     condition: localpv-provisioner.enabled
 annotations:
@@ -58,14 +58,26 @@ annotations:
       image: docker.io/grafana/alloy:v1.8.1
     - name: loki
       image: docker.io/grafana/loki:3.4.2
+    - name: k8s-sidecar
+      image: docker.io/kiwigrid/k8s-sidecar:1.30.2
+    - name: nats
+      image: docker.io/nats:2.9.17-alpine
+    - name: nats-box
+      image: docker.io/natsio/nats-box:0.13.8
+    - name: nats-server-config-reloader
+      image: docker.io/natsio/nats-server-config-reloader:0.10.1
+    - name: prometheus-nats-exporter
+      image: docker.io/natsio/prometheus-nats-exporter:0.11.0
     - name: alpine-bash
-      image: docker.io/openebs/alpine-bash:4.2.0
+      image: docker.io/openebs/alpine-bash:4.3.0
     - name: alpine-sh
-      image: docker.io/openebs/alpine-sh:4.2.0
+      image: docker.io/openebs/alpine-sh:4.3.0
     - name: etcd
       image: docker.io/openebs/etcd:3.6.4-debian-12-r0
     - name: kubectl
       image: docker.io/openebs/kubectl:1.25.15
+    - name: linux-utils
+      image: docker.io/openebs/linux-utils:4.3.0
     - name: mayastor-agent-core
       image: docker.io/openebs/mayastor-agent-core:release-2.10
     - name: mayastor-agent-ha-cluster
@@ -88,20 +100,8 @@ annotations:
       image: docker.io/openebs/mayastor-obs-callhome:release-2.10
     - name: mayastor-operator-diskpool
       image: docker.io/openebs/mayastor-operator-diskpool:release-2.10
-    - name: k8s-sidecar
-      image: kiwigrid/k8s-sidecar:1.30.2
-    - name: nats
-      image: nats:2.9.17-alpine
-    - name: nats-box
-      image: natsio/nats-box:0.13.8
-    - name: nats-server-config-reloader
-      image: natsio/nats-server-config-reloader:0.10.1
-    - name: prometheus-nats-exporter
-      image: natsio/prometheus-nats-exporter:0.11.0
-    - name: linux-utils
-      image: openebs/linux-utils:4.2.0
     - name: provisioner-localpv
-      image: openebs/provisioner-localpv:4.3.0
+      image: docker.io/openebs/provisioner-localpv:4.4.0
     - name: mc
       image: quay.io/minio/mc:RELEASE.2024-11-21T17-21-54Z
     - name: minio

chart/README.md

@@ -60,7 +60,7 @@ This removes all the Kubernetes components associated with the chart and deletes
 | https://grafana.github.io/helm-charts | loki | 6.29.0 |
 | https://jaegertracing.github.io/helm-charts | jaeger-operator | 2.50.1 |
 | https://nats-io.github.io/k8s/helm/charts/ | nats | 0.19.14 |
-| https://openebs.github.io/dynamic-localpv-provisioner | localpv-provisioner | 4.3.0 |
+| https://openebs.github.io/dynamic-localpv-provisioner | localpv-provisioner | 4.4.0 |
 
 ## Values
 

chart/images.txt

@@ -1,9 +1,15 @@
 docker.io/grafana/alloy:v1.8.1
 docker.io/grafana/loki:3.4.2
-docker.io/openebs/alpine-bash:4.2.0
-docker.io/openebs/alpine-sh:4.2.0
+docker.io/kiwigrid/k8s-sidecar:1.30.2
+docker.io/nats:2.9.17-alpine
+docker.io/natsio/nats-box:0.13.8
+docker.io/natsio/nats-server-config-reloader:0.10.1
+docker.io/natsio/prometheus-nats-exporter:0.11.0
+docker.io/openebs/alpine-bash:4.3.0
+docker.io/openebs/alpine-sh:4.3.0
 docker.io/openebs/etcd:3.6.4-debian-12-r0
 docker.io/openebs/kubectl:1.25.15
+docker.io/openebs/linux-utils:4.3.0
 docker.io/openebs/mayastor-agent-core:release-2.10
 docker.io/openebs/mayastor-agent-ha-cluster:release-2.10
 docker.io/openebs/mayastor-agent-ha-node:release-2.10
@@ -15,13 +21,7 @@ docker.io/openebs/mayastor-metrics-exporter-io-engine:release-2.10
 docker.io/openebs/mayastor-obs-callhome-stats:release-2.10
 docker.io/openebs/mayastor-obs-callhome:release-2.10
 docker.io/openebs/mayastor-operator-diskpool:release-2.10
-kiwigrid/k8s-sidecar:1.30.2
-nats:2.9.17-alpine
-natsio/nats-box:0.13.8
-natsio/nats-server-config-reloader:0.10.1
-natsio/prometheus-nats-exporter:0.11.0
-openebs/linux-utils:4.2.0
-openebs/provisioner-localpv:4.3.0
+docker.io/openebs/provisioner-localpv:4.4.0
 quay.io/minio/mc:RELEASE.2024-11-21T17-21-54Z
 quay.io/minio/minio:RELEASE.2024-12-18T13-15-44Z
 quay.io/prometheus-operator/prometheus-config-reloader:v0.81.0

chart/values.yaml

@@ -71,7 +71,7 @@ base:
     enabled: true
     image:
       name: alpine-sh
-      tag: 4.2.0
+      tag: 4.3.0
       pullPolicy: IfNotPresent
     containers:
       - name: agent-core-grpc-probe
@@ -574,8 +574,8 @@ etcd:
     image:
       registry: docker.io
       repository: openebs/alpine-bash
-      tag: 4.2.0
-      pullSecrets: []
+      tag: 4.3.0
+      pullSecrets: [ ]
   image:
     registry: docker.io
     repository: openebs/etcd
@@ -712,6 +712,9 @@ loki:
     replicas: 0
   bloomGateway:
     replicas: 0
+  sidecar:
+    image:
+      repository: docker.io/kiwigrid/k8s-sidecar
 alloy:
   logging_config:
     # Enable debugging on alloy components.
@@ -858,8 +861,7 @@ nats:
   nats:
     image:
       pullPolicy: IfNotPresent
-      # Defaults to docker.io
-      registry: ""
+      registry: docker.io
     jetstream:
       enabled: true
       memStorage:
@@ -887,6 +889,14 @@ nats:
   # The nats box can be installed for debugging, by default its enabled.
   natsbox:
     enabled: false
+    image:
+      registry: docker.io
+  reloader:
+    image:
+      registry: docker.io
+  exporter:
+    image:
+      registry: docker.io
 obs:
   callhome:
     # -- Enable callhome

scripts/helm/images.sh

@@ -68,7 +68,14 @@ helm_localpv_prov_helper_image() {
     log_fatal "Can't find the helm dependency: $chart"
   fi
 
-  registry="$(helm_dep_value "$chart" "$name" "helperPod.image.registry")"
+  local_registry="$(helm_dep_value "$chart" "$name" "helperPod.image.registry")"
+  global_registry="$(helm_dep_value "$chart" "$name" "global.imageRegistry")"
+  if [ -n "$local_registry" ]; then
+    registry="$local_registry"
+  else
+    registry="$global_registry"
+  fi
+
   repository="$(helm_dep_value_required "$chart" "$name" "helperPod.image.repository")"
   tag="$(helm_dep_value_required "$chart" "$name" "helperPod.image.tag")"