spike: Use dynamic product image selection

Author: Techassi

Cargo.lock

@@ -36,4 +36,4 @@ tracing = "0.1"
 [patch."https://github.com/stackabletech/operator-rs.git"]
 # TODO revert this before merging!
 # stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" }
-# stackable-operator = { path = "../operator-rs/crates/stackable-operator" }
+stackable-operator = { path = "../operator-rs/crates/stackable-operator" }

Cargo.nix

@@ -5,9 +5,9 @@ operator_name = meta['operator']['name']
 # If tilt_options.json exists read it and load the default_registry and default_repository value from it
 settings = read_json('tilt_options.json', default={})
 registry = settings.get('default_registry', 'oci.stackable.tech')
-repository = settings.get('default_repository', 'sandbox' + '/' + operator_name)
+repository = settings.get('default_repository', 'sdp' + '/' + operator_name)
 
-# Configure default registry either read from config file above, or with default value of "oci.stackable.tech/sandbox"
+# Configure default registry either read from config file above, or with default value of "oci.stackable.tech"
 default_registry(registry)
 
 custom_build(
@@ -20,8 +20,8 @@ custom_build(
 )
 
 # We need to set the correct image annotation on the operator Deployment to use e.g.
-# oci.stackable.tech/sandbox/opa-operator:7y19m3d8clwxlv34v5q2x4p7v536s00g instead of
-# oci.stackable.tech/sandbox/opa-operator:0.0.0-dev (which does not exist)
+# oci.stackable.tech/sdp/opa-operator:7y19m3d8clwxlv34v5q2x4p7v536s00g instead of
+# oci.stackable.tech/sdp/opa-operator:0.0.0-dev (which does not exist)
 k8s_kind('Deployment', image_json_path='{.spec.template.metadata.annotations.internal\\.stackable\\.tech/image}')
 k8s_kind('DaemonSet', image_json_path='{.spec.template.metadata.annotations.internal\\.stackable\\.tech/image}')
 

Cargo.toml

@@ -70,9 +70,8 @@ spec:
             - name: OPERATOR_SERVICE_NAME
               value: {{ include "operator.fullname" . }}
 
-            # The URI of the image registry, like "oci.stackable.tech". Used to derive product image
-            # name.
-            - name: IMAGE_REGISTRY_URI
+            # The image registry, like "oci.stackable.tech". Used to derive product image name.
+            - name: IMAGE_REGISTRY
               value: {{ .Values.image.registry }}
 
             # The image repository, like "sdp/airflow-operator"

Tiltfile

@@ -2398,8 +2398,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`
+                      Overwrite the container image.
+
+                      Specify the full container image name, e.g. `oci.stackable.tech/sdp/superset:1.4.1-stackable2.1.0`
                     type: string
                   productVersion:
                     description: Version of the product, e.g. `1.4.1`.
@@ -2425,15 +2426,29 @@ spec:
                       type: object
                     nullable: true
                     type: array
-                  repo:
-                    description: Name of the docker repo, e.g. `oci.stackable.tech/sdp`
+                  registry:
+                    description: |-
+                      The container image registry, e.g. `oci.stackable.tech`.
+
+                      If not specified, the operator will use the image registry provided via the operator
+                      environment options.
+                    nullable: true
+                    type: string
+                  repository:
+                    description: |-
+                      The repository on the container image registry where the container image is located, e.g.
+                      `sdp/airflow`.
+
+                      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
@@ -8379,8 +8394,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`
+                      Overwrite the container image.
+
+                      Specify the full container image name, e.g. `oci.stackable.tech/sdp/superset:1.4.1-stackable2.1.0`
                     type: string
                   productVersion:
                     description: Version of the product, e.g. `1.4.1`.
@@ -8406,15 +8422,29 @@ spec:
                       type: object
                     nullable: true
                     type: array
-                  repo:
-                    description: Name of the docker repo, e.g. `oci.stackable.tech/sdp`
+                  registry:
+                    description: |-
+                      The container image registry, e.g. `oci.stackable.tech`.
+
+                      If not specified, the operator will use the image registry provided via the operator
+                      environment options.
+                    nullable: true
+                    type: string
+                  repository:
+                    description: |-
+                      The repository on the container image registry where the container image is located, e.g.
+                      `sdp/airflow`.
+
+                      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

crate-hashes.json

@@ -29,6 +29,7 @@ use stackable_operator::{
             },
         },
     },
+    cli::OperatorEnvironmentOptions,
     cluster_resources::{ClusterResourceApplyStrategy, ClusterResources},
     commons::{
         product_image_selection::{self, ResolvedProductImage},
@@ -112,13 +113,13 @@ use crate::{
 };
 
 pub const AIRFLOW_CONTROLLER_NAME: &str = "airflowcluster";
-pub const DOCKER_IMAGE_BASE_NAME: &str = "airflow";
 pub const AIRFLOW_FULL_CONTROLLER_NAME: &str =
     concatcp!(AIRFLOW_CONTROLLER_NAME, '.', OPERATOR_NAME);
 
 pub struct Ctx {
     pub client: stackable_operator::client::Client,
     pub product_config: ProductConfigManager,
+    pub operator_environment: OperatorEnvironmentOptions,
 }
 
 #[derive(Snafu, Debug, EnumDiscriminants)]
@@ -380,7 +381,14 @@ pub async fn reconcile_airflow(
     let resolved_product_image = airflow
         .spec
         .image
-        .resolve(DOCKER_IMAGE_BASE_NAME, crate::built_info::PKG_VERSION)
+        .resolve(
+            &ctx.operator_environment.image_registry.to_string(),
+            ctx.operator_environment
+                .image_repository
+                // I'm not happy about this. Is this something we can and should adjust?
+                .trim_end_matches("-operator"),
+            crate::built_info::PKG_VERSION,
+        )
         .context(ResolveProductImageSnafu)?;
 
     let cluster_operation_cond_builder =