ci(stability): merge the release/2.9 branch

Author: datacore-bolt-ci

chart/Chart.yaml

@@ -54,8 +54,6 @@ dependencies:
     condition: localpv-provisioner.enabled
 annotations:
   helm.sh/images: |
-    - name: etcd
-      image: docker.io/bitnami/etcd:3.5.6-debian-11-r10
     - name: alloy
       image: docker.io/grafana/alloy:v1.8.1
     - name: loki
@@ -64,6 +62,8 @@ annotations:
       image: docker.io/openebs/alpine-bash:4.2.0
     - name: alpine-sh
       image: docker.io/openebs/alpine-sh:4.2.0
+    - name: etcd
+      image: docker.io/openebs/etcd:3.5.6-debian-11-r10
     - name: mayastor-agent-core
       image: docker.io/openebs/mayastor-agent-core:release-2.9
     - name: mayastor-agent-ha-cluster

chart/README.md

@@ -66,6 +66,7 @@ This removes all the Kubernetes components associated with the chart and deletes
 
 | Key | Description | Default |
 |:----|:------------|:--------|
+| agents.​core.​allowNonPersistentDevlink | Allow using non-persistent kernel devpaths for pool disks. Enabling this will let users to use the kernel devpaths e.g /dev/sda, for diskpools. However, this comes with associated risks if the devpaths get swapped among disks, resulting in total data loss especially if encryption is being used. | `false` |
 | agents.​core.​capacity.​thin.​poolCommitment | The allowed pool commitment limit when dealing with thin provisioned volumes. Example: If the commitment is 250 and the pool is 10GiB we can overcommit the pool up to 25GiB (create 2 10GiB and 1 5GiB volume) but no further. | `"250%"` |
 | agents.​core.​capacity.​thin.​snapshotCommitment | When creating snapshots for an existing volume, each replica pool must have at least this much free space percentage of the volume size. Example: if this value is 40, the pool has 40GiB free, then the max volume size allowed to be snapped on the pool is 100GiB. | `"40%"` |
 | agents.​core.​capacity.​thin.​volumeCommitment | When creating replicas for an existing volume, each replica pool must have at least this much free space percentage of the volume size. Example: if this value is 40, the pool has 40GiB free, then the max volume size allowed to be created on the pool is 100GiB. | `"40%"` |

chart/images.txt

@@ -1,8 +1,8 @@
-docker.io/bitnami/etcd:3.5.6-debian-11-r10
 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/openebs/etcd:3.5.6-debian-11-r10
 docker.io/openebs/mayastor-agent-core:release-2.9
 docker.io/openebs/mayastor-agent-ha-cluster:release-2.9
 docker.io/openebs/mayastor-agent-ha-node:release-2.9

chart/templates/mayastor/agents/core/agent-core-deployment.yaml

@@ -74,6 +74,8 @@ spec:
             - "--no-volume-health"{{ end }}
             {{- if eq .Values.agents.core.encryptedPoolsSoftScheduling true }}
             - "--encrypted-pools-soft-scheduling"{{- end }}
+            {{- if eq .Values.agents.core.allowNonPersistentDevlink true}}
+            - "--allow-non-persistent-devlink"{{- end }}
           ports:
             - containerPort: 50051
           env:

chart/values.yaml

@@ -209,6 +209,10 @@ agents:
     # If a volume wasn't provisioned with a encryption storageclass, we try to place the replicas of such volume on best-effort basis onto encrypted pools, if this global is set.
     # This is effective subject to volume spec already modified via plugin to request encryption.
     encryptedPoolsSoftScheduling: false
+    # -- Allow using non-persistent kernel devpaths for pool disks.
+    # Enabling this will let users to use the kernel devpaths e.g /dev/sda, for diskpools. However, this comes with associated risks if the devpaths
+    # get swapped among disks, resulting in total data loss especially if encryption is being used.
+    allowNonPersistentDevlink: false
   ha:
     enabled: true
     node:
@@ -549,8 +553,11 @@ etcd:
       repository: openebs/alpine-bash
       tag: 4.2.0
       pullSecrets: []
-  # extra debug information on logs
-  debug: false
+  image:
+    registry: docker.io
+    repository: openebs/etcd
+    # extra debug information on logs
+    debug: false
   # -- Pod anti-affinity preset
   # Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity
   podAntiAffinityPreset: "hard"

k8s/upgrade/src/common/constants.rs

@@ -66,3 +66,6 @@ pub(crate) const TWO_DOT_EIGHT: Version = Version::new(2, 8, 0);
 
 /// Version value for 2.9.0.
 pub(crate) const TWO_DOT_NINE: Version = Version::new(2, 9, 0);
