Merge remote-tracking branch 'origin/main' into feat/tls-support

Author: labrenbe

default.nix

@@ -5,7 +5,7 @@
     # on Darwin (macOS), but doesn't seem to actually be necessary beyond
     # production hardening.
     fakeroot =
-        if self.buildPlatform.isDarwin then
+        if self.stdenv.buildPlatform.isDarwin then
             self.writeScriptBin "fakeroot" ''exec "$@"''
         else
             super.fakeroot;
@@ -14,7 +14,7 @@
 # (non-Nix build tools like Tilt, as well as the container composition scripts)
 , pkgsLocal ? import nixpkgs { inherit overlays; }
 # Default to building for the local CPU architecture
-, targetArch ? pkgsLocal.hostPlatform.linuxArch
+, targetArch ? pkgsLocal.stdenv.hostPlatform.linuxArch
 , targetSystem ? "${targetArch}-unknown-linux-gnu"
 , pkgsTarget ? import nixpkgs {
     inherit overlays;

nix/sources.json

@@ -272,6 +272,7 @@ mod tests {
 
     use super::{ErrorDiscriminants, validate};
     use crate::{
+        built_info,
         controller::{ContextNames, ValidatedCluster, ValidatedLogging, ValidatedOpenSearchConfig},
         crd::{
             NodeRoles,
@@ -296,9 +297,15 @@ mod tests {
             Some(ValidatedCluster::new(
                 ResolvedProductImage {
                     product_version: "3.1.0".to_owned(),
-                    app_version_label_value: LabelValue::from_str("3.1.0-stackable0.0.0-dev")
-                        .expect("should be a valid label value"),
-                    image: "oci.stackable.tech/sdp/opensearch:3.1.0-stackable0.0.0-dev".to_string(),
+                    app_version_label_value: LabelValue::from_str(&format!(
+                        "3.1.0-stackable{pkg_version}",
+                        pkg_version = built_info::PKG_VERSION
+                    ))
+                    .expect("should be a valid label value"),
+                    image: format!(
+                        "oci.stackable.tech/sdp/opensearch:3.1.0-stackable{pkg_version}",
+                        pkg_version = built_info::PKG_VERSION
+                    ),
                     image_pull_policy: "Always".to_owned(),
                     pull_secrets: None,
                 },

rust/operator-binary/src/controller/validate.rs

@@ -144,6 +144,13 @@ def parse_args(argv: list[str]) -> argparse.Namespace:
         default=os.path.join("tests", "_work"),
     )
 
+    parser.add_argument(
+        "--listener-class-preset",
+        help="Choose the ListenerClass preset",
+        type=str,
+        required=False,
+    )
+
     return parser.parse_args(argv)
 
 
@@ -285,7 +292,9 @@ def release_file(
                 logging.error(f"Failed to delete patched release file: {release_file}")
 
 
-def maybe_install_release(skip_release: bool, release_file: str) -> None:
+def maybe_install_release(
+    skip_release: bool, release_file: str, listener_class_preset: str
+) -> None:
     if skip_release:
         logging.debug("Skip release installation")
         return
@@ -296,6 +305,11 @@ def maybe_install_release(skip_release: bool, release_file: str) -> None:
             "install",
             "--release-file",
             release_file,
+            *(
+                ["--listener-class-preset", listener_class_preset]
+                if listener_class_preset
+                else []
+            ),
             "tests",
         ]
         logging.debug(f"Running : {stackablectl_cmd}")
@@ -436,7 +450,7 @@ def main(argv) -> int:
         have_requirements()
         gen_tests(opts.test_suite, opts.namespace, opts.work_dir)
         with release_file(opts.operator, opts.skip_operator) as f:
-            maybe_install_release(opts.skip_release, f)
+            maybe_install_release(opts.skip_release, f, opts.listener_class_preset)
         if opts.skip_tests:
             logging.info("Skip running tests.")
         else: