[Merged by Bors] - Use ephemeral secret-op volumes rather than csi

CHANGELOG.md

@@ -7,18 +7,23 @@ All notable changes to this project will be documented in this file.
 ### Added
 
 - Added `config::merge::chainable_merge()` ([#397]).
+- `SecretClassVolume` and `SecretOperatorVolumeSourceBuilder` now support secret-aware pod scheduling ([#396], [secret-#125]).
 - New `memory` module ([#400]).
 - `S3AccessStyle` enum added to `commons::s3::S3ConnectionSpec` ([#401])
 
-[#397]: https://github.com/stackabletech/operator-rs/pull/397
-[#400]: https://github.com/stackabletech/operator-rs/pull/400
-[#401]: https://github.com/stackabletech/operator-rs/pull/401
-
 ### Changed
 
+- BREAKING: `SecretClassVolume::to_csi_volume` renamed to `to_ephemeral_volume` and now returns `EphemeralVolumeSource` ([#396]).
+- BREAKING: `SecretOperatorVolumeSourceBuilder` now returns `EphemeralVolumeSource` ([#396]).
+- BREAKING: Secret-Operator-related features now require Secret-Operator 0.4.0 ([#396]).
 - BREAKING: Memory and CPU resource definitions use quantity instead of String ([#402])
 
+[#396]: https://github.com/stackabletech/operator-rs/pull/396
+[#397]: https://github.com/stackabletech/operator-rs/pull/397
+[#400]: https://github.com/stackabletech/operator-rs/pull/400
+[#401]: https://github.com/stackabletech/operator-rs/pull/401
 [#402]: https://github.com/stackabletech/operator-rs/pull/402
+[secret-#125]: https://github.com/stackabletech/secret-operator/pull/125
 
 ## [0.19.0] - 2022-05-05
 

src/builder/pod/volume.rs

@@ -1,4 +1,7 @@
-use k8s_openapi::api::core::v1::VolumeMount;
+use k8s_openapi::api::core::v1::{
+    EphemeralVolumeSource, PersistentVolumeClaimSpec, PersistentVolumeClaimTemplate,
+    ResourceRequirements, VolumeMount,
+};
 use k8s_openapi::{
     api::core::v1::{
         CSIVolumeSource, ConfigMapVolumeSource, DownwardAPIVolumeSource, EmptyDirVolumeSource,
@@ -9,6 +12,8 @@ use k8s_openapi::{
 };
 use std::collections::BTreeMap;
 
+use crate::builder::ObjectMetaBuilder;
+
 /// A builder to build [`Volume`] objects.
 /// May only contain one `volume_source` at a time.
 /// E.g. a call like `secret` after `empty_dir` will overwrite the `empty_dir`.
@@ -28,6 +33,7 @@ pub enum VolumeSource {
     Projected(ProjectedVolumeSource),
     Secret(SecretVolumeSource),
     Csi(CSIVolumeSource),
+    Ephemeral(Box<EphemeralVolumeSource>),
 }
 
 impl Default for VolumeSource {
@@ -187,6 +193,11 @@ impl VolumeBuilder {
                 csi: Some(csi.clone()),
                 ..Volume::default()
             },
+            VolumeSource::Ephemeral(ephemeral) => Volume {
+                name,
+                ephemeral: Some((**ephemeral).clone()),
+                ..Volume::default()
+            },
         }
     }
 }
@@ -275,7 +286,7 @@ impl SecretOperatorVolumeSourceBuilder {
         self
     }
 
-    pub fn build(&self) -> CSIVolumeSource {
+    pub fn build(&self) -> EphemeralVolumeSource {
         let mut attrs = BTreeMap::from([(
             "secrets.stackable.tech/class".to_string(),
             self.secret_class.clone(),
@@ -299,10 +310,19 @@ impl SecretOperatorVolumeSourceBuilder {
             attrs.insert("secrets.stackable.tech/scope".to_string(), scopes);
         }
 
-        CSIVolumeSource {
-            driver: "secrets.stackable.tech".to_string(),
-            volume_attributes: Some(attrs),
-            ..CSIVolumeSource::default()
+        EphemeralVolumeSource {
+            volume_claim_template: Some(PersistentVolumeClaimTemplate {
+                metadata: Some(ObjectMetaBuilder::new().annotations(attrs).build()),
+                spec: PersistentVolumeClaimSpec {
+                    storage_class_name: Some("secrets.stackable.tech".to_string()),
+                    resources: Some(ResourceRequirements {
+                        requests: Some([("storage".to_string(), Quantity("1".to_string()))].into()),
+                        ..ResourceRequirements::default()
+                    }),
+                    access_modes: Some(vec!["ReadWriteOnce".to_string()]),
+                    ..PersistentVolumeClaimSpec::default()
+                },
+            }),
         }
     }
 }

src/commons/secret_class.rs

@@ -1,5 +1,5 @@
 use crate::builder::SecretOperatorVolumeSourceBuilder;
-use k8s_openapi::api::core::v1::CSIVolumeSource;
+use k8s_openapi::api::core::v1::EphemeralVolumeSource;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
@@ -13,7 +13,7 @@ pub struct SecretClassVolume {
 }
 
 impl SecretClassVolume {
-    pub fn to_csi_volume(&self) -> CSIVolumeSource {
+    pub fn to_ephemeral_volume(&self) -> EphemeralVolumeSource {
         let mut secret_operator_volume_builder =
             SecretOperatorVolumeSourceBuilder::new(&self.secret_class);
 
@@ -59,7 +59,7 @@ mod tests {
                 services: vec!["myservice".to_string()],
             }),
         }
-        .to_csi_volume();
+        .to_ephemeral_volume();
 
         let expected_volume_attributes = BTreeMap::from([
             (
@@ -74,7 +74,13 @@ mod tests {
 
         assert_eq!(
             expected_volume_attributes,
-            secret_class_volume.volume_attributes.unwrap()
+            secret_class_volume
+                .volume_claim_template
+                .unwrap()
+                .metadata
+                .unwrap()
+                .annotations
+                .unwrap()
         );
     }
 }