+
+/// Version value for 2.9.2.
+pub(crate) const TWO_DOT_NINE_DOT_TWO: Version = Version::new(2, 9, 2);

k8s/upgrade/src/helm/chart.rs

@@ -96,6 +96,8 @@ pub(crate) struct CoreValues {
     agents: Agents,
     /// This contains values for all the base components.
     base: Base,
+    /// This contains values for all of the Etcd components,
+    etcd: Etcd,
     /// This is the yaml object which contains values for the container image registry, repository,
     /// tag, etc.
     image: Image,
@@ -366,6 +368,36 @@ impl CoreValues {
     pub(crate) fn jaeger_operator_image_tag(&self) -> &str {
         self.jaeger_operator.image_tag()
     }
+
+    /// Returns the value of .etcd.debug (as seen on etcd chart v8.6.0).
+    pub(crate) fn etcd_deprecated_debug_logs(&self) -> Option<bool> {
+        self.etcd.deprecated_debug_logs()
+    }
+
+    /// Returns the image repository of the etcd container.
+    pub(crate) fn etcd_image_repo(&self) -> &str {
+        self.etcd.image_repository()
+    }
+}
+
+/// This is used to deserialize the yaml object etcd.
+#[derive(Deserialize)]
+#[serde(rename_all(deserialize = "camelCase"))]
+struct Etcd {
+    image: GenericImage,
+    #[serde(rename(deserialize = "debug"))]
+    deprecated_debug: Option<bool>,
+}
+
+impl Etcd {
+    /// Returns the value of .etcd.autoCompactionRetention.
+    fn deprecated_debug_logs(&self) -> Option<bool> {
+        self.deprecated_debug
+    }
+
+    fn image_repository(&self) -> &str {
+        self.image.repository()
+    }
 }
 
 /// This is used to deserialize the yaml object agents.
@@ -1258,13 +1290,19 @@ impl LocalpvProvisionerLocalpv {
 struct GenericImage {
     #[serde(default)]
     tag: String,
+    #[serde(default)]
+    repository: String,
 }
 
 impl GenericImage {
-    /// This is getter for the various container image tags in the localpv-provisioner helm chart.
+    /// This is getter for various container image tags.
     fn tag(&self) -> &str {
         self.tag.as_str()
     }
+    /// This is a getter for the various container image repositories.
+    fn repository(&self) -> &str {
+        self.repository.as_str()
+    }
 }
 
 /// This is used to deserialize the 'helperPod' yaml object in the localpv-provisioner helm chart.

k8s/upgrade/src/helm/values.rs

@@ -1,8 +1,9 @@
 use crate::{
     common::{
         constants::{
-            TWO_DOT_EIGHT, TWO_DOT_FIVE, TWO_DOT_FOUR, TWO_DOT_ONE, TWO_DOT_O_RC_ONE,
-            TWO_DOT_SEVEN_DOT_THREE, TWO_DOT_SEVEN_DOT_TWO, TWO_DOT_SIX, TWO_DOT_THREE,
+            TWO_DOT_EIGHT, TWO_DOT_FIVE, TWO_DOT_FOUR, TWO_DOT_NINE_DOT_TWO, TWO_DOT_ONE,
+            TWO_DOT_O_RC_ONE, TWO_DOT_SEVEN_DOT_THREE, TWO_DOT_SEVEN_DOT_TWO, TWO_DOT_SIX,
+            TWO_DOT_THREE,
         },
         error::{
             DeserializePromtailExtraConfig, Result, SemverParse, SerializeBaseInitContainersToJson,
@@ -586,6 +587,21 @@ where
         }
     }
 
+    // Special-case values for 2.9.2.
+    if source_version.ge(&two_dot_o_rc_one) && source_version.lt(&TWO_DOT_NINE_DOT_TWO) {
+        if let Some(debug_logs) = source_values.etcd_deprecated_debug_logs() {
+            yq.delete_object(
+                YamlKey::try_from(".etcd.debug")?,
+                upgrade_values_file.path(),
+            )?;
+            yq.set_literal_value(
+                YamlKey::try_from(".etcd.image.debug")?,
+                debug_logs,
+                upgrade_values_file.path(),
+            )?;
+        }
+    }
+
     // Default options.
     // Image tag is set because the high_priority file is the user's source options file.
     // The target's image tag needs to be set for PRODUCT upgrade.
@@ -636,7 +652,11 @@ where
         target_values.localpv_helper_image_tag(),
         upgrade_values_file.path(),
     )?;
-
+    yq.set_literal_value(
+        YamlKey::try_from(".etcd.image.repository")?,
+        target_values.etcd_image_repo(),
+        upgrade_values_file.path(),
+    )?;
     // Disable CRD installation in case they already exist using helm values.
     safe_crd_install(upgrade_values_file.path(), &yq).await?;