Merge branch 'main' into refactor/product-config-errors

Author: Techassi

CHANGELOG.md

@@ -12,6 +12,11 @@ All notable changes to this project will be documented in this file.
 
 - BREAKING: Rename `product_logging::framework::shutdown_vector_command` to `create_vector_shutdown_file_command` and added `remove_vector_shutdown_file_command` ([#681]).
 
+### Fixed
+
+- Fix Docker image tag parsing when user specifies custom image ([#677]).
+
+[#677]: https://github.com/stackabletech/operator-rs/pull/677
 [#681]: https://github.com/stackabletech/operator-rs/pull/681
 
 ## [0.55.0] - 2023-10-16

Cargo.toml

@@ -22,6 +22,7 @@ chrono = { version = "0.4.26", default-features = false }
 clap = { version = "4.3.19", features = ["derive", "cargo", "env"] }
 const_format = "0.2.31"
 derivative = "2.2.0"
+dockerfile-parser = "0.8.0"
 either = "1.9.0"
 futures = "0.3.28"
 json-patch = "1.0.0"

src/commons/product_image_selection.rs

@@ -1,3 +1,4 @@
+use dockerfile_parser::ImageRef;
 use k8s_openapi::api::core::v1::LocalObjectReference;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
@@ -91,12 +92,12 @@ impl ProductImage {
 
         match &self.image_selection {
             ProductImageSelection::Custom(image_selection) => {
-                let image_tag = image_selection
-                    .custom
-                    .split_once(':')
-                    .map_or("latest", |splits| splits.1);
-                let app_version_label =
-                    format!("{}-{}", image_selection.product_version, image_tag);
+                let image = ImageRef::parse(&image_selection.custom);
+                let app_version_label = format!(
+                    "{}-{}",
+                    image_selection.product_version,
+                    image.tag.unwrap_or("latest".to_string())
+                );
                 ResolvedProductImage {
                     product_version: image_selection.product_version.to_string(),
                     app_version_label,
@@ -250,6 +251,36 @@ mod tests {
             pull_secrets: None,
         }
     )]
+    #[case::custom_with_colon_in_repo_and_without_tag(
+        "superset",
+        "23.7.42",
+        r#"
+        custom: 127.0.0.1:8080/myteam/stackable/superset
+        productVersion: 1.4.1
+        "#,
+        ResolvedProductImage {
+            image: "127.0.0.1:8080/myteam/stackable/superset".to_string(),
+            app_version_label: "1.4.1-latest".to_string(),
+            product_version: "1.4.1".to_string(),
+            image_pull_policy: "Always".to_string(),
+            pull_secrets: None,
+        }
+    )]
+    #[case::custom_with_colon_in_repo_and_with_tag(
+        "superset",
+        "23.7.42",
+        r#"
+        custom: 127.0.0.1:8080/myteam/stackable/superset:latest-and-greatest
+        productVersion: 1.4.1
+        "#,
+        ResolvedProductImage {
+            image: "127.0.0.1:8080/myteam/stackable/superset:latest-and-greatest".to_string(),
+            app_version_label: "1.4.1-latest-and-greatest".to_string(),
+            product_version: "1.4.1".to_string(),
+            image_pull_policy: "Always".to_string(),
+            pull_secrets: None,
+        }
+    )]
     #[case::custom_takes_precedence(
         "superset",
         "23.7.42",