feat: Support dynamic image repositories

CHANGELOG.md

@@ -2,9 +2,15 @@
 
 ## [Unreleased]
 
+### Added
+
+- BREAKING: Add required CLI argument and env var to set the image repository used to construct final product image names: `IMAGE_REPOSITORY` (`--image-repository`), eg. `oci.example.org/my/namespace` ([#752]).
+
+[#752]: https://github.com/stackabletech/hbase-operator/pull/752
+
 ### Changed
 
-- Document Helm deployed RBAC permissions and remove unnecessary permissions ([#745]).
+- Document Helm deployed RBAC permissions and remove unnecessary permissions ([#745]).
 - BREAKING: `configOverrides` now only accepts the known config files (`hbase-site.xml`,
   `hbase-env.sh`, `ssl-server.xml`, `ssl-client.xml` and `security.properties`).
   Previously, arbitrary file names were silently accepted and ignored ([#751]).

Cargo.toml

@@ -11,7 +11,7 @@ repository = "https://github.com/stackabletech/hbase-operator"
 
 [workspace.dependencies]
 product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.8.0" }
-stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.110.1", features = ["crds", "webhook"] }
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.111.1", features = ["crds", "webhook"] }
 
 anyhow = "1.0"
 built = { version = "0.8", features = ["chrono", "git2"] }

extra/crds.yaml

@@ -145,8 +145,9 @@ spec:
                 properties:
                   custom:
                     description: |-
-                      Overwrite the docker image.
-                      Specify the full docker image name, e.g. `oci.stackable.tech/sdp/superset:1.4.1-stackable2.1.0`
+                      Provide a custom container image.
+
+                      Specify the full container image name, e.g. `oci.example.tech/namespace/superset:1.4.1-my-tag`
                     type: string
                   productVersion:
                     description: Version of the product, e.g. `1.4.1`.
@@ -173,14 +174,20 @@ spec:
                     nullable: true
                     type: array
                   repo:
-                    description: Name of the docker repo, e.g. `oci.stackable.tech/sdp`
+                    description: |-
+                      The repository on the container image registry where the container image is located, e.g.
+                      `oci.example.com/namespace`.
+
+                      If not specified, the operator will use the image registry provided via the operator
+                      environment options.
                     nullable: true
                     type: string
                   stackableVersion:
                     description: |-
                       Stackable version of the product, e.g. `23.4`, `23.4.1` or `0.0.0-dev`.
-                      If not specified, the operator will use its own version, e.g. `23.4.1`.
-                      When using a nightly operator or a pr version, it will use the nightly `0.0.0-dev` image.
+
+                      If not specified, the operator will use its own version, e.g. `23.4.1`. When using a nightly
+                      operator or a PR version, it will use the nightly `0.0.0-dev` image.
                     nullable: true
                     type: string
                 type: object

rust/operator-binary/src/crd/mod.rs

@@ -1371,8 +1371,11 @@ mod tests {
     use indoc::indoc;
     use product_config::{ProductConfigManager, types::PropertyNameKind};
     use rstest::rstest;
-    use stackable_operator::product_config_utils::{
-        transform_all_roles_to_config, validate_all_roles_and_groups_config,
+    use stackable_operator::{
+        product_config_utils::{
+            transform_all_roles_to_config, validate_all_roles_and_groups_config,
+        },
+        versioned::test_utils::RoundtripTestData,
     };
 
     use super::*;
@@ -1543,4 +1546,10 @@ spec:
             panic!("this shouldn't happen");
         };
     }
+
+    impl RoundtripTestData for v1alpha1::HbaseClusterSpec {
+        fn roundtrip_test_data() -> Vec<Self> {
+            vec![]
+        }
+    }
 }

rust/operator-binary/src/hbase_controller.rs

@@ -25,6 +25,7 @@ use stackable_operator::{
             security::PodSecurityContextBuilder,
         },
     },
+    cli::OperatorEnvironmentOptions,
     cluster_resources::{ClusterResourceApplyStrategy, ClusterResources},
     commons::{
         product_image_selection::{self, ResolvedProductImage},
@@ -106,11 +107,12 @@ const HDFS_DISCOVERY_TMP_DIR: &str = "/stackable/tmp/hdfs";
 const HBASE_CONFIG_TMP_DIR: &str = "/stackable/tmp/hbase";
 const HBASE_LOG_CONFIG_TMP_DIR: &str = "/stackable/tmp/log_config";
 
-const DOCKER_IMAGE_BASE_NAME: &str = "hbase";
+const CONTAINER_IMAGE_BASE_NAME: &str = "hbase";
 
 pub struct Ctx {
     pub client: stackable_operator::client::Client,
     pub product_config: ProductConfigManager,
+    pub operator_environment: OperatorEnvironmentOptions,
 }
 
 #[derive(Snafu, Debug, EnumDiscriminants)]
@@ -326,7 +328,11 @@ pub async fn reconcile_hbase(
     let resolved_product_image = hbase
         .spec
         .image
-        .resolve(DOCKER_IMAGE_BASE_NAME, crate::built_info::PKG_VERSION)
+        .resolve(
+            CONTAINER_IMAGE_BASE_NAME,
+            &ctx.operator_environment.image_repository,
+            crate::built_info::PKG_VERSION,
+        )
         .context(ResolveProductImageSnafu)?;
     let zookeeper_connection_information = ZookeeperConnectionInformation::retrieve(hbase, client)
         .await

rust/operator-binary/src/main.rs

@@ -163,6 +163,7 @@ async fn main() -> anyhow::Result<()> {
                     hbase_controller::error_policy,
                     Arc::new(hbase_controller::Ctx {
                         client: client.clone(),
+                        operator_environment,
                         product_config,
                     }),
                 )